X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b17c1746930b29c13d5bfff0009721cbcefa53f1..f20a2e1f4066e4f0235698e6220f1eed91c73326:/samples/taskbar/makefile.wat

diff --git a/samples/taskbar/makefile.wat b/samples/taskbar/makefile.wat
index 378b5bd917..d7d940300b 100644
--- a/samples/taskbar/makefile.wat
+++ b/samples/taskbar/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.2 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.3 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -199,19 +199,19 @@ clean : .SYMBOLIC
 	-if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
 	-if exist $(OBJS)\taskbar.exe del $(OBJS)\taskbar.exe
 
-$(OBJS)\taskbar.exe :  $(TASKBAR_OBJECTS) $(OBJS)\taskbar_tbtest.res
+$(OBJS)\taskbar.exe :  $(TASKBAR_OBJECTS) $(OBJS)\taskbar_sample.res
 	@%create $(OBJS)\taskbar.lbc
 	@%append $(OBJS)\taskbar.lbc option quiet
 	@%append $(OBJS)\taskbar.lbc name $^@
 	@%append $(OBJS)\taskbar.lbc option caseexact
 	@%append $(OBJS)\taskbar.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
 	@for %i in ($(TASKBAR_OBJECTS)) do @%append $(OBJS)\taskbar.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$(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)\taskbar.lbc library %i
-	@%append $(OBJS)\taskbar.lbc option resource=$(OBJS)\taskbar_tbtest.res
+	@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   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 odbc32.lib ) do @%append $(OBJS)\taskbar.lbc library %i
+	@%append $(OBJS)\taskbar.lbc option resource=$(OBJS)\taskbar_sample.res
 	wlink @$(OBJS)\taskbar.lbc
 
+$(OBJS)\taskbar_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=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples $<
+
 $(OBJS)\taskbar_tbtest.obj :  .AUTODEPEND .\tbtest.cpp
 	$(CXX) -zq -fo=$^@ $(TASKBAR_CXXFLAGS) $<
-
-$(OBJS)\taskbar_tbtest.res :  .AUTODEPEND .\tbtest.rc
-	wrc -q -ad -bt=nt -r -fo=$^@  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples $<