X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/07613d7c91cd7a9077390a51f18c158e4f943d98..c4513b23896c274eb859e0856d7e391b04f77819:/contrib/samples/deprecated/proplist/makefile.wat?ds=sidebyside

diff --git a/contrib/samples/deprecated/proplist/makefile.wat b/contrib/samples/deprecated/proplist/makefile.wat
index 93f438cf8e..6f0ae6ebbb 100644
--- a/contrib/samples/deprecated/proplist/makefile.wat
+++ b/contrib/samples/deprecated/proplist/makefile.wat
@@ -163,12 +163,10 @@ PROPLIST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
 	-i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg &
 	-i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib &
 	-i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. &
-	$(__DLLFLAG_p) -i=.\..\..\..\include $(CXXFLAGS)
+	$(__DLLFLAG_p) -i=..\..\..\..\samples -i=.\..\..\..\include $(CXXFLAGS)
 PROPLIST_OBJECTS =  &
 	$(OBJS)\proplist_proplist.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)
-
 
 all : $(OBJS)
 $(OBJS) :
@@ -182,7 +180,7 @@ $(OBJS)\proplist_proplist.obj :  .AUTODEPEND .\proplist.cpp
 	$(CXX) -zq -fo=$^@ $(PROPLIST_CXXFLAGS) $<
 
 $(OBJS)\proplist_proplist.res :  .AUTODEPEND .\proplist.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=.\..\..\..\include $<
+	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 -i=.\..\..\..\include $<
 
 clean : .SYMBOLIC 
 	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -198,6 +196,6 @@ $(OBJS)\proplist.exe :  $(PROPLIST_OBJECTS) $(OBJS)\proplist_proplist.res
 	@%append $(OBJS)\proplist.lbc option incremental
 	@%append $(OBJS)\proplist.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
 	@for %i in ($(PROPLIST_OBJECTS)) do @%append $(OBJS)\proplist.lbc file %i
-	@for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib $(__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)\proplist.lbc library %i
+	@for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib $(__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)\proplist.lbc library %i
 	@%append $(OBJS)\proplist.lbc option resource=$(OBJS)\proplist_proplist.res
 	wlink @$(OBJS)\proplist.lbc