Changeset 8 in kStuff

Timestamp:

Apr 20, 2008 3:46:13 AM (17 years ago)

Author:

bird

Message:

Use the static CRT on win.amd64 and avoid the manifest hell. Made some optimization adjustments for windows.

File:

• trunk/Config.kmk (modified) (3 diffs)

trunk/Config.kmk

@@ -70 +70 @@
 TEMPLATE_kStuff_CFLAGS.linux     = -g
 TEMPLATE_kStuff_CFLAGS.os2       = -g
-TEMPLATE_kStuff_CFLAGS.win       = -Zi -Zl -MD -W3 -GF -GR-
+TEMPLATE_kStuff_CFLAGS.win       = -Zi -Zl -W3 -GF -GR-
+TEMPLATE_kStuff_CFLAGS.win.x86   = -MD
+TEMPLATE_kStuff_CFLAGS.win.amd64 = -MT
 ifneq ($(BUILD_TYPE),debug)
 TEMPLATE_kStuff_CFLAGS.freebsd  += -O3
 TEMPLATE_kStuff_CFLAGS.linux    += -O3
 TEMPLATE_kStuff_CFLAGS.os2      += -O3
-TEMPLATE_kStuff_CFLAGS.win      += -O2xtg -Oi -Ob2
+TEMPLATE_kStuff_CFLAGS.win      += -O2b2
 else
 TEMPLATE_kStuff_CFLAGS.win      += -Od
@@ -84 +86 @@
 TEMPLATE_kStuff_CXXFLAGS.linux   = -g
 TEMPLATE_kStuff_CXXFLAGS.os2     = -g
-TEMPLATE_kStuff_CXXFLAGS.win     = -Zi -Zl -MD -W3 -GF -GR-
+TEMPLATE_kStuff_CXXFLAGS.win     = -Zi -Zl -W3 -GF -GR-
+TEMPLATE_kStuff_CXXFLAGS.win.x86 = -MD
+TEMPLATE_kStuff_CXXFLAGS.win.amd64 = -MT
 ifneq ($(BUILD_TYPE),debug)
 TEMPLATE_kStuff_CXXFLAGS.freebsd+= -O3
 TEMPLATE_kStuff_CXXFLAGS.linux  += -O3
 TEMPLATE_kStuff_CXXFLAGS.os2    += -O3
-TEMPLATE_kStuff_CXXFLAGS.win    += -O2xtg -Oi -Ob2
+TEMPLATE_kStuff_CXXFLAGS.win    += -O2b2
 else
 TEMPLATE_kStuff_CXXFLAGS.win    += -Od
@@ -110 +114 @@
         $(PATH_SDK_W2K3DDKX86_LIB)/ntdll.lib
 TEMPLATE_kStuff_LIBS.win.amd64   = \
-        $(PATH_TOOL_VCC80AMD64_LIB)/msvcrt.lib \
-        $(PATH_TOOL_VCC80AMD64_LIB)/msvcprt.lib \
+        $(PATH_TOOL_VCC80AMD64_LIB)/libcmt.lib \
         $(PATH_TOOL_VCC80AMD64_LIB)/oldnames.lib \
         $(PATH_SDK_W2K3DDKAMD64_LIB)/ntdll.lib