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

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

diff --git a/samples/widgets/makefile.gcc b/samples/widgets/makefile.gcc
index e138d1be654a13d230c586bbe1df70c95008d62f..7dba17b2ebed6d2a4b587c79a8e4ac50afdf8f62 100644 (file)
--- a/samples/widgets/makefile.gcc
+++ b/samples/widgets/makefile.gcc
@@ -16,8 +16,9 @@ CPPDEPS = -MT$@ -MF$@.d -MD -MP
 WX_RELEASE_NODOT = 29\r
 COMPILER_PREFIX = gcc\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 = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
@@ -55,6 +56,7 @@ WIDGETS_OBJECTS =  \
        $(OBJS)\widgets_static.o \\r
        $(OBJS)\widgets_statbmp.o \\r
        $(OBJS)\widgets_textctrl.o \\r
+       $(OBJS)\widgets_timepick.o \\r
        $(OBJS)\widgets_toggle.o \\r
        $(OBJS)\widgets_widgets.o \\r
        $(OBJS)\widgets_sample_rc.o\r
@@ -70,6 +72,9 @@ endif
 ifeq ($(USE_GUI),1)\r
 PORTNAME = msw\r
 endif\r
+ifeq ($(OFFICIAL_BUILD),1)
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+endif
 ifeq ($(BUILD),debug)\r
 WXDEBUGFLAG = d\r
 endif\r
@@ -92,7 +97,7 @@ ifeq ($(MONOLITHIC),0)
 EXTRALIBS_FOR_BASE = \r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE =  \r
+EXTRALIBS_FOR_BASE =   \r
 endif\r
 ifeq ($(BUILD),debug)\r
 __OPTIMIZEFLAG_2 = -O0\r
@@ -330,6 +335,9 @@ $(OBJS)\widgets_statbmp.o: ./statbmp.cpp
 $(OBJS)\widgets_textctrl.o: ./textctrl.cpp\r
        $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<\r
 \r
+$(OBJS)\widgets_timepick.o: ./timepick.cpp\r
+       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<\r
+\r
 $(OBJS)\widgets_toggle.o: ./toggle.cpp\r
        $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<\r
 \r