make some reference handling a little more direct and less obscure

[wxWidgets.git] / utils / screenshotgen / src / makefile.vc

diff --git a/utils/screenshotgen/src/makefile.vc b/utils/screenshotgen/src/makefile.vc
index dde61d8750c6aa611ae5308a3ef605f8a37d32f5..bd9cfca8b6fdb214ac4d571173ccafa0195949e7 100644 (file)
--- a/utils/screenshotgen/src/makefile.vc
+++ b/utils/screenshotgen/src/makefile.vc
@@ -15,9 +15,9 @@
 WX_RELEASE_NODOT = 29\r
 COMPILER_PREFIX = vc\r
 OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)\r
+       $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
 LIBDIRNAME = \\r
-       .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
+       .\..\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \\r
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 SCREENSHOTGEN_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \\r
@@ -41,12 +41,33 @@ SCREENSHOTGEN_RESOURCES =  \
 \r
 ### Conditionally set variables: ###\r
 \r
+!if "$(TARGET_CPU)" == "AMD64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+ARCH_SUFFIX = _ia64
+!endif
+!if "$(TARGET_CPU)" == "X64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+ARCH_SUFFIX = _ia64
+!endif
+!if "$(TARGET_CPU)" == "x64"
+ARCH_SUFFIX = _x64
+!endif
 !if "$(USE_GUI)" == "0"\r
 PORTNAME = base\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r
 PORTNAME = msw\r
 !endif\r
+!if "$(OFFICIAL_BUILD)" == "1"
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+!endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
 WXDEBUGFLAG = d\r
 !endif\r
@@ -59,18 +80,6 @@ WXUNICODEFLAG = u
 !if "$(WXUNIV)" == "1"\r
 WXUNIVNAME = univ\r
 !endif\r
-!if "$(TARGET_CPU)" == "AMD64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "IA64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
-!if "$(TARGET_CPU)" == "amd64"\r
-DIR_SUFFIX_CPU = _amd64\r
-!endif\r
-!if "$(TARGET_CPU)" == "ia64"\r
-DIR_SUFFIX_CPU = _ia64\r
-!endif\r
 !if "$(SHARED)" == "1"\r
 WXDLLFLAG = dll\r
 !endif\r
@@ -86,12 +95,18 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "IA64"\r
 LINK_TARGET_CPU = /MACHINE:IA64\r
 !endif\r
+!if "$(TARGET_CPU)" == "X64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
 !if "$(TARGET_CPU)" == "amd64"\r
 LINK_TARGET_CPU = /MACHINE:X64\r
 !endif\r
 !if "$(TARGET_CPU)" == "ia64"\r
 LINK_TARGET_CPU = /MACHINE:IA64\r
 !endif\r
+!if "$(TARGET_CPU)" == "x64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
 !if "$(MONOLITHIC)" == "0"\r
 EXTRALIBS_FOR_BASE = \r
 !endif\r