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:
@@ -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!
|
||||
# =========================================================================
|
||||
|
||||
@@ -136,6 +136,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
|
||||
@@ -143,19 +150,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
|
||||
@@ -170,6 +177,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
|
||||
@@ -209,24 +228,26 @@ __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
|
||||
### 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 = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
|
||||
SETUPHDIR = &
|
||||
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
|
||||
RENDER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
|
||||
-d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
|
||||
-i=.\..\..\include -i=$(SETUPHDIR) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &
|
||||
$(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $(__EXCEPTIONSFLAG) &
|
||||
$(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS)
|
||||
RENDER_CXXFLAGS = $(__DEBUGINFO) $(__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=.\..\..\include -i=$(SETUPHDIR) -wx -wcd=549 &
|
||||
-wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH &
|
||||
$(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
|
||||
RENDER_OBJECTS = &
|
||||
$(OBJS)\render_render.obj
|
||||
RENDDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
|
||||
-d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
|
||||
-i=.\..\..\include -i=$(SETUPHDIR) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 &
|
||||
-dWXUSINGDLL $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) $(CPPFLAGS) &
|
||||
$(CXXFLAGS)
|
||||
RENDDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__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=.\..\..\include -i=$(SETUPHDIR) -wx -wcd=549 &
|
||||
-wcd=656 -wcd=657 -wcd=667 -dWXUSINGDLL $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
|
||||
$(CPPFLAGS) $(CXXFLAGS)
|
||||
RENDDLL_OBJECTS = &
|
||||
$(OBJS)\renddll_renddll.obj
|
||||
|
||||
@@ -274,7 +295,7 @@ $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(WX_VERSION_NODOT)_wat.d
|
||||
!endif
|
||||
|
||||
$(OBJS)\render_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
|
||||
wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples $<
|
||||
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=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples $<
|
||||
|
||||
$(OBJS)\render_render.obj : .AUTODEPEND .\render.cpp
|
||||
$(CXX) -zq -fo=$^@ $(RENDER_CXXFLAGS) $<
|
||||
|
Reference in New Issue
Block a user