fixed bakefile so that in-tree headers take precedence over system-installed ones

[wxWidgets.git] / contrib / samples / deprecated / treelay / makefile.vc

diff --git a/contrib/samples/deprecated/treelay/makefile.vc b/contrib/samples/deprecated/treelay/makefile.vc
index ab9aa623b28409ebffef5c0e36d27c792cd35c03..3dc2ec80bfb9effe0c8356af39a96e3988f0fa93 100644 (file)
--- a/contrib/samples/deprecated/treelay/makefile.vc
+++ b/contrib/samples/deprecated/treelay/makefile.vc
@@ -21,7 +21,8 @@ TREELAY_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 \
-       /I.\..\..\..\include $(CXXFLAGS) /GR /GX
+       /I.\..\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG_8) \
+       $(__EXCEPTIONSFLAG_9)
 TREELAY_OBJECTS =  \
        $(OBJS)\treelay_treelay.obj \
        $(OBJS)\treelay_treelay.res
@@ -118,6 +119,18 @@ __DLLFLAG_p = /DWXUSINGDLL
 !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