win32: most tests now build on Watcom

[pdclib.old] / platform / win32 / Config.jam

diff --git a/platform/win32/Config.jam b/platform/win32/Config.jam
index 7dcab3f891f183fcdf64e266956bc3539f713466..1cd357a9a2f0b41dc29dcc869849f0d92c26f20f 100644 (file)
--- a/platform/win32/Config.jam
+++ b/platform/win32/Config.jam
@@ -8,8 +8,20 @@ rule PDCLibTargetHeaders {
     }\r
 }\r
 \r
-PDCLIB_TEST_LINKFLAGS += -nostdlib ;\r
-PDCLIB_TEST_LINKLIBS += -lgcc -lkernel32 -lshell32 ;\r
+if $(PDCLIB_TOOLCHAIN) = "gcc" {\r
+    PDCLIB_TEST_LINKFLAGS += -nostdlib ;\r
+    PDCLIB_TEST_LINKLIBS += -lgcc -lkernel32 -lshell32 ;\r
+} else if $(PDCLIB_TOOLCHAIN) = "WATCOM" {\r
+    PDCLIB_TEST_LINKFLAGS = "-\"option start=_mainCRTStartup\"" ;\r
+    PDCLIB_TEST_LINKLIBS = \r
+        $(WATCOM)\\lib386\\nt\\kernel32.lib \r
+        $(WATCOM)\\lib386\\nt\\shell32.lib\r
+        $(WATCOM)\\lib386\\nt\\clib3r.lib ;\r
+    PDCLIB_REGTEST_CCHDRS = [ FIncludes $(WATCOM)\\h ] ;\r
+} else {\r
+    ECHO Win32 doesn't support toolchain $(PDCLIB_TOOLCHAIN) ;\r
+    EXIT ;\r
+}\r
 \r
 PDCLIB_OPTIONS = nothread notime dlmalloc ;\r
 \r