Changeset 2668 for trunk/Config.kmk

Timestamp:

Nov 25, 2012, 8:53:45 PM (13 years ago)

Author:

bird

Message:

New windows compiler

File:

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

trunk/Config.kmk

@@ -5 +5 @@
 
 #
-# Copyright (c) 2005-2010 knut st. osmundsen <bird-kBuild-spamx@anduin.net>
+# Copyright (c) 2005-2012 knut st. osmundsen <bird-kBuild-spamx@anduin.net>
 #
 # This file is part of kBuild.
@@ -247 +247 @@
 
 ifeq ($(filter-out win nt,$(KBUILD_TARGET)),)
- ifeq ($(KBUILD_TARGET_ARCH),x86)
-  include $(KBUILD_PATH)/tools/VCC70.kmk        # fixme! template expanding does something bad to _LIBS /me thinks.
-  TEMPLATE_BIN_TOOL             = VCC70
-  TEMPLATE_BIN_DEFS             = WINDOWS32 _CONSOLE __WIN__ WIN32 __WIN32__
- else ifeq ($(KBUILD_TARGET_ARCH),amd64)
-  TEMPLATE_BIN_TOOL             = VCC80AMD64
-  TEMPLATE_BIN_DEFS             = WINDOWS32 _CONSOLE __WIN__ WIN32 __WIN32__ __WIN64__ WIN64 \
-                                  _CRT_SECURE_NO_DEPRECATE _CRT_NONSTDC_NO_WARNINGS
- endif
+ TEMPLATE_BIN_TOOL              = VCC100
+ TEMPLATE_BIN_TOOL.x86          = VCC100X86
+ TEMPLATE_BIN_TOOL.amd64        = VCC100AMD64
+ TEMPLATE_BIN_DEFS              = WINDOWS32 _CONSOLE __WIN__ _CRT_SECURE_NO_DEPRECATE _CRT_NONSTDC_NO_WARNINGS
+ TEMPLATE_BIN_DEFS.x86          = WIN32 __WIN32__
+ TEMPLATE_BIN_DEFS.amd64        = WIN32 __WIN32__ __WIN64__ WIN64
  TEMPLATE_BIN_CFLAGS            = -W3 -Zi -Zl
  TEMPLATE_BIN_CFLAGS.release    = -O2
@@ -265 +262 @@
  TEMPLATE_BIN_LDFLAGS           = /SUBSYSTEM:console /INCREMENTAL:no /NOD /DEBUG
  ifeq ($(KBUILD_TYPE),profile)
-  TEMPLATE_BIN_SDKS              = WINPSDKINCS
+  TEMPLATE_BIN_SDKS             = WINPSDKINCS
   TEMPLATE_BIN_CFLAGS          += -MT
   TEMPLATE_BIN_LIBS             = \
@@ -277 +274 @@
         $(PATH_SDK_WINPSDKINCS_LIB)/User32.lib
  else
-  TEMPLATE_BIN_SDKS              = WINPSDK
-  TEMPLATE_BIN_CFLAGS          += -MD
-  TEMPLATE_BIN_LIBS             = \
-        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL)_LIB)/oldnames.lib \
-        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL)_LIB)/msvcrt.lib
-  #     $(PATH_TOOL_$(TEMPLATE_BIN_TOOL)_LIB)/msvcprt.lib - avoid this to save space!
+  TEMPLATE_BIN_SDKS             = WINPSDK71
+  ifdef KBUILD_WITH_STATIC_MSVCRT
+   TEMPLATE_BIN_CFLAGS         += -MT
+   TEMPLATE_BIN_LIBS            = \
+        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL)_LIB)/oldnames.lib \
+        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL)_LIB)/libcmt.lib \
+        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL)_LIB)/libcpmt.lib
+  else
+   TEMPLATE_BIN_CFLAGS         += -MD
+   TEMPLATE_BIN_LIBS            = \
+        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL)_LIB)/oldnames.lib \
+        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL)_LIB)/msvcrt.lib
+  endif
  endif
 endif