X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ec08d395bd37d7446787f5539b40a8ed5283654c..9c54e4ae1f401a9c337b97b588e5a356d79cbe82:/samples/xrc/makefile.wat diff --git a/samples/xrc/makefile.wat b/samples/xrc/makefile.wat index 1072b1ed18..970f96944c 100644 --- a/samples/xrc/makefile.wat +++ b/samples/xrc/makefile.wat @@ -109,6 +109,13 @@ __DLLFLAG_p = !ifeq SHARED 1 __DLLFLAG_p = -dWXUSINGDLL !endif +__EXCEPTIONSFLAG_7 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_7 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_7 = -xs +!endif __LIB_JPEG_p = !ifeq USE_GUI 1 __LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib @@ -178,10 +185,11 @@ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -XRCDEMO_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & - $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples -i=.\..\..\include $(CXXFLAGS) +XRCDEMO_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) & + -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & + -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) & + -i=.\..\..\..\samples -i=.\..\..\include $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) & + $(CXXFLAGS) XRCDEMO_OBJECTS = & $(OBJS)\xrcdemo_xrcdemo.obj & $(OBJS)\xrcdemo_myframe.obj &