Fixed "" default value

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

diff --git a/samples/stc/makefile.gcc b/samples/stc/makefile.gcc
index 352deda40395c8986425e341391a12a56f8d0933..a34e4ade154d958bb29773c843aee475c24d2609 100644 (file)
--- a/samples/stc/makefile.gcc
+++ b/samples/stc/makefile.gcc
@@ -19,10 +19,13 @@ SETUPHDIR = \
 STCTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. \
-       $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include $(CXXFLAGS)
+       $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include $(CXXFLAGS) \
+       $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5)
 STCTEST_OBJECTS =  \
        $(OBJS)\stctest_sample_rc.o \
-       $(OBJS)\stctest_stctest.o
+       $(OBJS)\stctest_stctest.o \
+       $(OBJS)\stctest_edit.o \
+       $(OBJS)\stctest_prefs.o
 
 ### Conditionally set variables: ###
 
@@ -96,6 +99,18 @@ endif
 ifeq ($(SHARED),1)
 __DLLFLAG_p_1 = --define WXUSINGDLL
 endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_4 = -fno-rtti
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_4 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_5 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_5 = 
+endif
 ifeq ($(USE_GUI),1)
 __LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
 endif
@@ -147,6 +162,12 @@ $(OBJS):
 
 all: $(OBJS)\stctest.exe data
 
+$(OBJS)\stctest_edit.o: ./edit.cpp
+       $(CXX) -c -o $@ $(STCTEST_CXXFLAGS) $<
+
+$(OBJS)\stctest_prefs.o: ./prefs.cpp
+       $(CXX) -c -o $@ $(STCTEST_CXXFLAGS) $<
+
 $(OBJS)\stctest_sample_rc.o: ./../../../samples/sample.rc
        windres --use-temp-file -i$< -o$@  --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples