Changeset 2960 for trunk/kLdr/testcase

Timestamp:

Feb 11, 2007, 5:31:52 AM (19 years ago)

Author:

bird

Message:

Build on amd64.

File:

• trunk/kLdr/testcase/Makefile.kmk (modified) (3 diffs)

trunk/kLdr/testcase/Makefile.kmk

@@ -36 +36 @@
 #
 TEMPLATE_TST = Testcase template
-ifneq ($(filter win nt win32 win64,$(BUILD_TARGET)),)
- TEMPLATE_TST_TOOL = VCC70
- TEMPLATE_TST_CFLAGS = -W3 -Zi -Zl -MD
+ifeq ($(BUILD_TARGET),win)
+ ifeq ($(BUILD_TARGET_ARCH),x86)
+  TEMPLATE_TST_TOOL = VCC70
+  TEMPLATE_TST_CFLAGS = -W3 -Zi -Zl -MD
+  TEMPLATE_TST_CXXFLAGS = -W3 -Zi -Zl -MD
+  TEMPLATE_TST_LIBS = \
+        $(PATH_TOOL_VCC70_LIB)/oldnames.lib \
+        $(PATH_TOOL_VCC70_LIB)/msvcrt.lib
+ else
+  TEMPLATE_TST_TOOL = VCC80AMD64
+  TEMPLATE_TST_CFLAGS = -W3 -Zi -Zl -MD
+  TEMPLATE_TST_CXXFLAGS = -W3 -Zi -Zl -MD
+  TEMPLATE_TST_LIBS = \
+        $(PATH_TOOL_VCC80AMD64_LIB)/oldnames.lib \
+        $(PATH_TOOL_VCC80AMD64_LIB)/msvcrt.lib
+ endif
  TEMPLATE_TST_CFLAGS.release = -O2
- TEMPLATE_TST_CXXFLAGS = -W3 -Zi -Zl -MD
  TEMPLATE_TST_CXXFLAGS.release = -O2
  TEMPLATE_TST_ASFLAGS = -f win
  TEMPLATE_TST_DEFS = __WIN__
- TEMPLATE_TST_SDKS = WIN32SDK
- #kLdr_SDKS.x86 = WIN32SDK
- #kLdr_SDKS.amd64 = WIN64SDK
-
-## @todo this is a kBuild bug!
- TEMPLATE_TST_LIBS = \
-        $$(PATH_TOOL_VCC70_LIB)/oldnames.lib \
-        $$(PATH_TOOL_VCC70_LIB)/msvcrt.lib
+ TEMPLATE_TST_SDKS.x86 = WIN32SDK
+ TEMPLATE_TST_SDKS.amd64 = WIN64SDK
+
 else
  ifneq ($(filter os2,$(BUILD_TARGET)),)
@@ -71 +78 @@
 TEMPLATE_TSTPROG = Testcase program template
 TEMPLATE_TSTPROG_EXTENDS = TST
-ifneq ($(filter win nt win32 win64,$(BUILD_TARGET)),)
-else
-endif
 
 
 TEMPLATE_TSTDLL = Testcase dll template
 TEMPLATE_TSTDLL_EXTENDS = TST
-ifneq ($(filter win nt win32 win64,$(BUILD_TARGET)),)
-else
-endif
 
 
 TEMPLATE_TSTBARE = Bare bone testcase template
-ifneq ($(filter win nt win32 win64,$(BUILD_TARGET)),)
- TEMPLATE_TSTBARE_TOOL = VCC70
+ifeq ($(BUILD_TARGET),win)
+ ifeq ($(BUILD_TARGET_ARCH),x86)
+  TEMPLATE_TSTBARE_TOOL = VCC70
+ else
+  TEMPLATE_TSTBARE_TOOL = VCC80AMD64
+ endif
  TEMPLATE_TSTBARE_CFLAGS = -W3 -Zi -Zl
  TEMPLATE_TSTBARE_CFLAGS.release = -O2
@@ -92 +97 @@
  TEMPLATE_TSTBARE_ASFLAGS = -f win
  TEMPLATE_TSTBARE_DEFS = __WIN__
- TEMPLATE_TSTBARE_SDKS = WIN32SDK
+ TEMPLATE_TSTBARE_SDKS.x86 = WIN32SDK
+ TEMPLATE_TSTBARE_SDKS.amd64 = WIN64SDK
 
 else