Regenerated makefiles for 2.5.2
Other version updates Added list of Cocoa files git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27410 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -36,7 +36,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
|
||||
### Variables: ###
|
||||
|
||||
DESTDIR =
|
||||
WX_VERSION = 2.5.1
|
||||
WX_VERSION = 2.5.2
|
||||
LIBDIRNAME = $(top_builddir)lib
|
||||
DIALOGS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
|
||||
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
|
||||
@@ -72,6 +72,10 @@ COND_PLATFORM_OS2_1___dialogs___os2_emxbindcmd = $(NM) dialogs$(EXEEXT) | if \
|
||||
@COND_PLATFORM_OS2_1@__dialogs_os2_lib_res = \
|
||||
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
|
||||
@COND_PLATFORM_MACOSX_1@__dialogs_bundle___depname = dialogs_bundle
|
||||
@COND_TOOLKIT_COCOA@____dialogs_BUNDLE_TGT_REF_DEP = \
|
||||
@COND_TOOLKIT_COCOA@ dialogs.app/Contents/PkgInfo
|
||||
@COND_TOOLKIT_MAC@____dialogs_BUNDLE_TGT_REF_DEP = \
|
||||
@COND_TOOLKIT_MAC@ dialogs.app/Contents/PkgInfo
|
||||
COND_MONOLITHIC_0___WXLIB_ADV_p = \
|
||||
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)
|
||||
@COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
|
||||
@@ -104,7 +108,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
|
||||
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
|
||||
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
|
||||
$(srcdir)/../../samples -i $(top_srcdir)/include -o dialogs$(EXEEXT) Carbon.r \
|
||||
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r
|
||||
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
|
||||
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
|
||||
|
||||
### Targets: ###
|
||||
@@ -133,7 +137,7 @@ dialogs$(EXEEXT): $(DIALOGS_OBJECTS) $(__dialogs___win32rc)
|
||||
$(__dialogs___os2_emxbindcmd)
|
||||
$(SAMPLES_RPATH_POSTLINK)
|
||||
|
||||
dialogs.app/Contents/PkgInfo: dialogs$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
|
||||
dialogs.app/Contents/PkgInfo: dialogs$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
|
||||
mkdir -p dialogs.app/Contents
|
||||
mkdir -p dialogs.app/Contents/MacOS
|
||||
mkdir -p dialogs.app/Contents/Resources
|
||||
@@ -151,10 +155,10 @@ dialogs.app/Contents/PkgInfo: dialogs$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info
|
||||
ln -f dialogs$(EXEEXT) dialogs.app/Contents/MacOS/dialogs
|
||||
|
||||
|
||||
ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc dialogs.app/Contents/Resources/dialogs.rsrc
|
||||
ln -sf $(top_srcdir)/src/mac/carbon/wxmac.icns dialogs.app/Contents/Resources/wxmac.icns
|
||||
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc dialogs.app/Contents/Resources/dialogs.rsrc
|
||||
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns dialogs.app/Contents/Resources/wxmac.icns
|
||||
|
||||
@COND_PLATFORM_MACOSX_1@dialogs_bundle: dialogs.app/Contents/PkgInfo
|
||||
@COND_PLATFORM_MACOSX_1@dialogs_bundle: $(____dialogs_BUNDLE_TGT_REF_DEP)
|
||||
|
||||
data:
|
||||
@mkdir -p .
|
||||
|
Reference in New Issue
Block a user