diff options
| author | trims <none@none> | 2010-06-17 23:59:24 -0700 |
|---|---|---|
| committer | trims <none@none> | 2010-06-17 23:59:24 -0700 |
| commit | 8eaf07cb62553e5642bc7b0ed8d1539c6066a2a7 (patch) | |
| tree | 37dc371458b4c6a28f52d108524482632d67811a /make | |
| parent | a1bb21a43c078c10dd56b72f7ba36e8b96f0b64b (diff) | |
| parent | ee112a1a7da0ee3224477caf4f925df31233558c (diff) | |
Merge
Diffstat (limited to 'make')
| -rw-r--r-- | make/windows/makefiles/defs.make | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/make/windows/makefiles/defs.make b/make/windows/makefiles/defs.make index 7bb84ea2f..851fe4f48 100644 --- a/make/windows/makefiles/defs.make +++ b/make/windows/makefiles/defs.make @@ -69,8 +69,20 @@ ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) AMD64),) MAKE_ARGS += Platform_arch_model=x86_64 endif +ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) EM64T),) + ARCH_DATA_MODEL=64 + PLATFORM=windows-amd64 + VM_PLATFORM=windows_amd64 + HS_ARCH=x86 + MAKE_ARGS += LP64=1 + MAKE_ARGS += ARCH=x86 + MAKE_ARGS += BUILDARCH=amd64 + MAKE_ARGS += Platform_arch=x86 + MAKE_ARGS += Platform_arch_model=x86_64 +endif + # NB later OS versions than 2003 may report "Intel64" -ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) "EM64T\|Intel64"),) +ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) Intel64),) ARCH_DATA_MODEL=64 PLATFORM=windows-amd64 VM_PLATFORM=windows_amd64 |