Correct the name of the XPM file containing the icon in xrc sample.

[wxWidgets.git] / samples / config / makefile.wat

diff --git a/samples/config/makefile.wat b/samples/config/makefile.wat
index 870c9cd07f19100130a6a4b7db0d3c962b115b66..28e8c85bd2496cd991855ee3f6cd80b37a9c7793 100644 (file)
--- a/samples/config/makefile.wat
+++ b/samples/config/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\conftest.exe del $(OBJS)\conftest.exe\r
 \r
-$(OBJS)\conftest.exe :  $(CONFTEST_OBJECTS) $(OBJS)\conftest_conftest.res\r
+$(OBJS)\conftest.exe :  $(CONFTEST_OBJECTS) $(OBJS)\conftest_sample.res
        @%create $(OBJS)\conftest.lbc\r
        @%append $(OBJS)\conftest.lbc option quiet\r
        @%append $(OBJS)\conftest.lbc name $^@\r
@@ -256,13 +256,13 @@ $(OBJS)\conftest.exe :  $(CONFTEST_OBJECTS) $(OBJS)\conftest_conftest.res
        @%append $(OBJS)\conftest.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(CONFTEST_OBJECTS)) do @%append $(OBJS)\conftest.lbc file %i\r
        @for %i in ( $(__WXLIB_CORE_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)  $(__CAIRO_LIB_p) 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 wininet.lib) do @%append $(OBJS)\conftest.lbc library %i\r
-       @%append $(OBJS)\conftest.lbc option resource=$(OBJS)\conftest_conftest.res\r
+       @%append $(OBJS)\conftest.lbc option resource=$(OBJS)\conftest_sample.res
        @for %i in () do @%append $(OBJS)\conftest.lbc option stack=%i\r
        wlink @$(OBJS)\conftest.lbc\r
 \r
+$(OBJS)\conftest_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc
+       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
 $(OBJS)\conftest_conftest.obj :  .AUTODEPEND .\conftest.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(CONFTEST_CXXFLAGS) $<\r
 \r
-$(OBJS)\conftest_conftest.res :  .AUTODEPEND .\conftest.rc\r
-       wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<\r
-\r