MinGW-w64 provides isfinite() in both 32 and 64 bit builds.

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

diff --git a/samples/console/makefile.vc b/samples/console/makefile.vc
index 295269860a726115dad153139e7a0ceb7a464cc5..2f08a2beafe42305c5e3665f01fa4606bbd25010 100644 (file)
--- a/samples/console/makefile.vc
+++ b/samples/console/makefile.vc
@@ -12,12 +12,12 @@
 \r
 ### Variables: ###\r
 \r
-WX_RELEASE_NODOT = 29\r
+WX_RELEASE_NODOT = 30\r
 COMPILER_PREFIX = vc\r
 OBJS = \\r
-       $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+       $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)\r
 LIBDIRNAME = \\r
-       .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+       .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
 SETUPHDIR = \\r
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 CONSOLE_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \\r
@@ -35,33 +35,33 @@ CONSOLE_OBJECTS =  \
 \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 "$(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 "$(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
@@ -89,18 +89,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)" == "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"
-LINK_TARGET_CPU = /MACHINE:X64
-!endif
+!if "$(TARGET_CPU)" == "x64"\r
+LINK_TARGET_CPU = /MACHINE:X64\r
+!endif\r
 !if "$(MONOLITHIC)" == "0"\r
 EXTRALIBS_FOR_BASE = \r
 !endif\r