X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b910a8add446261996bc8d22e6545e6bdb373b8b..040b34976ecef760b0c18db7fb408664f32319dd:/samples/dataview/makefile.wat

diff --git a/samples/dataview/makefile.wat b/samples/dataview/makefile.wat
index 24a64c1a27..f9ac87bb02 100644
--- a/samples/dataview/makefile.wat
+++ b/samples/dataview/makefile.wat
@@ -238,21 +238,21 @@ clean : .SYMBOLIC
 	-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
 	-if exist $(OBJS)\dataview.exe del $(OBJS)\dataview.exe
 
-$(OBJS)\dataview.exe :  $(DATAVIEW_OBJECTS) $(OBJS)\dataview_dataview.res
+$(OBJS)\dataview.exe :  $(DATAVIEW_OBJECTS) $(OBJS)\dataview_sample.res
 	@%create $(OBJS)\dataview.lbc
 	@%append $(OBJS)\dataview.lbc option quiet
 	@%append $(OBJS)\dataview.lbc name $^@
 	@%append $(OBJS)\dataview.lbc option caseexact
 	@%append $(OBJS)\dataview.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
 	@for %i in ($(DATAVIEW_OBJECTS)) do @%append $(OBJS)\dataview.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)  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)\dataview.lbc library %i
-	@%append $(OBJS)\dataview.lbc option resource=$(OBJS)\dataview_dataview.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 $(EXTRALIBS_FOR_BASE)  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)\dataview.lbc library %i
+	@%append $(OBJS)\dataview.lbc option resource=$(OBJS)\dataview_sample.res
 	@for %i in () do @%append $(OBJS)\dataview.lbc option stack=%i
 	wlink @$(OBJS)\dataview.lbc
 
 $(OBJS)\dataview_dataview.obj :  .AUTODEPEND .\dataview.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(DATAVIEW_CXXFLAGS) $<
 
-$(OBJS)\dataview_dataview.res :  .AUTODEPEND .\dataview.rc
+$(OBJS)\dataview_sample.res :  .AUTODEPEND .\..\sample.rc
 	wrc -q -ad -bt=nt -r -fo=$^@   -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<