Changeset 2960

Timestamp:

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

Author:

bird

Message:

Build on amd64.

Location:

trunk/kLdr

Files:

• Makefile.kmk (modified) (6 diffs)
• testcase/Makefile.kmk (modified) (3 diffs)

trunk/kLdr/Makefile.kmk

@@ -35 +35 @@
 #
 TEMPLATE_TST = Testcase template
-ifneq ($(filter win,$(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_LIBS = $(PATH_TOOL_VCC70_LIB)/msvcrt.lib
+ else
+  TEMPLATE_TST_TOOL = VCC80AMD64
+  TEMPLATE_TST_CFLAGS = -W3 -Zi -Zl -MD
+  TEMPLATE_TST_LIBS = $(PATH_TOOL_VCC80AMD64_LIB)/msvcrt.lib
+ endif
  TEMPLATE_TST_CFLAGS.release = -O2
  TEMPLATE_TST_ASFLAGS = -f win
@@ -43 +50 @@
  TEMPLATE_TST_SDKS = WINPSDK W2K3DDK
 
-## @todo this is a kBuild bug? $$(PATH_TOOL_VCC70_LIB)
- TEMPLATE_TST_LIBS = \
-        $$(PATH_TOOL_VCC70_LIB)/msvcrt.lib
-else
- ifneq ($(filter os2,$(BUILD_TARGET)),)
+else 
+ ifeq ($(BUILD_TARGET),os2)
   TEMPLATE_TST_TOOL = GCC3OMF
   TEMPLATE_TST_ASFLAGS = -f obj
@@ -68 +72 @@
 DLLS = kLdr
 kLdr_ASTOOL = NASM
-ifneq ($(filter win nt win32 win64,$(BUILD_TARGET)),)
- kLdr_TOOL = GCC3
- kLdr_TOOL = VCC70
- kLdr_CFLAGS = -W3 -Zl -ML
+ifeq ($(BUILD_TARGET),win)
+ ifeq ($(BUILD_TARGET_ARCH),x86)
+  kLdr_TOOL = VCC70
+  kLdr_CFLAGS = -W3 -Zl -ML
+  kLdr_LDFLAGS = -Entry:DllMain@12 -Debug
+  kLdr_LIBS = \
+        $(PATH_TOOL_VCC70_LIB)/LIBC.lib \
+        $(PATH_SDK_W2K3DDKX86_LIB)/ntdll.lib
+ else
+  kLdr_TOOL = VCC80AMD64
+  kLdr_CFLAGS = -W3 -Zl -MT
+  kLdr_LDFLAGS = -Entry:DllMain -Debug
+  kLdr_LIBS = \
+        $(PATH_TOOL_VCC80AMD64_LIB)/LIBCMT.lib \
+        $(PATH_SDK_W2K3DDKAMD64_LIB)/ntdll.lib
+ endif
  kLdr_ASFLAGS = -f win
- kLdr_LDFLAGS = -Entry:DllMain@12 -Debug
  kLdr_DEFS = __WIN__
  kLdr_SDKS.x86 = WIN32SDK W2K3DDKX86
  kLdr_SDKS.amd64 = WIN64SDK W2K3DDKAMD64
- kLdr_LIBS = \
-        $(PATH_TOOL_VCC70_LIB)/LIBC.lib \
-        $(PATH_SDK_W2K3DDKX86_LIB)/ntdll.lib
 else
- ifneq ($(filter os2,$(BUILD_TARGET)),)
+ ifeq ($(BUILD_TARGET),os2)
   kLdr_TOOL = GCC3OMF
   kLdr_ASFLAGS = -f obj
@@ -123 +135 @@
         kLdr-win.def \
         kLdr-win.c
-kLdr_SOURCES.win32 = $(kLdr_SOURCES.win)
-kLdr_SOURCES.win64 = $(kLdr_SOURCES.win)
 
 kLdrErr.c_DEPS = $(PATH_TARGET)/kldrErrConsts.h
@@ -146 +156 @@
 #
 PROGRAMS.win = kLdrExeStub-win
-PROGRAMS.win32 = kLdrExeStub-win
-PROGRAMS.win64 = kLdrExeStub-win
-kLdrExeStub-win_TOOL = VCC70
-kLdrExeStub-win_SDKS = WIN32SDK
+kLdrExeStub-win_TOOL.win.x86 = VCC70
+kLdrExeStub-win_TOOL.win.amd64 = VCC80AMD64
+kLdrExeStub-win_SDKS.x86 = WIN32SDK
+kLdrExeStub-win_SDKS.amd64 = WIN64SDK
 kLdrExeStub-win_INCS = .
 kLdrExeStub-win_DEFS = __WIN__
@@ -186 +196 @@
 tstkLdrMod_SOURCES = \
         tstkLdrMod.c
-ifneq ($(filter win win32 win64 nt,$(BUILD_TARGET)),)
+ifeq ($(BUILD_TARGET),win)
 tstkLdrMod_LIBS = $(TARGET_kLdr:.dll=.lib)
 else

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