expat must be added to the template, not generated wxWindows.dsp

[wxWidgets.git] / contrib / samples / deprecated / treelay / makefile.bcc

diff --git a/contrib/samples/deprecated/treelay/makefile.bcc b/contrib/samples/deprecated/treelay/makefile.bcc
index 6cfc1d9099f7f8fa3c4c7245ae61b15e85126f12..b90c6fb51f2370b6d01c304fbe98c4d1b86f35ec 100644 (file)
--- a/contrib/samples/deprecated/treelay/makefile.bcc
+++ b/contrib/samples/deprecated/treelay/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!
@@ -29,8 +29,8 @@ TREELAY_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGINFO) \
        $(__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.\..\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I..\..\..\..\samples \
+       -I.\..\..\..\include $(CXXFLAGS)
 TREELAY_OBJECTS =  \
        $(OBJS)\treelay_treelay.obj
 
@@ -120,6 +120,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 +154,7 @@ $(OBJS)\treelay_treelay.obj: .\treelay.cpp
        $(CXX) -q -c -P -o$@ $(TREELAY_CXXFLAGS) $**
 
 $(OBJS)\treelay_treelay.res: .\treelay.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$(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 -i.\..\..\..\include $**
 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -160,5 +163,5 @@ clean:
 
 $(OBJS)\treelay.exe: $(TREELAY_OBJECTS)  $(OBJS)\treelay_treelay.res
        ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa  @&&|
-       c0w32.obj $(TREELAY_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)\treelay_treelay.res
+       c0w32.obj $(TREELAY_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  cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\treelay_treelay.res
 |