regenerated all makefiles with bakefile 0.2.0; removed REZ option from config.bkl as it's now defined by bakefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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!
|
||||
# =========================================================================
|
||||
|
||||
@@ -224,17 +224,17 @@ SETUPHDIR = &
|
||||
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 &
|
||||
$(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) &
|
||||
-i=..\..\src\deprecated\..\..\..\include -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) &
|
||||
$(__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 &
|
||||
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) &
|
||||
-i=..\..\src\deprecated\..\..\..\include -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 = &
|
||||
@@ -250,16 +250,16 @@ DEPRECATEDDLL_OBJECTS = &
|
||||
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)
|
||||
$(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) &
|
||||
-i=..\..\src\deprecated\..\..\..\include -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 &
|
||||
$(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) &
|
||||
-i=..\..\src\deprecated\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 &
|
||||
-wcd=667 -i=..\..\src\deprecated\..\..\include -i=..\..\src\deprecated &
|
||||
/fh=$(OBJS)\wxprec_deprecatedlib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
|
||||
$(CPPFLAGS) $(CXXFLAGS)
|
||||
DEPRECATEDLIB_OBJECTS = &
|
||||
@@ -302,7 +302,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
|
||||
@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 option resource=$(OBJS)\deprecateddll_version.res
|
||||
@%append $(OBJS)\deprecateddll.lbc system nr_dll
|
||||
@%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 +$^@
|
||||
!endif
|
||||
@@ -318,7 +318,7 @@ $(OBJS)\deprecateddll_dummy.obj : .AUTODEPEND ../../src/deprecated\..\..\..\src
|
||||
$(CXX) -bt=nt -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) $<
|
||||
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=$(SETUPHDIR) -i=..\..\src\deprecated\..\..\..\include -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) -bt=nt -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
|
||||
|
Reference in New Issue
Block a user