Remove references to not existing any more griddemo.rc file.

The file was removed in a recent commit but the bakefile was not updated.

Do it now and rebake the makefiles.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64659 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/grid/Makefile.in b/samples/grid/Makefile.in
index c0a61b277745231f4725526e1fdcf58cd20ef28b..a8e602fafc800e4d6ff81097f784f2d34644d4a7 100644 (file)
--- a/samples/grid/Makefile.in
+++ b/samples/grid/Makefile.in
@@ -48,9 +48,9 @@ GRID_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
        $(CPPFLAGS) $(CXXFLAGS)
 GRID_OBJECTS =  \
+       $(__grid___win32rc) \
        $(__grid_os2_lib_res) \
-       grid_griddemo.o \
-       $(__grid___win32rc)
+       grid_griddemo.o
 
 ### Conditionally set variables: ###
 
@@ -87,6 +87,7 @@ COND_PLATFORM_OS2_1___grid___os2_emxbindcmd = $(NM) grid$(EXEEXT) | if grep -q \
 @COND_PLATFORM_OS2_1@__grid___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___grid___os2_emxbindcmd)
 @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
 @COND_TOOLKIT_MSW@     $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__grid___win32rc = grid_sample_rc.o
 @COND_PLATFORM_OS2_1@__grid_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_MACOSX_1@__grid_app_Contents_PkgInfo___depname \
@@ -111,7 +112,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_p = \
 COND_MONOLITHIC_0___WXLIB_BASE_p = \
        -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
-@COND_PLATFORM_WIN32_1@__grid___win32rc = grid_griddemo_rc.o
 COND_MONOLITHIC_1___WXLIB_MONO_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
@@ -179,12 +179,12 @@ grid$(EXEEXT): $(GRID_OBJECTS) $(__grid___win32rc)
 
 @COND_PLATFORM_MACOSX_1@grid_bundle: $(____grid_BUNDLE_TGT_REF_DEP)
 
+grid_sample_rc.o: $(srcdir)/../../samples/sample.rc
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2)  $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
+
 grid_griddemo.o: $(srcdir)/griddemo.cpp
        $(CXXC) -c -o $@ $(GRID_CXXFLAGS) $(srcdir)/griddemo.cpp
 
-grid_griddemo_rc.o: $(srcdir)/griddemo.rc
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2)  $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
-
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d

diff --git a/samples/grid/grid.bkl b/samples/grid/grid.bkl
index a615fbbc7796a0e3f2d1be73d89b6abade842c9d..bc98c7bec3fd19228c2188f73724395dd2752886 100644 (file)
--- a/samples/grid/grid.bkl
+++ b/samples/grid/grid.bkl
@@ -9,7 +9,6 @@
         <wx-lib>adv</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
-        <win32-res>griddemo.rc</win32-res>
     </exe>
 
 </makefile>

diff --git a/samples/grid/grid.dsp b/samples/grid/grid.dsp
index 209a849183e149245e37d56a475c28bcb2737154..82c7679de8713251d42cb6cd1031c15dfea6d782 100644 (file)
--- a/samples/grid/grid.dsp
+++ b/samples/grid/grid.dsp
@@ -256,7 +256,7 @@ SOURCE=.\griddemo.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\griddemo.rc\r
+SOURCE=.\..\..\samples\sample.rc\r
 # End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r

diff --git a/samples/grid/grid_vc7.vcproj b/samples/grid/grid_vc7.vcproj
index 44439993a890b77ec40f57cf58617673f0e3d8ed..2f6292334b1af0b196b9098c3606e517d905474d 100644 (file)
--- a/samples/grid/grid_vc7.vcproj
+++ b/samples/grid/grid_vc7.vcproj
@@ -558,7 +558,7 @@
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">\r
                        <File\r
-                               RelativePath=".\griddemo.rc">\r
+                               RelativePath="..\..\samples\sample.rc">\r
                        </File>\r
                </Filter>\r
        </Files>\r

