diff options
| author | Peter Foley <pefoley2@verizon.net> | 2011-12-18 01:46:03 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2011-12-18 01:46:03 +0100 |
| commit | eb2939e19075f9c4cd79cf468b1c4b6200623db9 (patch) | |
| tree | 87ad23e367956c33ffe0275843e9b74323d9c29c /solenv/gbuild/platform/WNT_INTEL_MSC.mk | |
| parent | c439bc7a4aa0a4e01e0d01e09c5869619240c040 (diff) | |
gbuild: MSVC: add support for building x64 libraries
The committer wants to state that he has no opinion on the content of
this commit due to total ignorance of the problem area.
Diffstat (limited to 'solenv/gbuild/platform/WNT_INTEL_MSC.mk')
| -rw-r--r-- | solenv/gbuild/platform/WNT_INTEL_MSC.mk | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 45c960905f58..1e068ffe8ee4 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -75,9 +75,7 @@ gb_RCDEFS := \ gb_RCFLAGS := \ -V -# FIXME: When porting to Windows64, we should use only: -# /c /Cp -gb_AFLAGS := /c /Cp /coff /safeseh +gb_AFLAGS := /c /Cp gb_CFLAGS := \ -Gd \ @@ -207,7 +205,6 @@ gb_LinkTarget_NOEXCEPTIONFLAGS := \ -DEXCEPTIONS_OFF \ gb_LinkTarget_LDFLAGS := \ - -MACHINE:IX86 \ -MANIFEST \ $(patsubst %,-LIBPATH:%,$(filter-out .,$(subst ;, ,$(subst \,/,$(ILIB))))) \ @@ -302,13 +299,14 @@ define gb_CxxObject__command $(call gb_Output_announce,$(2),$(true),CXX,3) $(call gb_Helper_abbreviate_dirs_native,\ mkdir -p $(dir $(1)) $(dir $(4)) && \ - $(gb_CXX) \ + $(if $(filter YES,$(CXXOBJECT_X64)), $(CXX_X64_BINARY), $(gb_CXX)) \ $(DEFS) \ $(T_CXXFLAGS) \ -Fd$(PDBFILE) \ $(gb_COMPILERDEPFLAGS) \ -I$(realpath $(dir $(3))) \ $(INCLUDE_STL) $(INCLUDE) \ + $(if $(filter YES,$(CXXOBJECT_X64)), -U_X86_ -D_AMD64_,) \ -c $(realpath $(3)) \ -Fo$(1)) $(call gb_create_deps,$(1),$(4),$(realpath $(3))) endef @@ -353,11 +351,13 @@ $(call gb_Helper_abbreviate_dirs_native,\ $(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \ $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),$(shell cat $(extraobjectlist))) \ $(NATIVERES))) && \ - $(gb_LINK) \ + $(if $(filter YES,$(LIBRARY_X64)), $(LINK_X64_BINARY), $(gb_LINK)) \ $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ $(if $(filter StaticLibrary,$(TARGETTYPE)),$(gb_StaticLibrary_TARGETTYPEFLAGS)) \ $(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \ $(if $(filter YES,$(TARGETGUI)), -SUBSYSTEM:WINDOWS, -SUBSYSTEM:CONSOLE) \ + $(if $(filter YES,$(LIBRARY_X64)), -MACHINE:X64, -MACHINE:IX86) \ + $(if $(filter YES,$(LIBRARY_X64)), -LIBPATH:$(COMPATH)/lib/amd64 -LIBPATH:$(WINDOWS_SDK_HOME)/lib/x64,) \ $(T_LDFLAGS) \ $(if $(gb_PRODUCT),,-NODEFAULTLIB) \ @$${RESPONSEFILE} \ @@ -377,7 +377,6 @@ gb_Windows_PE_TARGETTYPEFLAGS := \ -opt:noref \ -incremental:no \ -debug \ - -safeseh \ -nxcompat \ -dynamicbase \ |