X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c33fae85b045360d02f61b5940f775d2ce096b65..2a8db3cddacf2c3fc244f109fdecbba3b0dfc386:/utils/wxrc/makefile.wat

diff --git a/utils/wxrc/makefile.wat b/utils/wxrc/makefile.wat
index a9f9890118..926a3e6046 100644
--- a/utils/wxrc/makefile.wat
+++ b/utils/wxrc/makefile.wat
@@ -55,6 +55,17 @@ WXDLLFLAG =
 !ifeq SHARED 1
 WXDLLFLAG = dll
 !endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE = 
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =  
+!endif
+__wxrc___depname =
+!ifeq USE_XRC 1
+__wxrc___depname = $(OBJS)\wxrc.exe
+!endif
 __DEBUGINFO_0 =
 !ifeq BUILD debug
 !ifeq DEBUG_INFO default
@@ -148,15 +159,15 @@ __WXLIB_MONO_p = &
 !endif
 __LIB_TIFF_p =
 !ifeq USE_GUI 1
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
 !endif
 __LIB_JPEG_p =
 !ifeq USE_GUI 1
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
 !endif
 __LIB_PNG_p =
 !ifeq USE_GUI 1
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
 !endif
 LIBDIRNAME =
 !ifeq SHARED 0
@@ -175,8 +186,8 @@ SETUPHDIR = &
 	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 WXRC_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) $(__EXCEPTIONSFLAG_7) &
-	$(CPPFLAGS) $(CXXFLAGS)
+	-i=.\..\..\include -i=$(SETUPHDIR) -wcd=549 -wcd=656 -wcd=657 -i=. &
+	$(__DLLFLAG_p) $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS)
 WXRC_OBJECTS =  &
 	$(OBJS)\wxrc_wxrc.obj
 
@@ -187,7 +198,7 @@ $(OBJS) :
 
 ### Targets: ###
 
-all : .SYMBOLIC $(OBJS)\wxrc.exe
+all : .SYMBOLIC $(__wxrc___depname)
 
 clean : .SYMBOLIC 
 	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -196,6 +207,7 @@ clean : .SYMBOLIC
 	-if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
 	-if exist $(OBJS)\wxrc.exe del $(OBJS)\wxrc.exe
 
+!ifeq USE_XRC 1
 $(OBJS)\wxrc.exe :  $(WXRC_OBJECTS)
 	@%create $(OBJS)\wxrc.lbc
 	@%append $(OBJS)\wxrc.lbc option quiet
@@ -203,9 +215,10 @@ $(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)$(WX_RELEASE_NODOT).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib wxexpat$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).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)\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$(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)\wxrc.lbc library %i
 	@%append $(OBJS)\wxrc.lbc
 	wlink @$(OBJS)\wxrc.lbc
+!endif
 
 $(OBJS)\wxrc_wxrc.obj :  .AUTODEPEND .\wxrc.cpp
 	$(CXX) -zq -fo=$^@ $(WXRC_CXXFLAGS) $<