diff --git a/samples/grid/grid_vc8.vcproj b/samples/grid/grid_vc8.vcproj
index e2097cf7b4002d162b4915588286880ab99235e2..13903776dc309b9fe11f8b21b2e23073d7aee6d0 100644 (file)
--- a/samples/grid/grid_vc8.vcproj
+++ b/samples/grid/grid_vc8.vcproj
@@ -824,7 +824,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
-                               RelativePath=".\griddemo.rc"\r
+                               RelativePath="..\..\samples\sample.rc"\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/grid/grid_vc9.vcproj b/samples/grid/grid_vc9.vcproj
index f76be212bbbe196194faf2a8c048261c2abbe18e..a08c4c5e1d81bc0a0b0150d135fe09451955fec1 100644 (file)
--- a/samples/grid/grid_vc9.vcproj
+++ b/samples/grid/grid_vc9.vcproj
@@ -796,7 +796,7 @@
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
-                               RelativePath=".\griddemo.rc"\r
+                               RelativePath="..\..\samples\sample.rc"\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/samples/grid/makefile.bcc b/samples/grid/makefile.bcc
index c721dd8d0af208f3f46271784e6a5f8bd04e6a52..91d209dd2cc6a4b7c869f6870086a3f1db2777d0 100644 (file)
--- a/samples/grid/makefile.bcc
+++ b/samples/grid/makefile.bcc
@@ -233,14 +233,14 @@ clean:
        -if exist $(OBJS)\grid.ilf del $(OBJS)\grid.ilf\r
        -if exist $(OBJS)\grid.ils del $(OBJS)\grid.ils\r
 \r
-$(OBJS)\grid.exe: $(GRID_OBJECTS)  $(OBJS)\grid_griddemo.res\r
+$(OBJS)\grid.exe: $(GRID_OBJECTS)  $(OBJS)\grid_sample.res\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r
-       c0w32.obj $(GRID_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__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) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\grid_griddemo.res\r
+       c0w32.obj $(GRID_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__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) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\grid_sample.res\r
 |\r
 \r
+$(OBJS)\grid_sample.res: .\..\..\samples\sample.rc\r
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc\r
+\r
 $(OBJS)\grid_griddemo.obj: .\griddemo.cpp\r
        $(CXX) -q -c -P -o$@ $(GRID_CXXFLAGS) .\griddemo.cpp\r
 \r
-$(OBJS)\grid_griddemo.res: .\griddemo.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\griddemo.rc\r
-\r

diff --git a/samples/grid/makefile.gcc b/samples/grid/makefile.gcc
index f53ad0c27794241c2f923edaaa8803a8938b03ed..a8e4e7a7c3c2a661980d94615bfc6ec4d825c65c 100644 (file)
--- a/samples/grid/makefile.gcc
+++ b/samples/grid/makefile.gcc
@@ -28,8 +28,8 @@ GRID_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS)
        -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \\r
        $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 GRID_OBJECTS =  \\r
-       $(OBJS)\grid_griddemo.o \\r
-       $(OBJS)\grid_griddemo_rc.o\r
+       $(OBJS)\grid_sample_rc.o \\r
+       $(OBJS)\grid_griddemo.o\r
 \r
 ### Conditionally set variables: ###\r
 \r
@@ -221,15 +221,15 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\grid.exe del $(OBJS)\grid.exe\r
 \r
