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

diff --git a/platform/win32/Config.jam b/platform/win32/Config.jam
index c02174f..1c59de6 100644
--- a/platform/win32/Config.jam
+++ b/platform/win32/Config.jam
@@ -2,11 +2,33 @@ rule PDCLibTargetConfig { }
 rule PDCLibTargetHeaders {
     SubDirHdrs $(PDCLIB_TOP) platform win32 includes ;
     SubDirHdrs $(PDCLIB_TOP) platform win32 internals ;
+
+    if $(PDCLIB_TOOLCHAIN) = "WATCOM" {
+        SubDirHdrs $(WATCOM) h ;
+    }
 }
 
-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 
+    mincoll 
+    tss_errno 
+    basecodecs 
+    c_locale 
+    ;
 
-CRT0 = [ FDirName platform win32 crt0$(SUFOBJ) ] ;
\ No newline at end of file
+CRT0 = [ FDirName platform win32 crt0$(SUFOBJ) ] ;