Changeset 861 in kBuild for trunk

Timestamp:

Mar 30, 2007 1:50:45 AM (18 years ago)

Author:

bird

Message:

win.amd64.

File:

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

trunk/Config.kmk

@@ -84 +84 @@
 
 ifeq ($(filter-out win nt,$(BUILD_TARGET)),)
- include $(PATH_KBUILD)/tools/VCC70.kmk # fixme! template expanding does something bad to _LIBS /me thinks.
- TEMPLATE_BIN_TOOL              = VCC70
- TEMPLATE_BIN_DEFS              = WINDOWS32 _CONSOLE WIN32 __WIN32__
+ ifeq ($(BUILD_TARGET_ARCH),x86)
+  include $(PATH_KBUILD)/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 ($(BUILD_TARGET_ARCH),amd64)
+  TEMPLATE_BIN_TOOL             = VCC80AMD64
+  TEMPLATE_BIN_DEFS             = WINDOWS32 _CONSOLE __WIN__ WIN32 __WIN32__ __WIN64__ WIN64 _CRT_SECURE_NO_DEPRECATE
+ endif
  TEMPLATE_BIN_DEFS.release      = NDEBUG
  TEMPLATE_BIN_SDKS              = WINPSDK
@@ -100 +105 @@
  TEMPLATE_BIN_CFLAGS           += -MT
  TEMPLATE_BIN_LIBS              = \
-        $(PATH_TOOL_VCC70_LIB)/oldnames.lib \
-        $(PATH_TOOL_VCC70_LIB)/libcmt.lib \
-        $(PATH_TOOL_VCC70_LIB)/libcpmt.lib
+        $(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_VCC70_LIB)/oldnames.lib \
-        $(PATH_TOOL_VCC70_LIB)/msvcrt.lib
- #      $(PATH_TOOL_VCC70_LIB)/msvcprt.lib - avoid this to save space!
+        $(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!
  endif
  TEMPLATE_BIN_LIBS.profile      = g:/coding/vbox/trunk/out/win32/debug/lib/kPrf2.lib