compilation fix for VC++ statis MT build with wxUSE_STL==1

[wxWidgets.git] / utils / wxrc / makefile.wat

diff --git a/utils/wxrc/makefile.wat b/utils/wxrc/makefile.wat
index 840962e62d9895c6c3feba4e7d532a96e56b01e4..f5220ae46cb70fae27f77c7d1f2c7c8cdca1e0f5 100644 (file)
--- a/utils/wxrc/makefile.wat
+++ b/utils/wxrc/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
@@ -137,7 +144,7 @@ __RUNTIME_LIBS_5 =
 !endif
 __UNICODE_DEFINE_p =
 !ifeq UNICODE 1
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1
+__UNICODE_DEFINE_p = -d_UNICODE
 !endif
 __WXLIB_BASE_p =
 !ifeq MONOLITHIC 0
@@ -166,7 +173,7 @@ SETUPHDIR = &
 WXRC_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) $(CXXFLAGS)
+       $(__DLLFLAG_p) $(CXXFLAGS) $(__EXCEPTIONSFLAG_7)
 WXRC_OBJECTS =  &
        $(OBJS)\wxrc_wxrc.obj
 
@@ -196,6 +203,6 @@ $(OBJS)\wxrc.exe :  $(WXRC_OBJECTS)
        @%append $(OBJS)\wxrc.lbc option caseexact
        @%append $(OBJS)\wxrc.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt ref 'main_'
        @for %i in ($(WXRC_OBJECTS)) do @%append $(OBJS)\wxrc.lbc file %i
-       @for %i in ( $(__WXLIB_XML_p) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\wxrc.lbc library %i
+       @for %i in ( $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\wxrc.lbc library %i
        @%append $(OBJS)\wxrc.lbc
        wlink @$(OBJS)\wxrc.lbc