From: Václav Slavík <vslavik@fastmail.fm>
Date: Fri, 17 Oct 2003 11:20:25 +0000 (+0000)
Subject: samples.inc is not data file
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/a2e268df1930c645479f782ad068ecc3686cc62d
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 150b33a88f..33fe272ca9 100644
--- 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 7f81c4a345..12cdcbc60e 100644
--- 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 0806d931d9..7d89b87fcf 100644
--- 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 cf08a08ffe..0665d1dce8 100644
--- 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 6842175a87..3bfec112b0 100644
--- 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 b22ea75162..f13a17aa66 100644
--- 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