Changeset 438

Timestamp:

May 27, 2006, 2:48:13 PM (19 years ago)

Author:

bird

Message:

win64

Location:

trunk/kBuild

Files:

• footer.kmk (modified) (2 diffs)
• header.kmk (modified) (6 diffs)

trunk/kBuild/footer.kmk ¶

@@ -1218 +1218 @@
 #   - On OS/2 and windows these are libraries.
 #   - On other platforms they are fake DLLs.
-ifeq ($(subst win32,os2,$(BUILD_TARGET)),os2)
+ifeq ($(filter-out win64 win32 os2,$(BUILD_TARGET)),)
 $(foreach target, $(IMPORT_LIBS) $(IMPORT_LIBS.$(BUILD_TARGET)), $(eval $(value def_lib)))
 else
@@ -1739 +1739 @@
 __footer_kmk__ := target
 endif # __footer_kmk__
-        
+

trunk/kBuild/header.kmk ¶

@@ -125 +125 @@
 endif
 
+# Win64
+ifeq ($(BUILD_PLATFORM),WIN64)
+$(error kBuild: BUILD_PLATFORM must be all lowercase!)
+endif
+ifeq ($(BUILD_PLATFORM),win64)
+_BUILD_PLATFORM_OK  := 1
+endif
+
 # L4
 ifeq ($(BUILD_PLATFORM),L4)
@@ -147 +155 @@
 # Fill in defaults if needed.
 ifndef BUILD_PLATFORM_ARCH
+ifeq ($(filter-out win64,$(BUILD_PLATFORM)),)
+BUILD_PLATFORM_ARCH   := amd64
+else
 BUILD_PLATFORM_ARCH   := x86
 endif
+endif
 ifndef BUILD_PLATFORM_CPU
+ifeq ($(filter-out amd64,$(BUILD_PLATFORM_ARCH)),)
+BUILD_PLATFORM_CPU    := k8
+else
 BUILD_PLATFORM_CPU    := i586
+endif
 endif
 
@@ -183 +199 @@
 endif
 ifeq ($(BUILD_TARGET),win32)
+_BUILD_TARGET_OK    := 1
+endif
+
+# Win64
+ifeq ($(BUILD_TARGET),WIN64)
+$(error kBuild: BUILD_TARGET must be all lowercase!)
+endif
+ifeq ($(BUILD_TARGET),win64)
 _BUILD_TARGET_OK    := 1
 endif
@@ -312 +336 @@
 endif
 
-# Win32
-ifeq ($(BUILD_PLATFORM),win32)
+# Win32 & Win64
+ifeq ($(filter-out win32 win64,$(BUILD_TARGET)),)
 EXEC_X86_WIN32      :=
 HOSTSUFF_EXE        := .exe
@@ -336 +360 @@
 SUFF_RES            := .res
 endif
-ifeq ($(BUILD_TARGET),win32)
+ifeq ($(filter-out win32 win64,$(BUILD_TARGET)),)
 SUFF_OBJ            := .obj
 SUFF_LIB            := .lib
@@ -514 +538 @@
 #
 # @param        $1      The paths to the directories which must be created.
-ifeq ($(BUILD_PLATFORM),win32)
+ifeq ($(filter-out win32 win64,$(BUILD_PLATFORM)),)
 DIRDEP = $(patsubst %/,%,$(1))
 else