Fix wrong configure test for abi::__forced_unwind in previous commit.

[wxWidgets.git] / samples / widgets / makefile.bcc

diff --git a/samples/widgets/makefile.bcc b/samples/widgets/makefile.bcc
index 202be001f0c6e0b498a212812079983b2c305c14..e518376ef26f4f5611ef5134ed94cc4c7123330d 100644 (file)
--- a/samples/widgets/makefile.bcc
+++ b/samples/widgets/makefile.bcc
@@ -24,8 +24,9 @@ BCCDIR = $(MAKEDIR)\..
 WX_RELEASE_NODOT = 29\r
 COMPILER_PREFIX = bcc\r
 OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
+       $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \\r
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 WIDGETS_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
@@ -62,7 +63,7 @@ WIDGETS_OBJECTS =  \
        $(OBJS)\widgets_static.obj \\r
        $(OBJS)\widgets_statbmp.obj \\r
        $(OBJS)\widgets_textctrl.obj \\r
-       $(OBJS)\widgets_timepick.obj \
+       $(OBJS)\widgets_timepick.obj \\r
        $(OBJS)\widgets_toggle.obj \\r
        $(OBJS)\widgets_widgets.obj\r
 \r
@@ -74,6 +75,9 @@ PORTNAME = base
 !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"\r
 WXDEBUGFLAG = d\r
 !endif\r
@@ -96,7 +100,7 @@ LIBTYPE_SUFFIX = dll
 EXTRALIBS_FOR_BASE = \r
 !endif\r
 !if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
+EXTRALIBS_FOR_BASE =   \r
 !endif\r
 !if "$(BUILD)" == "debug"\r
 __OPTIMIZEFLAG_2 = -Od\r
@@ -344,9 +348,9 @@ $(OBJS)\widgets_statbmp.obj: .\statbmp.cpp
 $(OBJS)\widgets_textctrl.obj: .\textctrl.cpp\r
        $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\textctrl.cpp\r
 \r
-$(OBJS)\widgets_timepick.obj: .\timepick.cpp
-       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\timepick.cpp
-
+$(OBJS)\widgets_timepick.obj: .\timepick.cpp\r
+       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\timepick.cpp\r
+\r
 $(OBJS)\widgets_toggle.obj: .\toggle.cpp\r
        $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) .\toggle.cpp\r
 \r