X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4e209a2064a2b6d97b810ccab66859ab30b4bf2a..7d671c081808cbafb0dcfb7b36e7e851bb480cb2:/demos/life/makefile.bcc

diff --git a/demos/life/makefile.bcc b/demos/life/makefile.bcc
index c611c084e7..d746545241 100644
--- a/demos/life/makefile.bcc
+++ b/demos/life/makefile.bcc
@@ -20,14 +20,10 @@ BCCDIR = $(MAKEDIR)\..
 
 ### Variables: ###
 
-LIBDIRNAME = \
-	.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIFE_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGINFO) \
 	$(__OPTIMIZEFLAG_2) -tWM -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 $(CXXFLAGS)
+	$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \
+	-I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS)
 LIFE_OBJECTS =  \
 	$(OBJS)\life_life.obj \
 	$(OBJS)\life_dialogs.obj \
@@ -35,9 +31,17 @@ LIFE_OBJECTS =  \
 	$(OBJS)\life_reader.obj
 OBJS = \
 	bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+SETUPHDIR = \
+	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 
 ### Conditionally set variables: ###
 
+!if "$(SHARED)" == "0"
+LIBDIRNAME = .\..\..\lib\bcc_lib$(CFG)
+!endif
+!if "$(SHARED)" == "1"
+LIBDIRNAME = .\..\..\lib\bcc_dll$(CFG)
+!endif
 !if "$(USE_GUI)" == "0"
 PORTNAME = base
 !endif
@@ -162,7 +166,7 @@ $(OBJS)\life_life.obj: .\life.cpp
 	$(CXX) -q -c -P -o$@ $(LIFE_CXXFLAGS) $**
 
 $(OBJS)\life_life.res: .\life.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -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_1) -i..\..\samples $**
+	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\samples $**
 
 $(OBJS)\life_reader.obj: .\reader.cpp
 	$(CXX) -q -c -P -o$@ $(LIFE_CXXFLAGS) $**
@@ -177,6 +181,6 @@ data:
 	for %f in (samples.inc breeder.lif) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
 $(OBJS)\life.exe: $(LIFE_OBJECTS)  $(OBJS)\life_life.res
-	ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa  @&&|
+	ilink32 -Tpe -q $(LDFLAGS) $(__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) import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\life_life.res
 |