More wxMac compilation fixes.

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

diff --git a/samples/ownerdrw/makefile.gcc b/samples/ownerdrw/makefile.gcc
index 01a9d42ccf3a7e64175b8332386d23afdf1a8ddb..9b076ede186f411cc3920bcb9ea3d480dd3bdbc2 100644 (file)
--- a/samples/ownerdrw/makefile.gcc
+++ b/samples/ownerdrw/makefile.gcc
@@ -17,7 +17,8 @@ OBJS = \
 OWNERDRW_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 $(CXXFLAGS)
+       $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \
+       $(__EXCEPTIONSFLAG_5)
 OWNERDRW_OBJECTS =  \
        $(OBJS)\ownerdrw_ownerdrw.o \
        $(OBJS)\ownerdrw_ownerdrw_rc.o
@@ -96,6 +97,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
@@ -151,7 +164,7 @@ $(OBJS)\ownerdrw_ownerdrw.o: ./ownerdrw.cpp
        $(CXX) -c -o $@ $(OWNERDRW_CXXFLAGS) $<
 
 $(OBJS)\ownerdrw_ownerdrw_rc.o: ./ownerdrw.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
+       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
 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o