Follow coommon changes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37806 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-03-05 00:44:04 +00:00
parent 40319aa0ce
commit eb4f312b05
2 changed files with 72 additions and 7 deletions

View File

@@ -1,6 +1,6 @@
# =========================================================================
# This configuration file was generated by
# Bakefile 0.1.9 (http://bakefile.sourceforge.net)
# Bakefile 0.2.0 (http://bakefile.sourceforge.net)
# Beware that all changes made to this file will be overwritten next
# time you run Bakefile!
# =========================================================================
@@ -68,6 +68,9 @@ USE_GUI = 1
# Build wxHTML library (USE_GUI must be 1)? [0,1]
USE_HTML = 1
# Build multimedia library (USE_GUI must be 1)? [0,1]
USE_MEDIA = 1
# Build wxXRC library (USE_GUI must be 1)? [0,1]
USE_XRC = 1

View File

@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.1.9 (http://bakefile.sourceforge.net)
# Bakefile 0.2.0 (http://bakefile.sourceforge.net)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -348,6 +348,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_splitter.obj &
$(OBJS)\monodll_textdlgg.obj &
$(OBJS)\monodll_tipwin.obj &
$(OBJS)\monodll_toolbkg.obj &
$(OBJS)\monodll_treectlg.obj &
$(OBJS)\monodll_treebkg.obj &
$(OBJS)\monodll_vlbox.obj &
@@ -500,6 +501,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_splitter.obj &
$(OBJS)\monodll_textdlgg.obj &
$(OBJS)\monodll_tipwin.obj &
$(OBJS)\monodll_toolbkg.obj &
$(OBJS)\monodll_treectlg.obj &
$(OBJS)\monodll_treebkg.obj &
$(OBJS)\monodll_vlbox.obj &
@@ -509,6 +511,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
____ADVANCED_SRC_FILENAMES_OBJECTS =
!ifeq WXUNIV 0
____ADVANCED_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_datavcmn.obj &
$(OBJS)\monodll_calctrl.obj &
$(OBJS)\monodll_datectlg.obj &
$(OBJS)\monodll_grid.obj &
@@ -531,6 +534,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = &
!endif
!ifeq WXUNIV 1
____ADVANCED_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_datavcmn.obj &
$(OBJS)\monodll_calctrl.obj &
$(OBJS)\monodll_datectlg.obj &
$(OBJS)\monodll_grid.obj &
@@ -818,6 +822,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_splitter.obj &
$(OBJS)\monolib_textdlgg.obj &
$(OBJS)\monolib_tipwin.obj &
$(OBJS)\monolib_toolbkg.obj &
$(OBJS)\monolib_treectlg.obj &
$(OBJS)\monolib_treebkg.obj &
$(OBJS)\monolib_vlbox.obj &
@@ -970,6 +975,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_splitter.obj &
$(OBJS)\monolib_textdlgg.obj &
$(OBJS)\monolib_tipwin.obj &
$(OBJS)\monolib_toolbkg.obj &
$(OBJS)\monolib_treectlg.obj &
$(OBJS)\monolib_treebkg.obj &
$(OBJS)\monolib_vlbox.obj &
@@ -979,6 +985,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
____ADVANCED_SRC_FILENAMES_1_OBJECTS =
!ifeq WXUNIV 0
____ADVANCED_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_datavcmn.obj &
$(OBJS)\monolib_calctrl.obj &
$(OBJS)\monolib_datectlg.obj &
$(OBJS)\monolib_grid.obj &
@@ -1001,6 +1008,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = &
!endif
!ifeq WXUNIV 1
____ADVANCED_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_datavcmn.obj &
$(OBJS)\monolib_calctrl.obj &
$(OBJS)\monolib_datectlg.obj &
$(OBJS)\monolib_grid.obj &
@@ -1238,6 +1246,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_splitter.obj &
$(OBJS)\coredll_textdlgg.obj &
$(OBJS)\coredll_tipwin.obj &
$(OBJS)\coredll_toolbkg.obj &
$(OBJS)\coredll_treectlg.obj &
$(OBJS)\coredll_treebkg.obj &
$(OBJS)\coredll_vlbox.obj &
@@ -1390,6 +1399,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_splitter.obj &
$(OBJS)\coredll_textdlgg.obj &
$(OBJS)\coredll_tipwin.obj &
$(OBJS)\coredll_toolbkg.obj &
$(OBJS)\coredll_treectlg.obj &
$(OBJS)\coredll_treebkg.obj &
$(OBJS)\coredll_vlbox.obj &
@@ -1585,6 +1595,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_splitter.obj &
$(OBJS)\corelib_textdlgg.obj &
$(OBJS)\corelib_tipwin.obj &
$(OBJS)\corelib_toolbkg.obj &
$(OBJS)\corelib_treectlg.obj &
$(OBJS)\corelib_treebkg.obj &
$(OBJS)\corelib_vlbox.obj &
@@ -1737,6 +1748,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_splitter.obj &
$(OBJS)\corelib_textdlgg.obj &
$(OBJS)\corelib_tipwin.obj &
$(OBJS)\corelib_toolbkg.obj &
$(OBJS)\corelib_treectlg.obj &
$(OBJS)\corelib_treebkg.obj &
$(OBJS)\corelib_vlbox.obj &
@@ -1755,6 +1767,7 @@ __advdll___depname = &
____ADVANCED_SRC_FILENAMES_2_OBJECTS =
!ifeq WXUNIV 0
____ADVANCED_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\advdll_datavcmn.obj &
$(OBJS)\advdll_calctrl.obj &
$(OBJS)\advdll_datectlg.obj &
$(OBJS)\advdll_grid.obj &
@@ -1777,6 +1790,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = &
!endif
!ifeq WXUNIV 1
____ADVANCED_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\advdll_datavcmn.obj &
$(OBJS)\advdll_calctrl.obj &
$(OBJS)\advdll_datectlg.obj &
$(OBJS)\advdll_grid.obj &
@@ -1809,6 +1823,7 @@ __advlib___depname = &
____ADVANCED_SRC_FILENAMES_3_OBJECTS =
!ifeq WXUNIV 0
____ADVANCED_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\advlib_datavcmn.obj &
$(OBJS)\advlib_calctrl.obj &
$(OBJS)\advlib_datectlg.obj &
$(OBJS)\advlib_grid.obj &
@@ -1831,6 +1846,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = &
!endif
!ifeq WXUNIV 1
____ADVANCED_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\advlib_datavcmn.obj &
$(OBJS)\advlib_calctrl.obj &
$(OBJS)\advlib_datectlg.obj &
$(OBJS)\advlib_grid.obj &
@@ -1855,20 +1871,24 @@ __mediadll___depname =
!ifeq MONOLITHIC 0
!ifeq SHARED 1
!ifeq USE_GUI 1
!ifeq USE_MEDIA 1
__mediadll___depname = &
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.dll
!endif
!endif
!endif
!endif
__medialib___depname =
!ifeq MONOLITHIC 0
!ifeq SHARED 0
!ifeq USE_GUI 1
!ifeq USE_MEDIA 1
__medialib___depname = &
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
!endif
!endif
!endif
!endif
__odbcdll___depname =
!ifeq MONOLITHIC 0
!ifeq SHARED 1
@@ -2143,11 +2163,12 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" BUILD="$(BUILD)" &
DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" &
MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" &
USE_XRC="$(USE_XRC)" USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" &
USE_QA="$(USE_QA)" USE_EXCEPTIONS="$(USE_EXCEPTIONS)" &
USE_RTTI="$(USE_RTTI)" USE_THREADS="$(USE_THREADS)" &
OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" &
WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" &
USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_OPENGL="$(USE_OPENGL)" &
USE_ODBC="$(USE_ODBC)" USE_QA="$(USE_QA)" &
USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" &
USE_THREADS="$(USE_THREADS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" &
VENDOR="$(VENDOR)" WX_FLAVOUR="$(WX_FLAVOUR)" &
WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" &
CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" &
RUNTIME_LIBS="$(RUNTIME_LIBS)"
WX_RELEASE_NODOT = 27
@@ -3276,6 +3297,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
!ifeq MONOLITHIC 0
!ifeq SHARED 1
!ifeq USE_GUI 1
!ifeq USE_MEDIA 1
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.dll : $(MEDIADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname)
@%create $(OBJS)\mediadll.lbc
@%append $(OBJS)\mediadll.lbc option quiet
@@ -3291,10 +3313,12 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
!endif
!endif
!endif
!endif
!ifeq MONOLITHIC 0
!ifeq SHARED 0
!ifeq USE_GUI 1
!ifeq USE_MEDIA 1
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib : $(MEDIALIB_OBJECTS)
@%create $(OBJS)\medialib.lbc
@for %i in ($(MEDIALIB_OBJECTS)) do @%append $(OBJS)\medialib.lbc +%i
@@ -3302,6 +3326,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
!endif
!endif
!endif
!endif
!ifeq MONOLITHIC 0
!ifeq SHARED 1
@@ -3561,6 +3586,7 @@ build_cfg_file : .SYMBOLIC $(SETUPHDIR)
@echo USE_THREADS=$(USE_THREADS) >>$(BUILD_CFG_FILE)
@echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)
@echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)
@echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)
@echo USE_ODBC=$(USE_ODBC) >>$(BUILD_CFG_FILE)
@echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)
@echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)
@@ -5434,6 +5460,11 @@ $(OBJS)\monodll_tipwin.obj : .AUTODEPEND ..\..\src\generic\tipwin.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_toolbkg.obj : .AUTODEPEND ..\..\src\generic\toolbkg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_treectlg.obj : .AUTODEPEND ..\..\src\generic\treectlg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -5454,6 +5485,11 @@ $(OBJS)\monodll_vscroll.obj : .AUTODEPEND ..\..\src\generic\vscroll.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_datavcmn.obj : .AUTODEPEND ..\..\src\common\datavcmn.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_calctrl.obj : .AUTODEPEND ..\..\src\generic\calctrl.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -7060,6 +7096,11 @@ $(OBJS)\monolib_tipwin.obj : .AUTODEPEND ..\..\src\generic\tipwin.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_toolbkg.obj : .AUTODEPEND ..\..\src\generic\toolbkg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_treectlg.obj : .AUTODEPEND ..\..\src\generic\treectlg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -7080,6 +7121,11 @@ $(OBJS)\monolib_vscroll.obj : .AUTODEPEND ..\..\src\generic\vscroll.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_datavcmn.obj : .AUTODEPEND ..\..\src\common\datavcmn.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_calctrl.obj : .AUTODEPEND ..\..\src\generic\calctrl.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -8698,6 +8744,11 @@ $(OBJS)\coredll_tipwin.obj : .AUTODEPEND ..\..\src\generic\tipwin.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\coredll_toolbkg.obj : .AUTODEPEND ..\..\src\generic\toolbkg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\coredll_treectlg.obj : .AUTODEPEND ..\..\src\generic\treectlg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -9785,6 +9836,11 @@ $(OBJS)\corelib_tipwin.obj : .AUTODEPEND ..\..\src\generic\tipwin.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\corelib_toolbkg.obj : .AUTODEPEND ..\..\src\generic\toolbkg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\corelib_treectlg.obj : .AUTODEPEND ..\..\src\generic\treectlg.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
@@ -9805,6 +9861,9 @@ $(OBJS)\corelib_vscroll.obj : .AUTODEPEND ..\..\src\generic\vscroll.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif
$(OBJS)\advdll_datavcmn.obj : .AUTODEPEND ..\..\src\common\datavcmn.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
$(OBJS)\advdll_calctrl.obj : .AUTODEPEND ..\..\src\generic\calctrl.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
@@ -9862,6 +9921,9 @@ $(OBJS)\advdll_joystick.obj : .AUTODEPEND ..\..\src\os2\joystick.cpp
$(OBJS)\advdll_sound.obj : .AUTODEPEND ..\..\src\os2\sound.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
$(OBJS)\advlib_datavcmn.obj : .AUTODEPEND ..\..\src\common\datavcmn.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
$(OBJS)\advlib_calctrl.obj : .AUTODEPEND ..\..\src\generic\calctrl.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<