X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd9f42b6a94f9d68c66cf363093442b12cd4e953..bc51e42e8b8cdf53ef8e24ab9568236329420778:/samples/wxtest/makefile.wat?ds=sidebyside

diff --git a/samples/wxtest/makefile.wat b/samples/wxtest/makefile.wat
index 78d84ce639..007a06e27b 100644
--- a/samples/wxtest/makefile.wat
+++ b/samples/wxtest/makefile.wat
@@ -162,11 +162,10 @@ WXTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
 	$(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(LIBDIRNAME) &
 	-i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png &
 	-i=.\..\..\src\zlib -i=.\..\..\src\regex -i=.\..\..\src\expat\lib -i=. &
-	$(__DLLFLAG_p) $(CXXFLAGS)
+	$(__DLLFLAG_p) -i=..\..\samples $(CXXFLAGS)
 WXTEST_OBJECTS =  &
-	$(OBJS)\wxtest_test.obj
-
-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) RUNTIME_LIBS=$(RUNTIME_LIBS) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
+	$(OBJS)\wxtest_test.obj &
+	$(OBJS)\wxtest_test_wdr.obj
 
 
 all : $(OBJS)
@@ -177,11 +176,14 @@ $(OBJS) :
 
 all : .SYMBOLIC $(OBJS)\wxtest.exe
 
+$(OBJS)\wxtest_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=$(LIBDIRNAME) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib  -i=.\..\..\src\regex -i=.\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=..\..\samples $<
+
 $(OBJS)\wxtest_test.obj :  .AUTODEPEND .\test.cpp
 	$(CXX) -zq -fo=$^@ $(WXTEST_CXXFLAGS) $<
 
-$(OBJS)\wxtest_wxtest.res :  .AUTODEPEND .\wxtest.rc
-	wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib  -i=.\..\..\src\regex -i=.\..\..\src\expat\lib -i=. $(__DLLFLAG_p) $<
+$(OBJS)\wxtest_test_wdr.obj :  .AUTODEPEND .\test_wdr.cpp
+	$(CXX) -zq -fo=$^@ $(WXTEST_CXXFLAGS) $<
 
 clean : .SYMBOLIC 
 	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -190,13 +192,13 @@ clean : .SYMBOLIC
 	-if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
 	-if exist $(OBJS)\wxtest.exe del $(OBJS)\wxtest.exe
 
-$(OBJS)\wxtest.exe :  $(WXTEST_OBJECTS) $(OBJS)\wxtest_wxtest.res
+$(OBJS)\wxtest.exe :  $(WXTEST_OBJECTS) $(OBJS)\wxtest_sample.res
 	@%create $(OBJS)\wxtest.lbc
 	@%append $(OBJS)\wxtest.lbc option quiet
 	@%append $(OBJS)\wxtest.lbc name $^@
 	@%append $(OBJS)\wxtest.lbc option incremental
 	@%append $(OBJS)\wxtest.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
 	@for %i in ($(WXTEST_OBJECTS)) do @%append $(OBJS)\wxtest.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$(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)\wxtest.lbc library %i
-	@%append $(OBJS)\wxtest.lbc option resource=$(OBJS)\wxtest_wxtest.res
+	@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$(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)\wxtest.lbc library %i
+	@%append $(OBJS)\wxtest.lbc option resource=$(OBJS)\wxtest_sample.res
 	wlink @$(OBJS)\wxtest.lbc