mention ShouldInheritColours() change

[wxWidgets.git] / contrib / build / deprecated / makefile.bcc

diff --git a/contrib/build/deprecated/makefile.bcc b/contrib/build/deprecated/makefile.bcc
index 1434dc23fd2478cee25408c4e506597bac4868e9..00d438ad7fe7dc515accce5fb5b13c4a663d9523 100644 (file)
--- a/contrib/build/deprecated/makefile.bcc
+++ b/contrib/build/deprecated/makefile.bcc
@@ -20,57 +20,38 @@ BCCDIR = $(MAKEDIR)\..
 
 ### Variables: ###
 
-DEPRECATEDDLL_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
-       $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) -I..\..\src\deprecated\..\..\..\include \
-       -I$(LIBDIRNAME) -I..\..\src\deprecated\..\..\..\src\tiff \
-       -I..\..\src\deprecated\..\..\..\src\jpeg \
-       -I..\..\src\deprecated\..\..\..\src\png \
-       -I..\..\src\deprecated\..\..\..\src\zlib \
-       -I..\..\src\deprecated\..\..\..\src\regex \
-       -I..\..\src\deprecated\..\..\..\src\expat\lib \
+DEPRECATEDDLL_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \
+       $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       -I..\..\src\deprecated\..\..\..\include -I$(SETUPHDIR) \
        -I..\..\src\deprecated\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_DEPRECATED \
-       $(CFLAGS)
-DEPRECATEDDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
-       $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) -I..\..\src\deprecated\..\..\..\include \
-       -I$(LIBDIRNAME) -I..\..\src\deprecated\..\..\..\src\tiff \
-       -I..\..\src\deprecated\..\..\..\src\jpeg \
-       -I..\..\src\deprecated\..\..\..\src\png \
-       -I..\..\src\deprecated\..\..\..\src\zlib \
-       -I..\..\src\deprecated\..\..\..\src\regex \
-       -I..\..\src\deprecated\..\..\..\src\expat\lib \
+       -I..\..\src\deprecated $(CFLAGS)
+DEPRECATEDDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \
+       $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       -I..\..\src\deprecated\..\..\..\include -I$(SETUPHDIR) \
        -I..\..\src\deprecated\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_DEPRECATED \
-       $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_deprecateddll.csm
+       -I..\..\src\deprecated $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_deprecateddll.csm
 DEPRECATEDDLL_OBJECTS =  \
        $(OBJS)\deprecateddll_dummy.obj \
        $(OBJS)\deprecateddll_prop.obj \
        $(OBJS)\deprecateddll_propform.obj \
        $(OBJS)\deprecateddll_proplist.obj \
        $(OBJS)\deprecateddll_resource.obj \
+       $(OBJS)\deprecateddll_tbarsmpl.obj \
        $(OBJS)\deprecateddll_treelay.obj \
        $(OBJS)\deprecateddll_wxexpr.obj \
        $(OBJS)\deprecateddll_dosyacc.obj
-DEPRECATEDLIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
-       $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) -I..\..\src\deprecated\..\..\..\include \
-       -I$(LIBDIRNAME) -I..\..\src\deprecated\..\..\..\src\tiff \
-       -I..\..\src\deprecated\..\..\..\src\jpeg \
-       -I..\..\src\deprecated\..\..\..\src\png \
-       -I..\..\src\deprecated\..\..\..\src\zlib \
-       -I..\..\src\deprecated\..\..\..\src\regex \
-       -I..\..\src\deprecated\..\..\..\src\expat\lib \
-       -I..\..\src\deprecated\..\..\include $(CFLAGS)
-DEPRECATEDLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
-       $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) -I..\..\src\deprecated\..\..\..\include \
-       -I$(LIBDIRNAME) -I..\..\src\deprecated\..\..\..\src\tiff \
-       -I..\..\src\deprecated\..\..\..\src\jpeg \
-       -I..\..\src\deprecated\..\..\..\src\png \
-       -I..\..\src\deprecated\..\..\..\src\zlib \
-       -I..\..\src\deprecated\..\..\..\src\regex \
-       -I..\..\src\deprecated\..\..\..\src\expat\lib \
-       -I..\..\src\deprecated\..\..\include $(CXXFLAGS) -Hu \
+DEPRECATEDLIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \
+       $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       -I..\..\src\deprecated\..\..\..\include -I$(SETUPHDIR) \
+       -I..\..\src\deprecated\..\..\include -I..\..\src\deprecated $(CFLAGS)
+DEPRECATEDLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \
+       $(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       -I..\..\src\deprecated\..\..\..\include -I$(SETUPHDIR) \
+       -I..\..\src\deprecated\..\..\include -I..\..\src\deprecated $(CXXFLAGS) -Hu \
        -H=$(OBJS)\wxprec_deprecatedlib.csm
 DEPRECATEDLIB_OBJECTS =  \
        $(OBJS)\deprecatedlib_dummy.obj \
@@ -78,16 +59,23 @@ DEPRECATEDLIB_OBJECTS =  \
        $(OBJS)\deprecatedlib_propform.obj \
        $(OBJS)\deprecatedlib_proplist.obj \
        $(OBJS)\deprecatedlib_resource.obj \
+       $(OBJS)\deprecatedlib_tbarsmpl.obj \
        $(OBJS)\deprecatedlib_treelay.obj \
        $(OBJS)\deprecatedlib_wxexpr.obj \
        $(OBJS)\deprecatedlib_dosyacc.obj
-LIBDIRNAME = \
-       ..\..\src\deprecated\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 OBJS = \
        bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 
 ### Conditionally set variables: ###
 
+!if "$(SHARED)" == "0"
+LIBDIRNAME = ..\..\src\deprecated\..\..\..\lib\bcc_lib$(CFG)
+!endif
+!if "$(SHARED)" == "1"
+LIBDIRNAME = ..\..\src\deprecated\..\..\..\lib\bcc_dll$(CFG)
+!endif
 !if "$(USE_GUI)" == "0"
 PORTNAME = base
 !endif
@@ -161,7 +149,10 @@ __RUNTIME_LIBS_7 = i
 __RUNTIME_LIBS_7 = 
 !endif
 !if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
@@ -179,15 +170,13 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 !endif
 !if "$(SHARED)" == "1"
 __deprecateddll___depname = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_bcc$(VENDORTAG).dll
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_bcc$(VENDORTAG).dll
 !endif
 !if "$(SHARED)" == "0"
 __deprecatedlib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib
 !endif
 
-MAKEARGS = -DBUILD=$(BUILD) -DCC=$(CC) -DCFG=$(CFG) -DCFLAGS=$(CFLAGS) -DCPPFLAGS=$(CPPFLAGS) -DCXX=$(CXX) -DCXXFLAGS=$(CXXFLAGS) -DDEBUG_FLAG=$(DEBUG_FLAG) -DDEBUG_INFO=$(DEBUG_INFO) -DLDFLAGS=$(LDFLAGS) -DMONOLITHIC=$(MONOLITHIC) -DOFFICIAL_BUILD=$(OFFICIAL_BUILD) -DRUNTIME_LIBS=$(RUNTIME_LIBS) -DSHARED=$(SHARED) -DUNICODE=$(UNICODE) -DUSE_GUI=$(USE_GUI) -DVENDOR=$(VENDOR) -DWXUNIV=$(WXUNIV)
-
 
 all: $(OBJS)
 $(OBJS):
@@ -215,6 +204,9 @@ $(OBJS)\deprecateddll_proplist.obj: ../../src/deprecated\proplist.cpp
 $(OBJS)\deprecateddll_resource.obj: ../../src/deprecated\resource.cpp
        $(CXX) -q -c -P -o$@ $(DEPRECATEDDLL_CXXFLAGS) $**
 
+$(OBJS)\deprecateddll_tbarsmpl.obj: ../../src/deprecated\tbarsmpl.cpp
+       $(CXX) -q -c -P -o$@ $(DEPRECATEDDLL_CXXFLAGS) $**
+
 $(OBJS)\deprecateddll_treelay.obj: ../../src/deprecated\treelay.cpp
        $(CXX) -q -c -P -o$@ $(DEPRECATEDDLL_CXXFLAGS) $**
 
@@ -239,6 +231,9 @@ $(OBJS)\deprecatedlib_proplist.obj: ../../src/deprecated\proplist.cpp
 $(OBJS)\deprecatedlib_resource.obj: ../../src/deprecated\resource.cpp
        $(CXX) -q -c -P -o$@ $(DEPRECATEDLIB_CXXFLAGS) $**
 
+$(OBJS)\deprecatedlib_tbarsmpl.obj: ../../src/deprecated\tbarsmpl.cpp
+       $(CXX) -q -c -P -o$@ $(DEPRECATEDLIB_CXXFLAGS) $**
+
 $(OBJS)\deprecatedlib_treelay.obj: ../../src/deprecated\treelay.cpp
        $(CXX) -q -c -P -o$@ $(DEPRECATEDLIB_CXXFLAGS) $**
 
@@ -248,20 +243,25 @@ $(OBJS)\deprecatedlib_wxexpr.obj: ../../src/deprecated\wxexpr.cpp
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_bcc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_bcc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_bcc$(VENDORTAG).tds
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_bcc$(VENDORTAG).ilc
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_bcc$(VENDORTAG).ild
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_bcc$(VENDORTAG).ilf
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_bcc$(VENDORTAG).ils
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib
 
 !if "$(SHARED)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_bcc$(VENDORTAG).dll: $(DEPRECATEDDLL_OBJECTS) $(OBJS)\deprecateddll_dummy.obj
-       ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
-       c0d32.obj $(DEPRECATEDDLL_OBJECTS),$@,, $(__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  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_bcc$(VENDORTAG).dll: $(OBJS)\deprecateddll_dummy.obj  $(DEPRECATEDDLL_OBJECTS)
+       ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
+       c0d32.obj $(DEPRECATEDDLL_OBJECTS),$@,, $(__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  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated $@
 !endif
 
 !if "$(SHARED)" == "0"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib: $(DEPRECATEDLIB_OBJECTS) $(OBJS)\deprecatedlib_dummy.obj
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib: $(OBJS)\deprecatedlib_dummy.obj  $(DEPRECATEDLIB_OBJECTS)
        if exist $@ del $@
        tlib /a /p2048 $@ @&&|
        $(DEPRECATEDLIB_OBJECTS)