]> git.saurik.com Git - wxWidgets.git/blobdiff - samples/html/helpview/makefile.vc
added default value (0) for flags argument of AdjustForParentClientOrigin()
[wxWidgets.git] / samples / html / helpview / makefile.vc
index 587562d8b4fc3ed958757472fe03976a2d16bf59..c3139dd1015966ac91ed791023b465b09d4d80ff 100644 (file)
@@ -17,7 +17,7 @@ HELPVIEW_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 \
-       $(CXXFLAGS) /GR /GX
+       $(CXXFLAGS) $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9)
 HELPVIEW_OBJECTS =  \
        $(OBJS)\helpview_helpview.obj \
        $(OBJS)\helpview_helpview.res
@@ -118,6 +118,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