Regenerated makefiles

[wxWidgets.git] / contrib / utils / wxrcedit / makefile.wat

diff --git a/contrib/utils/wxrcedit/makefile.wat b/contrib/utils/wxrcedit/makefile.wat
index 4183b6856d129a1a9e813a71ebd54beefa030cc7..50335cd8bf42bf6ede3bd319e25cb6e3a8bf1a34 100644 (file)
--- a/contrib/utils/wxrcedit/makefile.wat
+++ b/contrib/utils/wxrcedit/makefile.wat
@@ -55,6 +55,13 @@ WXDLLFLAG =
 !ifeq SHARED 1
 WXDLLFLAG = dll
 !endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
 __DEBUGINFO_0 =
 !ifeq BUILD debug
 !ifeq DEBUG_INFO default
@@ -195,9 +202,9 @@ SETUPHDIR = &
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 WXRCEDIT_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 -dNOPCH -i=.\..\..\include &
-       $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -wcd=549 &
+       -wcd=656 -wcd=657 -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH &
+       -i=.\..\..\include $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS)
 WXRCEDIT_OBJECTS =  &
        $(OBJS)\wxrcedit_edapp.obj &
        $(OBJS)\wxrcedit_editor.obj &
@@ -234,7 +241,7 @@ $(OBJS)\wxrcedit.exe :  $(WXRCEDIT_OBJECTS) $(OBJS)\wxrcedit_wxrcedit.res
        @%append $(OBJS)\wxrcedit.lbc option caseexact
        @%append $(OBJS)\wxrcedit.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(WXRCEDIT_OBJECTS)) do @%append $(OBJS)\wxrcedit.lbc file %i
-       @for %i in ( $(__WXLIB_XRC_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)   $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ) do @%append $(OBJS)\wxrcedit.lbc library %i
+       @for %i in ( $(__WXLIB_XRC_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)   $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ) do @%append $(OBJS)\wxrcedit.lbc library %i
        @%append $(OBJS)\wxrcedit.lbc option resource=$(OBJS)\wxrcedit_wxrcedit.res
        wlink @$(OBJS)\wxrcedit.lbc