added .chm support for Unix (Markus Sinner)

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

diff --git a/contrib/build/stc/makefile.wat b/contrib/build/stc/makefile.wat
index ba70421354ab581a5f2867fff84400dd8fa88b82..dcb0e1010d64234ba2da5d9922afa3b615b889a6 100644 (file)
--- a/contrib/build/stc/makefile.wat
+++ b/contrib/build/stc/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
@@ -182,7 +189,7 @@ STCDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
        $(__UNICODE_DEFINE_p) -i=..\..\src\stc\..\..\..\include -i=$(SETUPHDIR) &
        -i=..\..\src\stc\..\..\include -i=..\..\src\stc\scintilla\include &
        -i=..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS &
-       -dWXUSINGDLL -dWXMAKINGDLL_STC $(CXXFLAGS)
+       -dWXUSINGDLL -dWXMAKINGDLL_STC $(CXXFLAGS) $(__EXCEPTIONSFLAG)
 STCDLL_OBJECTS =  &
        $(OBJS)\stcdll_PlatWX.obj &
        $(OBJS)\stcdll_ScintillaWX.obj &
@@ -242,7 +249,7 @@ STCLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
        $(__UNICODE_DEFINE_p) -i=..\..\src\stc\..\..\..\include -i=$(SETUPHDIR) &
        -i=..\..\src\stc\..\..\include -i=..\..\src\stc\scintilla\include &
        -i=..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS &
-       $(CXXFLAGS)
+       $(CXXFLAGS) $(__EXCEPTIONSFLAG)
 STCLIB_OBJECTS =  &
        $(OBJS)\stclib_PlatWX.obj &
        $(OBJS)\stclib_ScintillaWX.obj &