X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=platform%2Fwin32%2FConfig.jam;h=2ea7ff0234101d085a92b20efe1d99523e5ade70;hb=9fd5c3ead20a941c1a8f8e40bf9f32519c226358;hp=7dcab3f891f183fcdf64e266956bc3539f713466;hpb=48b352165d2cb89126ddde1323a138820687970a;p=pdclib

diff --git a/platform/win32/Config.jam b/platform/win32/Config.jam
index 7dcab3f..2ea7ff0 100644
--- a/platform/win32/Config.jam
+++ b/platform/win32/Config.jam
@@ -8,9 +8,28 @@ rule PDCLibTargetHeaders {
     }
 }
 
-PDCLIB_TEST_LINKFLAGS += -nostdlib ;
-PDCLIB_TEST_LINKLIBS += -lgcc -lkernel32 -lshell32 ;
+if $(PDCLIB_TOOLCHAIN) = "gcc" {
+    PDCLIB_TEST_LINKFLAGS += -nostdlib ;
+    PDCLIB_TEST_LINKLIBS += -lgcc -lkernel32 -lshell32 ;
+} else if $(PDCLIB_TOOLCHAIN) = "WATCOM" {
+    PDCLIB_TEST_LINKFLAGS = "-\"option start=_mainCRTStartup\"" ;
+    PDCLIB_TEST_LINKLIBS = 
+        $(WATCOM)\\lib386\\nt\\kernel32.lib 
+        $(WATCOM)\\lib386\\nt\\shell32.lib
+        $(WATCOM)\\lib386\\nt\\clib3r.lib ;
+    PDCLIB_REGTEST_CCHDRS = [ FIncludes $(WATCOM)\\h ] ;
+} else {
+    ECHO Win32 doesn't support toolchain $(PDCLIB_TOOLCHAIN) ;
+    EXIT ;
+}
 
-PDCLIB_OPTIONS = nothread notime dlmalloc ;
+PDCLIB_OPTIONS = 
+    notime 
+    dlmalloc 
+    mincoll 
+    tss_errno 
+    basecodecs 
+    c_locale 
+    ;
 
 CRT0 = [ FDirName platform win32 crt0$(SUFOBJ) ] ;
\ No newline at end of file