added .chm support for Unix (Markus Sinner)

[wxWidgets.git] / contrib / build / xrc / makefile.wat

diff --git a/contrib/build/xrc/makefile.wat b/contrib/build/xrc/makefile.wat
index 6841a521150876c5e5d18ac74d9a84e2f639ad47..90c1c9262442f9d6c14516ede1074fd7c0e78663 100644 (file)
--- a/contrib/build/xrc/makefile.wat
+++ b/contrib/build/xrc/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
@@ -195,7 +202,7 @@ XRCDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\..\src\xrc\..\..\..\include -i=$(SETUPHDIR) &
        -i=..\..\src\xrc\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_XRC $(CXXFLAGS) &
-       /fh=$(OBJS)\wxprec_xrcdll.pch
+       /fh=$(OBJS)\wxprec_xrcdll.pch $(__EXCEPTIONSFLAG)
 XRCDLL_OBJECTS =  &
        $(OBJS)\xrcdll_dummy.obj &
        $(OBJS)\xrcdll_xmlres.obj &
@@ -239,7 +246,8 @@ XRCLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\..\src\xrc\..\..\..\include -i=$(SETUPHDIR) &
        -i=..\..\src\xrc\..\..\include -i=..\..\src\xrc\expat\xmlparse &
-       -i=..\..\src\xrc\expat\xmltok $(CXXFLAGS) /fh=$(OBJS)\wxprec_xrclib.pch
+       -i=..\..\src\xrc\expat\xmltok $(CXXFLAGS) /fh=$(OBJS)\wxprec_xrclib.pch &
+       $(__EXCEPTIONSFLAG)
 XRCLIB_OBJECTS =  &
        $(OBJS)\xrclib_dummy.obj &
        $(OBJS)\xrclib_xmlres.obj &