continue setting scrollbars even if only width/height changes, not both of them ...

[wxWidgets.git] / contrib / samples / deprecated / proplist / makefile.wat

diff --git a/contrib/samples/deprecated/proplist/makefile.wat b/contrib/samples/deprecated/proplist/makefile.wat
index bee3d4db53bad75c7f3137c77d4d2aad65bdd18b..6f0ae6ebbb2fcae753531495f3da5976a339a37d 100644 (file)
--- a/contrib/samples/deprecated/proplist/makefile.wat
+++ b/contrib/samples/deprecated/proplist/makefile.wat
@@ -4,7 +4,7 @@
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
-!include ../../../../build/config.wat
+!include ../../../../build/msw/config.wat
 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!
@@ -163,12 +163,11 @@ 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
 
 
-
 all : $(OBJS)
 $(OBJS) :
        -if not exist $(OBJS) mkdir $(OBJS)
@@ -181,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
@@ -197,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