samples.inc is not data file

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24208 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/demos/life/Makefile.in b/demos/life/Makefile.in
index 150b33a88f8cbf0c59dc95a4f7140048010f9164..33fe272ca9c6d354ba3bedd4c0f7afae9966c645 100644 (file)
--- a/demos/life/Makefile.in
+++ b/demos/life/Makefile.in
@@ -118,7 +118,7 @@ clean:
 
 data: 
        @mkdir -p .
-       @for f in samples.inc breeder.lif; do \
+       @for f in breeder.lif; do \
        if test \( ! -s ./$$f \) -o \( $(srcdir)/$$f -nt ./$$f  \) ; then \
        cp -pRf $(srcdir)/$$f . ; \
        fi; \

diff --git a/demos/life/life.bkl b/demos/life/life.bkl
index 7f81c4a3453ac8f9f67788f231afa3cdc514f750..12cdcbc60e4231c3a75c7513818f633377e8e57f 100644 (file)
--- a/demos/life/life.bkl
+++ b/demos/life/life.bkl
@@ -17,7 +17,7 @@
 
     <wx-data id="data">
         <files>
-            samples.inc breeder.lif
+            breeder.lif
         </files>
     </wx-data> 
     

diff --git a/demos/life/makefile.bcc b/demos/life/makefile.bcc
index 0806d931d960f6a25b3d6f2549082cf0c2d095ae..7d89b87fcfaa10e870854b345605b8407b350564 100644 (file)
--- a/demos/life/makefile.bcc
+++ b/demos/life/makefile.bcc
@@ -4,6 +4,8 @@
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
+.autodepend
+
 !ifndef BCCDIR
 BCCDIR = $(MAKEDIR)\..
 !endif
@@ -20,10 +22,10 @@ BCCDIR = $(MAKEDIR)\..
 
 ### Variables: ###
 
-LIFE_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \
-       $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+LIFE_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \
+       $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \
-       -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS)
+       -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS)
 LIFE_OBJECTS =  \
        $(OBJS)\life_life.obj \
        $(OBJS)\life_dialogs.obj \
@@ -183,9 +185,9 @@ clean:
 
 data: 
        if not exist $(OBJS) mkdir $(OBJS)
-       for %f in (samples.inc breeder.lif) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+       for %f in (breeder.lif) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
 $(OBJS)\life.exe: $(LIFE_OBJECTS)  $(OBJS)\life_life.res
-       ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
+       ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
        c0w32.obj $(LIFE_OBJECTS),$@,, $(__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  $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib  import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\life_life.res
 |

diff --git a/demos/life/makefile.gcc b/demos/life/makefile.gcc
index cf08a08ffe27ce4d7277e63b87cbbfea99cc8a14..0665d1dce8116143300ec83e0325095eca0d5aed 100644 (file)
--- a/demos/life/makefile.gcc
+++ b/demos/life/makefile.gcc
@@ -12,11 +12,10 @@ include ../../build/msw/config.gcc
 
 ### Variables: ###
 
-LIFE_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
-       -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \
-       $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \
-       $(__EXCEPTIONSFLAG_5)
+LIFE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H \
+       -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       -I.\..\..\include -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \
+       $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS)
 LIFE_OBJECTS =  \
        $(OBJS)\life_life.o \
        $(OBJS)\life_dialogs.o \
@@ -184,7 +183,7 @@ clean:
 
 data: 
        if not exist $(OBJS) mkdir $(OBJS)
-       for %%f in (samples.inc breeder.lif) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+       for %%f in (breeder.lif) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
 
 $(OBJS)\life.exe: $(LIFE_OBJECTS) $(OBJS)\life_life_rc.o
        $(CXX) -o $@ $(LIFE_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32

diff --git a/demos/life/makefile.vc b/demos/life/makefile.vc
index 6842175a873edd0b153380e65a659f0de9a58081..3bfec112b031aa27ac207f984695c6adab35534c 100644 (file)
--- a/demos/life/makefile.vc
+++ b/demos/life/makefile.vc
@@ -12,12 +12,12 @@
 
 ### Variables: ###
 
-LIFE_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \
+LIFE_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \
        $(__DEBUGINFO_0) /Fd$(OBJS)\life.pdb $(____DEBUGRUNTIME_2_p) \
        $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \
-       /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) \
-       $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9)
+       /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_8) \
+       $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS)
 LIFE_OBJECTS =  \
        $(OBJS)\life_life.obj \
        $(OBJS)\life_dialogs.obj \
@@ -268,7 +268,7 @@ clean:
 
 data: 
        if not exist $(OBJS) mkdir $(OBJS)
-       for %f in (samples.inc breeder.lif) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+       for %f in (breeder.lif) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
 $(OBJS)\life.exe: $(LIFE_OBJECTS) $(OBJS)\life_life.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<

diff --git a/demos/life/makefile.wat b/demos/life/makefile.wat
index b22ea751622f3379130e3e8d56793688e00a0a8d..f13a17aa664f6004127d3fb70ac9bfce7d5f34ae 100644 (file)
--- a/demos/life/makefile.wat
+++ b/demos/life/makefile.wat
@@ -167,10 +167,10 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
 
 ### Variables: ###
 
-LIFE_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
-       $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) &
-       -i=.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_7)
+LIFE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) &
+       -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
+       -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples &
+       $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS)
 LIFE_OBJECTS =  &
        $(OBJS)\life_life.obj &
        $(OBJS)\life_dialogs.obj &
@@ -214,7 +214,7 @@ clean : .SYMBOLIC
 
 data : .SYMBOLIC 
        if not exist $(OBJS) mkdir $(OBJS)
-       for %f in (samples.inc breeder.lif) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+       for %f in (breeder.lif) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
 $(OBJS)\life.exe :  $(LIFE_OBJECTS) $(OBJS)\life_life.res
        @%create $(OBJS)\life.lbc