reversed change

[wxWidgets.git] / contrib / samples / gizmos / splittree / makefile.vc

diff --git a/contrib/samples/gizmos/splittree/makefile.vc b/contrib/samples/gizmos/splittree/makefile.vc
index 784e1d49254627eb4c80c354138e9223a442a6c5..cef39cfbb7dc8ff1ca2a83996f3069995fac9769 100644 (file)
--- a/contrib/samples/gizmos/splittree/makefile.vc
+++ b/contrib/samples/gizmos/splittree/makefile.vc
@@ -21,7 +21,8 @@ SPLITTREE_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \
        $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\..\include \
        /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\..\samples \
        $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\..\include \
        /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\..\samples \

-       /I.\..\..\..\include $(CXXFLAGS) /GR /GX
+       /I.\..\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG_8) \
+       $(__EXCEPTIONSFLAG_9)

 SPLITTREE_OBJECTS =  \
        $(OBJS)\splittree_sample.res \
        $(OBJS)\splittree_tree.obj
 SPLITTREE_OBJECTS =  \
        $(OBJS)\splittree_sample.res \
        $(OBJS)\splittree_tree.obj


@@ -118,6 +119,18 @@ __DLLFLAG_p = /DWXUSINGDLL
 !if "$(SHARED)" == "1"
 __DLLFLAG_p_1 = /d WXUSINGDLL
 !endif
 !if "$(SHARED)" == "1"
 __DLLFLAG_p_1 = /d WXUSINGDLL
 !endif

+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_8 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_8 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_9 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_9 = /GX
+!endif

 !if "$(USE_GUI)" == "1"
 __LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
 !endif