X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b796194b15ddb3bd794b2150e2f2130e809ad2a6..b06ed2f8668b52f61f08e0f72337b923365c01b8:/samples/layout/makefile.wat

diff --git a/samples/layout/makefile.wat b/samples/layout/makefile.wat
index d793a4fbd7..76de468966 100644
--- a/samples/layout/makefile.wat
+++ b/samples/layout/makefile.wat
@@ -248,7 +248,7 @@ clean : .SYMBOLIC
 	-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
 	-if exist $(OBJS)\layout.exe del $(OBJS)\layout.exe
 
-$(OBJS)\layout.exe :  $(LAYOUT_OBJECTS) $(OBJS)\layout_layout.res
+$(OBJS)\layout.exe :  $(LAYOUT_OBJECTS) $(OBJS)\layout_sample.res
 	@%create $(OBJS)\layout.lbc
 	@%append $(OBJS)\layout.lbc option quiet
 	@%append $(OBJS)\layout.lbc name $^@
@@ -256,13 +256,13 @@ $(OBJS)\layout.exe :  $(LAYOUT_OBJECTS) $(OBJS)\layout_layout.res
 	@%append $(OBJS)\layout.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
 	@for %i in ($(LAYOUT_OBJECTS)) do @%append $(OBJS)\layout.lbc file %i
 	@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)\layout.lbc library %i
-	@%append $(OBJS)\layout.lbc option resource=$(OBJS)\layout_layout.res
+	@%append $(OBJS)\layout.lbc option resource=$(OBJS)\layout_sample.res
 	@for %i in () do @%append $(OBJS)\layout.lbc option stack=%i
 	wlink @$(OBJS)\layout.lbc
 
+$(OBJS)\layout_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)\layout_layout.obj :  .AUTODEPEND .\layout.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(LAYOUT_CXXFLAGS) $<
 
-$(OBJS)\layout_layout.res :  .AUTODEPEND .\layout.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 $<
-