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!
|
||||
# =========================================================================
|
||||
|
||||
@@ -110,26 +110,33 @@ __OPTIMIZEFLAG_2 = -od
|
||||
!ifeq BUILD release
|
||||
__OPTIMIZEFLAG_2 = -ot -ox
|
||||
!endif
|
||||
__RUNTIME_LIBS_5 =
|
||||
__THREADSFLAG_5 =
|
||||
!ifeq USE_THREADS 0
|
||||
__THREADSFLAG_5 =
|
||||
!endif
|
||||
!ifeq USE_THREADS 1
|
||||
__THREADSFLAG_5 = -bm
|
||||
!endif
|
||||
__RUNTIME_LIBS_6 =
|
||||
!ifeq RUNTIME_LIBS dynamic
|
||||
__RUNTIME_LIBS_5 = -br
|
||||
__RUNTIME_LIBS_6 = -br
|
||||
!endif
|
||||
!ifeq RUNTIME_LIBS static
|
||||
__RUNTIME_LIBS_5 =
|
||||
__RUNTIME_LIBS_6 =
|
||||
!endif
|
||||
__EXCEPTIONSFLAG_6 =
|
||||
__RTTIFLAG_7 =
|
||||
!ifeq USE_RTTI 0
|
||||
__RTTIFLAG_7 =
|
||||
!endif
|
||||
!ifeq USE_RTTI 1
|
||||
__RTTIFLAG_7 = -xr
|
||||
!endif
|
||||
__EXCEPTIONSFLAG_8 =
|
||||
!ifeq USE_EXCEPTIONS 0
|
||||
__EXCEPTIONSFLAG_6 =
|
||||
__EXCEPTIONSFLAG_8 =
|
||||
!endif
|
||||
!ifeq USE_EXCEPTIONS 1
|
||||
__EXCEPTIONSFLAG_6 = -xr
|
||||
!endif
|
||||
__EXCEPTIONSFLAG_7 =
|
||||
!ifeq USE_EXCEPTIONS 0
|
||||
__EXCEPTIONSFLAG_7 =
|
||||
!endif
|
||||
!ifeq USE_EXCEPTIONS 1
|
||||
__EXCEPTIONSFLAG_7 = -xs
|
||||
__EXCEPTIONSFLAG_8 = -xs
|
||||
!endif
|
||||
__WXLIB_ADV_p =
|
||||
!ifeq MONOLITHIC 0
|
||||
@@ -176,6 +183,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
|
||||
@@ -193,11 +212,12 @@ OBJS = &
|
||||
LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
|
||||
SETUPHDIR = &
|
||||
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
|
||||
SASHTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
|
||||
$(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
|
||||
SASHTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
|
||||
$(__RUNTIME_LIBS_6) -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 &
|
||||
$(__EXCEPTIONSFLAG_6) $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS)
|
||||
$(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
|
||||
SASHTEST_OBJECTS = &
|
||||
$(OBJS)\sashtest_sashtest.obj
|
||||
|
||||
@@ -225,7 +245,7 @@ $(OBJS)\sashtest.exe : $(SASHTEST_OBJECTS) $(OBJS)\sashtest_sashtest.res
|
||||
@%append $(OBJS)\sashtest.lbc option caseexact
|
||||
@%append $(OBJS)\sashtest.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
|
||||
@for %i in ($(SASHTEST_OBJECTS)) do @%append $(OBJS)\sashtest.lbc file %i
|
||||
@for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\sashtest.lbc library %i
|
||||
@for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\sashtest.lbc library %i
|
||||
@%append $(OBJS)\sashtest.lbc option resource=$(OBJS)\sashtest_sashtest.res
|
||||
wlink @$(OBJS)\sashtest.lbc
|
||||
|
||||
@@ -233,5 +253,5 @@ $(OBJS)\sashtest_sashtest.obj : .AUTODEPEND .\sashtest.cpp
|
||||
$(CXX) -zq -fo=$^@ $(SASHTEST_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\sashtest_sashtest.res : .AUTODEPEND .\sashtest.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 -dNOPCH $<
|
||||
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 -dNOPCH $<
|
||||
|
||||
|
Reference in New Issue
Block a user