Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

64-bit compile fixes.

Browse Source 
NOTE: These changes are done by hand and will need to be redone after rebaking the 
files, until the next version of bakefile is ready.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@55224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2008-08-24 04:14:45 +00:00
parent 7bdd98dc13
commit d774a149d5
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
build/msw/makefile.vc
View File

@@ -1282,13 +1282,13 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1" !if "$(WXUNIV)" == "1"
WXUNIVNAME = univ WXUNIVNAME = univ
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "AMD64"
DIR_SUFFIX_CPU = _amd64 DIR_SUFFIX_CPU = _amd64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "amd64"
DIR_SUFFIX_CPU = _amd64 DIR_SUFFIX_CPU = _amd64
!endif !endif
!if "$(TARGET_CPU)" == "ia64" !if "$(TARGET_CPU)" == "IA64"
DIR_SUFFIX_CPU = _ia64 DIR_SUFFIX_CPU = _ia64
!endif !endif
!if "$(TARGET_CPU)" == "ia64" !if "$(TARGET_CPU)" == "ia64"
@@ -1303,13 +1303,13 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1" !if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll LIBTYPE_SUFFIX = dll
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "AMD64"
LINK_TARGET_CPU = /MACHINE:AMD64 LINK_TARGET_CPU = /MACHINE:AMD64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "amd64"
LINK_TARGET_CPU = /MACHINE:AMD64 LINK_TARGET_CPU = /MACHINE:AMD64
!endif !endif
!if "$(TARGET_CPU)" == "ia64" !if "$(TARGET_CPU)" == "IA64"
LINK_TARGET_CPU = /MACHINE:IA64 LINK_TARGET_CPU = /MACHINE:IA64
!endif !endif
!if "$(TARGET_CPU)" == "ia64" !if "$(TARGET_CPU)" == "ia64"

8
contrib/build/gizmos/makefile.vc
View File

@@ -111,13 +111,13 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1" !if "$(WXUNIV)" == "1"
WXUNIVNAME = univ WXUNIVNAME = univ
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "AMD64"
DIR_SUFFIX_CPU = _amd64 DIR_SUFFIX_CPU = _amd64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "amd64"
DIR_SUFFIX_CPU = _amd64 DIR_SUFFIX_CPU = _amd64
!endif !endif
!if "$(TARGET_CPU)" == "ia64" !if "$(TARGET_CPU)" == "IA64"
DIR_SUFFIX_CPU = _ia64 DIR_SUFFIX_CPU = _ia64
!endif !endif
!if "$(TARGET_CPU)" == "ia64" !if "$(TARGET_CPU)" == "ia64"
@@ -132,13 +132,13 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1" !if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll LIBTYPE_SUFFIX = dll
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "AMD64"
LINK_TARGET_CPU = /MACHINE:AMD64 LINK_TARGET_CPU = /MACHINE:AMD64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "amd64"
LINK_TARGET_CPU = /MACHINE:AMD64 LINK_TARGET_CPU = /MACHINE:AMD64
!endif !endif
!if "$(TARGET_CPU)" == "ia64" !if "$(TARGET_CPU)" == "IA64"
LINK_TARGET_CPU = /MACHINE:IA64 LINK_TARGET_CPU = /MACHINE:IA64
!endif !endif
!if "$(TARGET_CPU)" == "ia64" !if "$(TARGET_CPU)" == "ia64"

8
contrib/build/stc/makefile.vc
View File

@@ -239,13 +239,13 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1" !if "$(WXUNIV)" == "1"
WXUNIVNAME = univ WXUNIVNAME = univ
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "AMD64"
DIR_SUFFIX_CPU = _amd64 DIR_SUFFIX_CPU = _amd64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "amd64"
DIR_SUFFIX_CPU = _amd64 DIR_SUFFIX_CPU = _amd64
!endif !endif
!if "$(TARGET_CPU)" == "ia64" !if "$(TARGET_CPU)" == "IA64"
DIR_SUFFIX_CPU = _ia64 DIR_SUFFIX_CPU = _ia64
!endif !endif
!if "$(TARGET_CPU)" == "ia64" !if "$(TARGET_CPU)" == "ia64"
@@ -260,13 +260,13 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1" !if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll LIBTYPE_SUFFIX = dll
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "AMD64"
LINK_TARGET_CPU = /MACHINE:AMD64 LINK_TARGET_CPU = /MACHINE:AMD64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "amd64"
LINK_TARGET_CPU = /MACHINE:AMD64 LINK_TARGET_CPU = /MACHINE:AMD64
!endif !endif
!if "$(TARGET_CPU)" == "ia64" !if "$(TARGET_CPU)" == "IA64"
LINK_TARGET_CPU = /MACHINE:IA64 LINK_TARGET_CPU = /MACHINE:IA64
!endif !endif
!if "$(TARGET_CPU)" == "ia64" !if "$(TARGET_CPU)" == "ia64"

8
samples/minimal/makefile.vc
View File

@@ -50,13 +50,13 @@ WXUNICODEFLAG = u
!if "$(WXUNIV)" == "1" !if "$(WXUNIV)" == "1"
WXUNIVNAME = univ WXUNIVNAME = univ
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "AMD64"
DIR_SUFFIX_CPU = _amd64 DIR_SUFFIX_CPU = _amd64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "amd64"
DIR_SUFFIX_CPU = _amd64 DIR_SUFFIX_CPU = _amd64
!endif !endif
!if "$(TARGET_CPU)" == "ia64" !if "$(TARGET_CPU)" == "IA64"
DIR_SUFFIX_CPU = _ia64 DIR_SUFFIX_CPU = _ia64
!endif !endif
!if "$(TARGET_CPU)" == "ia64" !if "$(TARGET_CPU)" == "ia64"
@@ -71,13 +71,13 @@ LIBTYPE_SUFFIX = lib
!if "$(SHARED)" == "1" !if "$(SHARED)" == "1"
LIBTYPE_SUFFIX = dll LIBTYPE_SUFFIX = dll
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "AMD64"
LINK_TARGET_CPU = /MACHINE:AMD64 LINK_TARGET_CPU = /MACHINE:AMD64
!endif !endif
!if "$(TARGET_CPU)" == "amd64" !if "$(TARGET_CPU)" == "amd64"
LINK_TARGET_CPU = /MACHINE:AMD64 LINK_TARGET_CPU = /MACHINE:AMD64
!endif !endif
!if "$(TARGET_CPU)" == "ia64" !if "$(TARGET_CPU)" == "IA64"
LINK_TARGET_CPU = /MACHINE:IA64 LINK_TARGET_CPU = /MACHINE:IA64
!endif !endif
!if "$(TARGET_CPU)" == "ia64" !if "$(TARGET_CPU)" == "ia64"