regenerated makefiles

[wxWidgets.git] / contrib / samples / svg / makefile.wat

diff --git a/contrib/samples/svg/makefile.wat b/contrib/samples/svg/makefile.wat
index f08267b71dce20abf3f1fe8bf88c7da5085e70e9..0fbf52ef55e906a6d7b444eae26d7ceb0b940635 100644 (file)
--- a/contrib/samples/svg/makefile.wat
+++ b/contrib/samples/svg/makefile.wat
@@ -4,7 +4,7 @@
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
-!include ../../../build/config.wat
+!include ../../../build/msw/config.wat
 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!
@@ -166,6 +166,7 @@ SVGTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
 SVGTEST_OBJECTS =  &
        $(OBJS)\svgtest_svgtest.obj
 
+MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) RUNTIME_LIBS=$(RUNTIME_LIBS) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
 
 
 all : $(OBJS)
@@ -176,6 +177,9 @@ $(OBJS) :
 
 all : .SYMBOLIC $(OBJS)\svgtest.exe
 
+$(OBJS)\svgtest_sample.res :  .AUTODEPEND .\..\..\..\samples\sample.rc
+       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib  -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) $<
+
 $(OBJS)\svgtest_svgtest.obj :  .AUTODEPEND .\svgtest.cpp
        $(CXX) -zq -fo=$^@ $(SVGTEST_CXXFLAGS) $<
 
@@ -186,7 +190,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
        -if exist $(OBJS)\svgtest.exe del $(OBJS)\svgtest.exe
 
-$(OBJS)\svgtest.exe :  $(SVGTEST_OBJECTS)
+$(OBJS)\svgtest.exe :  $(SVGTEST_OBJECTS) $(OBJS)\svgtest_sample.res
        @%create $(OBJS)\svgtest.lbc
        @%append $(OBJS)\svgtest.lbc option quiet
        @%append $(OBJS)\svgtest.lbc name $^@
@@ -194,5 +198,5 @@ $(OBJS)\svgtest.exe :  $(SVGTEST_OBJECTS)
        @%append $(OBJS)\svgtest.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(SVGTEST_OBJECTS)) do @%append $(OBJS)\svgtest.lbc file %i
        @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib $(__WXLIB_CORE_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)\svgtest.lbc library %i
-       @%append $(OBJS)\svgtest.lbc
+       @%append $(OBJS)\svgtest.lbc option resource=$(OBJS)\svgtest_sample.res
        wlink @$(OBJS)\svgtest.lbc