regenerated makefiles, with support for multilib build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21389 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -81,7 +81,9 @@ SHARED_LD_CC = @SHARED_LD_CC@
|
||||
@COND_WXUNIV_1@WXUNIVNAME = univ
|
||||
@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
|
||||
@COND_PLATFORM_WIN32_1@__oleauto___win32rc = oleauto_rc.o
|
||||
@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
|
||||
@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
|
||||
@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
|
||||
@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
|
||||
@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
|
||||
@COND_PLATFORM_MAC_1@__oleauto___mac_rezcmd = $(__MACOSX_RESOURCES_p)
|
||||
@@ -90,15 +92,17 @@ SHARED_LD_CC = @SHARED_LD_CC@
|
||||
@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__
|
||||
@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5
|
||||
@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff
|
||||
@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5
|
||||
@COND_PLATFORM_MAC_1@__oleauto___mac_setfilecmd = $(SETFILE) -a C oleauto$(EXEEXT)
|
||||
@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
|
||||
@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5
|
||||
@COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
|
||||
@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg
|
||||
@COND_PLATFORM_MAC_1@__oleauto___mac_setfilecmd = $(SETFILE) -a C oleauto$(EXEEXT)
|
||||
@COND_MONOLITHIC_0@WXLIB_HTML = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5
|
||||
@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5
|
||||
@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5
|
||||
@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
|
||||
@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff
|
||||
@COND_USE_GUI_0@PORTNAME = base
|
||||
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
|
||||
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o oleauto$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
|
||||
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o oleauto$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
|
||||
@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex
|
||||
@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex
|
||||
@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d
|
||||
@@ -121,7 +125,7 @@ oleauto$(EXEEXT): oleauto.o $(__oleauto___win32rc)
|
||||
$(__oleauto___mac_setfilecmd)
|
||||
|
||||
oleauto_rc.o: $(srcdir)/oleauto.rc
|
||||
$(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ --define $(WXUNIV_DEFINE) --include-dir $(srcdir)/../../include --include-dir $(srcdir)
|
||||
$(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir)
|
||||
|
||||
uninstall:
|
||||
|
||||
|
Reference in New Issue
Block a user