X-Git-Url: https://pd.if.org/git/?p=pdclib;a=blobdiff_plain;f=platform%2Fwin32%2FConfig.jam;h=18d2c05a4a0ea998c0c232422dcd3d5fa11e211b;hp=c02174f68993ad548e2980f06aaa575661dabf46;hb=b5d36b0dfa121d20e9056cfbca097e3aab488bab;hpb=d8928b5f31bbdac23f9ec296ef28b4b10efa31d5

diff --git a/platform/win32/Config.jam b/platform/win32/Config.jam
index c02174f..18d2c05 100644
--- a/platform/win32/Config.jam
+++ b/platform/win32/Config.jam
@@ -1,12 +1,29 @@
-rule PDCLibTargetConfig { }
-rule PDCLibTargetHeaders {
-    SubDirHdrs $(PDCLIB_TOP) platform win32 includes ;
-    SubDirHdrs $(PDCLIB_TOP) platform win32 internals ;
-}
-
-PDCLIB_TEST_LINKFLAGS += -nostdlib ;
-PDCLIB_TEST_LINKLIBS += -lgcc -lkernel32 -lshell32 ;
-
-PDCLIB_OPTIONS = nothread notime dlmalloc ;
-
-CRT0 = [ FDirName platform win32 crt0$(SUFOBJ) ] ;
\ No newline at end of file
+rule PDCLibTargetConfig { }
+rule PDCLibTargetHeaders {
+    SubDirHdrs $(PDCLIB_TOP) platform win32 includes ;
+    SubDirHdrs $(PDCLIB_TOP) platform win32 internals ;
+
+    if $(PDCLIB_TOOLCHAIN) = "WATCOM" {
+        SubDirHdrs $(WATCOM) h ;
+    }
+}
+
+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 =
+    ;
+
+CRT0 = [ FDirName platform win32 crt0$(SUFOBJ) ] ;