Updated for windows-x64 builds.

This commit is contained in:
Janet B. Anderson
2009-10-13 15:54:39 +00:00
parent b8ccd30d77
commit 9ecfb6355c
3 changed files with 45 additions and 12 deletions

View File

@@ -0,0 +1,28 @@
# CONFIG.win-x86.windows-x64
#
# $Id$
# This file is maintained by the build community.
#
# Definitions for windows-x64 target archs when host arch is win32-x86
# Sites may override these definitions in CONFIG_SITE.win32-x86.windows-x64
#-------------------------------------------------------
-include $(CONFIG)/os/CONFIG.Common.win32-x86
-include $(CONFIG)/os/CONFIG.win32-x86.win32-x86
ARCH_DEP_CPPFLAGS += /favor:blend
#ARCH_DEP_CPPFLAGS += /Wp64
# /favor:blend both AMD64 and INTEL64
# /favor:AMD64
# /favor:INTEL64 (new value)
# /favor:EN64T (old value)
OPT_LDFLAGS += /MACHINE:X64
# /MACHINE:X64
# /MACHINE:IA64 (Itanium)
# /MACHINE:X86
#The following option does not work
#ARCH_DEP_CPPFLAGS += /env x64

View File

@@ -1,13 +1,13 @@
# CONFIG.win-x86_64.Common
# CONFIG.windows-x64.Common
#
# $Id$
# This file is maintained by the build community.
#
# Definitions for win-x86_64 host archs
# Sites may override these definitions in CONFIG_SITE.win-x86_64.Common
# Definitions for windows-x64 host archs
# Sites may override these definitions in CONFIG_SITE.windows-x64.Common
#-------------------------------------------------------
-include $(CONFIG)/os/CONFIG.win32-x86.Common
WIND_HOST_TYPE = x86_64-win
WIND_HOST_TYPE = x64-win

View File

@@ -1,20 +1,25 @@
# CONFIG.win-x86_64.win-x86_64
# CONFIG.windows-x64.windows-x64
#
# $Id$
# This file is maintained by the build community.
#
# Definitions for win-x86_64 target archs when host arch is win-x86_64
# Sites may override these definitions in CONFIG_SITE.win-x86_64.win-x86_64
# Definitions for windows-x64 target archs when host arch is windows-x64
# Sites may override these definitions in CONFIG_SITE.windows-x64.windows-x64
#-------------------------------------------------------
-include $(CONFIG)/os/CONFIG.win32-x86.win32-x86
#-------------------------------------------------------
ARCH_DEP_CPPFLAGS += /favor:blend
#ARCH_DEP_CPPFLAGS += /Wp64
# /favor:blend both AMD64 and INTEL64
# /favor:AMD64
# /favor:INTEL64 (new value)
# /favor:EN64T (old value)
STATIC_LDLIBS_YES=ws2_64.lib advapi64.lib user64.lib kernel64.lib winmm.lib
OPT_LDFLAGS += /MACHINE:X64
WIN_DLLFLAGS = /subsystem:windows /dll $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(LIB_LDFLAGS)
LINK.shrlib = $(WINLINK) /nologo $(WIN_DLLFLAGS) /implib:$*.lib /out:$*.dll $(DLL_DEF_FLAG)
# /MACHINE:X64
# /MACHINE:IA64 (Itanium)
# /MACHINE:X86