-$(OBJS)\grid.exe: $(GRID_OBJECTS) $(OBJS)\grid_griddemo_rc.o\r
+$(OBJS)\grid.exe: $(GRID_OBJECTS) $(OBJS)\grid_sample_rc.o\r
        $(CXX) -o $@ $(GRID_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
 \r
+$(OBJS)\grid_sample_rc.o: ./../../samples/sample.rc\r
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
+\r
 $(OBJS)\grid_griddemo.o: ./griddemo.cpp\r
        $(CXX) -c -o $@ $(GRID_CXXFLAGS) $(CPPDEPS) $<\r
 \r
-$(OBJS)\grid_griddemo_rc.o: ./griddemo.rc\r
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH\r
-\r
 .PHONY: all clean\r
 \r
 \r

diff --git a/samples/grid/makefile.vc b/samples/grid/makefile.vc
index 9a48910ce40c792caea323e1f5f959dc48dc397c..fe07044b6f88d3fe42d8c8d64d146488eb723140 100644 (file)
--- a/samples/grid/makefile.vc
+++ b/samples/grid/makefile.vc
@@ -32,7 +32,7 @@ GRID_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
 GRID_OBJECTS =  \\r
        $(OBJS)\grid_griddemo.obj\r
 GRID_RESOURCES =  \\r
-       $(OBJS)\grid_griddemo.res\r
+       $(OBJS)\grid_sample.res\r
 \r
 ### Conditionally set variables: ###\r
 \r
@@ -343,14 +343,14 @@ clean:
        -if exist $(OBJS)\grid.ilk del $(OBJS)\grid.ilk\r
        -if exist $(OBJS)\grid.pdb del $(OBJS)\grid.pdb\r
 \r
-$(OBJS)\grid.exe: $(GRID_OBJECTS) $(OBJS)\grid_griddemo.res\r
+$(OBJS)\grid.exe: $(GRID_OBJECTS) $(OBJS)\grid_sample.res\r
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\grid.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
        $(GRID_OBJECTS) $(GRID_RESOURCES)  $(__WXLIB_ADV_p)  $(__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) $(__UNICOWS_LIB_p) $(__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\r
 <<\r
 \r
+$(OBJS)\grid_sample.res: .\..\..\samples\sample.rc\r
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc\r
+\r
 $(OBJS)\grid_griddemo.obj: .\griddemo.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(GRID_CXXFLAGS) .\griddemo.cpp\r
 \r
-$(OBJS)\grid_griddemo.res: .\griddemo.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\griddemo.rc\r
-\r

diff --git a/samples/grid/makefile.wat b/samples/grid/makefile.wat
index 8f565c5f02d3aeacf100994d1954a501db4bec28..e07ddea55a8e99f99df5cd758a3650b0ac49d262 100644 (file)
--- a/samples/grid/makefile.wat
+++ b/samples/grid/makefile.wat
@@ -253,7 +253,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\grid.exe del $(OBJS)\grid.exe\r
 \r
-$(OBJS)\grid.exe :  $(GRID_OBJECTS) $(OBJS)\grid_griddemo.res\r
+$(OBJS)\grid.exe :  $(GRID_OBJECTS) $(OBJS)\grid_sample.res\r
        @%create $(OBJS)\grid.lbc\r
        @%append $(OBJS)\grid.lbc option quiet\r
        @%append $(OBJS)\grid.lbc name $^@\r
@@ -261,13 +261,13 @@ $(OBJS)\grid.exe :  $(GRID_OBJECTS) $(OBJS)\grid_griddemo.res
        @%append $(OBJS)\grid.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)\r
        @for %i in ($(GRID_OBJECTS)) do @%append $(OBJS)\grid.lbc file %i\r
        @for %i in ( $(__WXLIB_ADV_p)  $(__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)\grid.lbc library %i\r
-       @%append $(OBJS)\grid.lbc option resource=$(OBJS)\grid_griddemo.res\r
+       @%append $(OBJS)\grid.lbc option resource=$(OBJS)\grid_sample.res\r
        @for %i in () do @%append $(OBJS)\grid.lbc option stack=%i\r
        wlink @$(OBJS)\grid.lbc\r
 \r
+$(OBJS)\grid_sample.res :  .AUTODEPEND .\..\..\samples\sample.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
 $(OBJS)\grid_griddemo.obj :  .AUTODEPEND .\griddemo.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(GRID_CXXFLAGS) $<\r
 \r
-$(OBJS)\grid_griddemo.res :  .AUTODEPEND .\griddemo.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