X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b796194b15ddb3bd794b2150e2f2130e809ad2a6..519d7f238ce17ab2de6f5fb57d35add84ce47e4c:/samples/grid/makefile.wat?ds=inline

diff --git a/samples/grid/makefile.wat b/samples/grid/makefile.wat
index 8f565c5f02..e07ddea55a 100644
--- a/samples/grid/makefile.wat
+++ b/samples/grid/makefile.wat
@@ -253,7 +253,7 @@ clean : .SYMBOLIC
 	-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
 	-if exist $(OBJS)\grid.exe del $(OBJS)\grid.exe
 
-$(OBJS)\grid.exe :  $(GRID_OBJECTS) $(OBJS)\grid_griddemo.res
+$(OBJS)\grid.exe :  $(GRID_OBJECTS) $(OBJS)\grid_sample.res
 	@%create $(OBJS)\grid.lbc
 	@%append $(OBJS)\grid.lbc option quiet
 	@%append $(OBJS)\grid.lbc name $^@
@@ -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)
 	@for %i in ($(GRID_OBJECTS)) do @%append $(OBJS)\grid.lbc file %i
 	@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
-	@%append $(OBJS)\grid.lbc option resource=$(OBJS)\grid_griddemo.res
+	@%append $(OBJS)\grid.lbc option resource=$(OBJS)\grid_sample.res
 	@for %i in () do @%append $(OBJS)\grid.lbc option stack=%i
 	wlink @$(OBJS)\grid.lbc
 
+$(OBJS)\grid_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)\grid_griddemo.obj :  .AUTODEPEND .\griddemo.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(GRID_CXXFLAGS) $<
 
-$(OBJS)\grid_griddemo.res :  .AUTODEPEND .\griddemo.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 $<
-