From f41f552156a1174fcbe7d52ae15a9868d5d342ef Mon Sep 17 00:00:00 2001 From: Dave Abrahams Date: Mon, 9 Sep 2002 14:05:10 +0000 Subject: [PATCH] VC7 builds [SVN r15236] --- src/engine/jambase.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/src/engine/jambase.c b/src/engine/jambase.c index 9ecc9b94a..e630ef2a2 100644 --- a/src/engine/jambase.c +++ b/src/engine/jambase.c @@ -96,7 +96,7 @@ char *jambase[] = { "}\n", "if $(NT)\n", "{\n", -"local SUPPORTED_TOOLSETS = \"BORLANDC\" \"VISUALC\" \"VISUALC16\" \"INTELC\" \"WATCOM\"\n", +"local SUPPORTED_TOOLSETS = \"BORLANDC\" \"VC7\" \"VISUALC\" \"VISUALC16\" \"INTELC\" \"WATCOM\"\n", "\"MINGW\" \"LCC\" ;\n", "TOOLSET = \"\" ;\n", "if $(JAM_TOOLSET)\n", @@ -231,6 +231,26 @@ char *jambase[] = { "STDHDRS ?= $(VISUALC)\\\\include ;\n", "UNDEFFLAG ?= \"/u _\" ;\n", "}\n", +"else if $(TOOLSET) = VC7\n", +"{\n", +"ECHO \"Compiler is Microsoft Visual C++ .NET\" ;\n", +"AR ?= lib ;\n", +"AS ?= masm386 ;\n", +"CC ?= cl /nologo ;\n", +"CCFLAGS ?= \"\" ;\n", +"C++ ?= $(CC) ;\n", +"C++FLAGS ?= $(CCFLAGS) ;\n", +"LINK ?= link /nologo ;\n", +"LINKFLAGS ?= \"\" ;\n", +"LINKLIBS ?= \\\"$(VISUALC)\\\\PlatformSDK\\\\lib\\\\advapi32.lib\\\"\n", +"\\\"$(VISUALC)\\\\PlatformSDK\\\\lib\\\\gdi32.lib\\\"\n", +"\\\"$(VISUALC)\\\\PlatformSDK\\\\lib\\\\user32.lib\\\"\n", +"\\\"$(VISUALC)\\\\PlatformSDK\\\\lib\\\\kernel32.lib\\\" ;\n", +"OPTIM ?= \"\" ;\n", +"STDHDRS ?= \\\"$(VISUALC)\\\\include\\\"\n", +"\\\"$(VISUALC)\\\\PlatformSDK\\\\include\\\" ;\n", +"UNDEFFLAG ?= \"/u _\" ;\n", +"}\n", "else if $(TOOLSET) = INTELC\n", "{\n", "ECHO \"Compiler is Intel C/C++\" ;\n", @@ -1404,7 +1424,7 @@ char *jambase[] = { "}\n", "if $(NT)\n", "{\n", -"if $(TOOLSET) = VISUALC || $(TOOLSET) = INTELC\n", +"if $(TOOLSET) = VISUALC || $(TOOLSET) = VC7 || $(TOOLSET) = INTELC\n", "{\n", "actions updated together piecemeal Archive\n", "{\n",