Updated version to 2.5.5
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
@@ -1,6 +1,6 @@
|
||||
# =========================================================================
|
||||
# This makefile was generated by
|
||||
# Bakefile 0.1.6 (http://bakefile.sourceforge.net)
|
||||
# Bakefile 0.1.8 (http://bakefile.sourceforge.net)
|
||||
# Do not modify, all changes will be overwritten!
|
||||
# =========================================================================
|
||||
|
||||
@@ -154,6 +154,13 @@ __OPTIMIZEFLAG = -od
|
||||
!ifeq BUILD release
|
||||
__OPTIMIZEFLAG = -ot -ox
|
||||
!endif
|
||||
__THREADSFLAG =
|
||||
!ifeq USE_THREADS 0
|
||||
__THREADSFLAG =
|
||||
!endif
|
||||
!ifeq USE_THREADS 1
|
||||
__THREADSFLAG = -bm
|
||||
!endif
|
||||
__RUNTIME_LIBS =
|
||||
!ifeq RUNTIME_LIBS dynamic
|
||||
__RUNTIME_LIBS = -br
|
||||
@@ -161,19 +168,19 @@ __RUNTIME_LIBS = -br
|
||||
!ifeq RUNTIME_LIBS static
|
||||
__RUNTIME_LIBS =
|
||||
!endif
|
||||
__RTTIFLAG =
|
||||
!ifeq USE_RTTI 0
|
||||
__RTTIFLAG =
|
||||
!endif
|
||||
!ifeq USE_RTTI 1
|
||||
__RTTIFLAG = -xr
|
||||
!endif
|
||||
__EXCEPTIONSFLAG =
|
||||
!ifeq USE_EXCEPTIONS 0
|
||||
__EXCEPTIONSFLAG =
|
||||
!endif
|
||||
!ifeq USE_EXCEPTIONS 1
|
||||
__EXCEPTIONSFLAG = -xr
|
||||
!endif
|
||||
__EXCEPTIONSFLAG_0 =
|
||||
!ifeq USE_EXCEPTIONS 0
|
||||
__EXCEPTIONSFLAG_0 =
|
||||
!endif
|
||||
!ifeq USE_EXCEPTIONS 1
|
||||
__EXCEPTIONSFLAG_0 = -xs
|
||||
__EXCEPTIONSFLAG = -xs
|
||||
!endif
|
||||
__WXUNIV_DEFINE_p =
|
||||
!ifeq WXUNIV 1
|
||||
@@ -188,6 +195,18 @@ __DEBUG_DEFINE_p = -d__WXDEBUG__
|
||||
!ifeq DEBUG_FLAG 1
|
||||
__DEBUG_DEFINE_p = -d__WXDEBUG__
|
||||
!endif
|
||||
__EXCEPTIONS_DEFINE_p =
|
||||
!ifeq USE_EXCEPTIONS 0
|
||||
__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
|
||||
!endif
|
||||
__RTTI_DEFINE_p =
|
||||
!ifeq USE_RTTI 0
|
||||
__RTTI_DEFINE_p = -dwxNO_RTTI
|
||||
!endif
|
||||
__THREAD_DEFINE_p =
|
||||
!ifeq USE_THREADS 0
|
||||
__THREAD_DEFINE_p = -dwxNO_THREADS
|
||||
!endif
|
||||
__UNICODE_DEFINE_p =
|
||||
!ifeq UNICODE 1
|
||||
__UNICODE_DEFINE_p = -d_UNICODE
|
||||
@@ -196,26 +215,28 @@ __UNICODE_DEFINE_p = -d_UNICODE
|
||||
### Variables: ###
|
||||
|
||||
WX_RELEASE_NODOT = 25
|
||||
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)4
|
||||
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)5
|
||||
OBJS = &
|
||||
wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
LIBDIRNAME = ..\..\src\deprecated\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
|
||||
SETUPHDIR = &
|
||||
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
|
||||
DEPRECATEDDLL_CFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) -bm &
|
||||
DEPRECATEDDLL_CFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
|
||||
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
|
||||
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
|
||||
$(__UNICODE_DEFINE_p) -i=..\..\src\deprecated\..\..\..\include &
|
||||
-i=$(SETUPHDIR) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 &
|
||||
-i=..\..\src\deprecated\..\..\include -dWXUSINGDLL &
|
||||
-dWXMAKINGDLL_DEPRECATED -i=..\..\src\deprecated $(CPPFLAGS) $(CFLAGS)
|
||||
DEPRECATEDDLL_CXXFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) -bm &
|
||||
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
|
||||
$(__UNICODE_DEFINE_p) -i=..\..\src\deprecated\..\..\..\include &
|
||||
-i=$(SETUPHDIR) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 &
|
||||
-i=..\..\src\deprecated\..\..\include -dWXUSINGDLL &
|
||||
-dWXMAKINGDLL_DEPRECATED -i=..\..\src\deprecated &
|
||||
/fh=$(OBJS)\wxprec_deprecateddll.pch $(__EXCEPTIONSFLAG) &
|
||||
$(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS)
|
||||
DEPRECATEDDLL_CXXFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) &
|
||||
$(__THREADSFLAG) $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) &
|
||||
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
|
||||
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) &
|
||||
-i=..\..\src\deprecated\..\..\..\include -i=$(SETUPHDIR) -wx -wcd=549 &
|
||||
-wcd=656 -wcd=657 -wcd=667 -i=..\..\src\deprecated\..\..\include &
|
||||
-dWXUSINGDLL -dWXMAKINGDLL_DEPRECATED -i=..\..\src\deprecated &
|
||||
/fh=$(OBJS)\wxprec_deprecateddll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
|
||||
$(CPPFLAGS) $(CXXFLAGS)
|
||||
DEPRECATEDDLL_OBJECTS = &
|
||||
$(OBJS)\deprecateddll_dummy.obj &
|
||||
$(OBJS)\deprecateddll_prop.obj &
|
||||
@@ -226,18 +247,21 @@ DEPRECATEDDLL_OBJECTS = &
|
||||
$(OBJS)\deprecateddll_treelay.obj &
|
||||
$(OBJS)\deprecateddll_wxexpr.obj &
|
||||
$(OBJS)\deprecateddll_dosyacc.obj
|
||||
DEPRECATEDLIB_CFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
|
||||
-d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
|
||||
-i=..\..\src\deprecated\..\..\..\include -i=$(SETUPHDIR) -wx -wcd=549 &
|
||||
-wcd=656 -wcd=657 -wcd=667 -i=..\..\src\deprecated\..\..\include &
|
||||
-i=..\..\src\deprecated $(CPPFLAGS) $(CFLAGS)
|
||||
DEPRECATEDLIB_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) -bm &
|
||||
DEPRECATEDLIB_CFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
|
||||
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
|
||||
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
|
||||
$(__UNICODE_DEFINE_p) -i=..\..\src\deprecated\..\..\..\include &
|
||||
-i=$(SETUPHDIR) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 &
|
||||
-i=..\..\src\deprecated\..\..\include -i=..\..\src\deprecated $(CPPFLAGS) &
|
||||
$(CFLAGS)
|
||||
DEPRECATEDLIB_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
|
||||
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
|
||||
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
|
||||
$(__UNICODE_DEFINE_p) -i=..\..\src\deprecated\..\..\..\include &
|
||||
-i=$(SETUPHDIR) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 &
|
||||
-i=..\..\src\deprecated\..\..\include -i=..\..\src\deprecated &
|
||||
/fh=$(OBJS)\wxprec_deprecatedlib.pch $(__EXCEPTIONSFLAG) &
|
||||
$(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS)
|
||||
/fh=$(OBJS)\wxprec_deprecatedlib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
|
||||
$(CPPFLAGS) $(CXXFLAGS)
|
||||
DEPRECATEDLIB_OBJECTS = &
|
||||
$(OBJS)\deprecatedlib_dummy.obj &
|
||||
$(OBJS)\deprecatedlib_prop.obj &
|
||||
@@ -269,7 +293,7 @@ clean : .SYMBOLIC
|
||||
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib
|
||||
|
||||
!ifeq SHARED 1
|
||||
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_wat$(VENDORTAG).dll : $(DEPRECATEDDLL_OBJECTS)
|
||||
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_wat$(VENDORTAG).dll : $(DEPRECATEDDLL_OBJECTS) $(OBJS)\deprecateddll_version.res
|
||||
@%create $(OBJS)\deprecateddll.lbc
|
||||
@%append $(OBJS)\deprecateddll.lbc option quiet
|
||||
@%append $(OBJS)\deprecateddll.lbc name $^@
|
||||
@@ -277,7 +301,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
|
||||
@%append $(OBJS)\deprecateddll.lbc $(LDFLAGS) $(__DEBUGINFO_2) libpath $(LIBDIRNAME)
|
||||
@for %i in ($(DEPRECATEDDLL_OBJECTS)) do @%append $(OBJS)\deprecateddll.lbc file %i
|
||||
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\deprecateddll.lbc library %i
|
||||
@%append $(OBJS)\deprecateddll.lbc
|
||||
@%append $(OBJS)\deprecateddll.lbc option resource=$(OBJS)\deprecateddll_version.res
|
||||
@%append $(OBJS)\deprecateddll.lbc system nt_dll
|
||||
wlink @$(OBJS)\deprecateddll.lbc
|
||||
wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib +$^@
|
||||
@@ -293,6 +317,9 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
|
||||
$(OBJS)\deprecateddll_dummy.obj : .AUTODEPEND ../../src/deprecated\..\..\..\src\msw\dummy.cpp
|
||||
$(CXX) -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\deprecateddll_version.res : .AUTODEPEND ../../src/deprecated\src\msw\version.rc
|
||||
wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\..\src\deprecated\..\..\..\include -i=$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_wat$(VENDORTAG) $<
|
||||
|
||||
$(OBJS)\deprecateddll_prop.obj : .AUTODEPEND ../../src/deprecated\prop.cpp
|
||||
$(CXX) -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
|
||||
|
||||
|
||||
Reference in New Issue
Block a user