X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e80ae200205aeba58035c6e46f70dc59f1b7523e..25088f1eea365f0da7aeb565932dd4fe0fd5d20e:/contrib/samples/deprecated/proplist/makefile.bcc?ds=inline

diff --git a/contrib/samples/deprecated/proplist/makefile.bcc b/contrib/samples/deprecated/proplist/makefile.bcc
index 7fc68397ae..b4474164dc 100644
--- a/contrib/samples/deprecated/proplist/makefile.bcc
+++ b/contrib/samples/deprecated/proplist/makefile.bcc
@@ -8,7 +8,7 @@
 BCCDIR = $(MAKEDIR)\..
 !endif
 
-!include ../../../../build/config.bcc
+!include ../../../../build/msw/config.bcc
 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!
@@ -20,22 +20,26 @@ BCCDIR = $(MAKEDIR)\..
 
 ### Variables: ###
 
-LIBDIRNAME = \
-	.\..\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 OBJS = \
 	bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-PROPLIST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGINFO) \
-	$(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+PROPLIST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \
+	$(__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.\..\..\..\include \
-	$(CXXFLAGS)
+	-I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\..\samples \
+	-I.\..\..\..\include $(CXXFLAGS)
 PROPLIST_OBJECTS =  \
 	$(OBJS)\proplist_proplist.obj
+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
@@ -120,6 +124,9 @@ __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1
 !endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
@@ -151,7 +158,7 @@ $(OBJS)\proplist_proplist.obj: .\proplist.cpp
 	$(CXX) -q -c -P -o$@ $(PROPLIST_CXXFLAGS) $**
 
 $(OBJS)\proplist_proplist.res: .\proplist.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.\..\..\..\include $**
+	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 -i.\..\..\..\include $**
 
 clean: 
 	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -159,6 +166,6 @@ clean:
 	-if exist $(OBJS)\proplist.exe del $(OBJS)\proplist.exe
 
 $(OBJS)\proplist.exe: $(PROPLIST_OBJECTS)  $(OBJS)\proplist_proplist.res
-	ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa  @&&|
-	c0w32.obj $(PROPLIST_OBJECTS),$@,, 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  import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\proplist_proplist.res
+	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
+	c0w32.obj $(PROPLIST_OBJECTS),$@,, 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  $(__UNICOWS_LIB_p) import32.lib ole2w32.lib  import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\proplist_proplist.res
 |