Extract compiler-specific macro definitions in a new wx/compiler.h.

[wxWidgets.git] / samples / splash / makefile.vc

diff --git a/samples/splash/makefile.vc b/samples/splash/makefile.vc
index 9de2a4d833e4da40ea8cba661a59eee454e90bd0..1aed2141b8ca53d01f0c9674e4ed8e21357da6f0 100644 (file)
--- a/samples/splash/makefile.vc
+++ b/samples/splash/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)\r
 LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)\r
+       .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
 SETUPHDIR = \\r
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 SPLASH_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \\r
@@ -37,11 +37,32 @@ SPLASH_RESOURCES =  \
 \r
 ### Conditionally set variables: ###\r
 \r
+!if "$(TARGET_CPU)" == "AMD64"\r
+ARCH_SUFFIX = _x64\r
+!endif\r
+!if "$(TARGET_CPU)" == "IA64"\r
+ARCH_SUFFIX = _ia64\r
+!endif\r
+!if "$(TARGET_CPU)" == "X64"\r
+ARCH_SUFFIX = _x64\r
+!endif\r
+!if "$(TARGET_CPU)" == "amd64"\r
+ARCH_SUFFIX = _x64\r
+!endif\r
+!if "$(TARGET_CPU)" == "ia64"\r
+ARCH_SUFFIX = _ia64\r
+!endif\r
+!if "$(TARGET_CPU)" == "x64"\r
+ARCH_SUFFIX = _x64\r
+!endif\r
 !if "$(USE_GUI)" == "0"\r
 PORTNAME = base\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
+PORTNAME = msw$(TOOLKIT_VERSION)\r
+!endif\r
+!if "$(OFFICIAL_BUILD)" == "1"\r
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD\r
 !endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
 WXDEBUGFLAG = d\r
@@ -55,18 +76,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
@@ -82,12 +91,18 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "IA64"\r
 LINK_TARGET_CPU = /MACHINE:IA64\r
 !endif\r
+!if "$(TARGET_CPU)" == "X64"\r
+LINK_TARGET_CPU = /MACHINE:X64\r
+!endif\r
 !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"\r
+LINK_TARGET_CPU = /MACHINE:X64\r
+!endif\r
 !if "$(MONOLITHIC)" == "0"\r
 EXTRALIBS_FOR_BASE = \r
 !endif\r
@@ -312,6 +327,9 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
+!if "$(MONOLITHIC)" == "1"\r
+__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
+!endif\r
 !if "$(USE_GUI)" == "1"\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
 !endif\r
@@ -350,7 +368,7 @@ clean:
 \r
 $(OBJS)\splash.exe: $(SPLASH_OBJECTS) $(OBJS)\splash_sample.res\r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\splash.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
-       $(SPLASH_OBJECTS) $(SPLASH_RESOURCES)  $(__WXLIB_MEDIA_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
+       $(SPLASH_OBJECTS) $(SPLASH_RESOURCES)  $(__WXLIB_MEDIA_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib\r
 <<\r
 \r
 data: \r