X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ec08d395bd37d7446787f5539b40a8ed5283654c..3527f29c8769e09d796c547c0c309f8b86407012:/contrib/build/plot/makefile.wat?ds=inline diff --git a/contrib/build/plot/makefile.wat b/contrib/build/plot/makefile.wat index 11265be8ff..6223e0ab15 100644 --- a/contrib/build/plot/makefile.wat +++ b/contrib/build/plot/makefile.wat @@ -112,6 +112,13 @@ __DEBUG_DEFINE_p = -d__WXDEBUG__ !ifeq DEBUG_FLAG 1 __DEBUG_DEFINE_p = -d__WXDEBUG__ !endif +__EXCEPTIONSFLAG = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG = -xs +!endif __LIB_JPEG_p = !ifeq USE_GUI 1 __LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib @@ -179,14 +186,15 @@ PLOTDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=..\..\src\plot\..\..\..\include -i=$(SETUPHDIR) & -i=..\..\src\plot\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_PLOT $(CXXFLAGS) & - /fh=$(OBJS)\wxprec_plotdll.pch + /fh=$(OBJS)\wxprec_plotdll.pch $(__EXCEPTIONSFLAG) PLOTDLL_OBJECTS = & $(OBJS)\plotdll_dummy.obj & $(OBJS)\plotdll_plot.obj PLOTLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=..\..\src\plot\..\..\..\include -i=$(SETUPHDIR) & - -i=..\..\src\plot\..\..\include $(CXXFLAGS) /fh=$(OBJS)\wxprec_plotlib.pch + -i=..\..\src\plot\..\..\include $(CXXFLAGS) /fh=$(OBJS)\wxprec_plotlib.pch & + $(__EXCEPTIONSFLAG) PLOTLIB_OBJECTS = & $(OBJS)\plotlib_dummy.obj & $(OBJS)\plotlib_plot.obj