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:
@@ -35,7 +35,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
|
||||
### Variables: ###
|
||||
|
||||
DESTDIR =
|
||||
WX_VERSION = 2.5.1
|
||||
WX_VERSION = 2.5.2
|
||||
LIBDIRNAME = $(top_builddir)lib
|
||||
EXEC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
|
||||
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
|
||||
@@ -70,6 +70,8 @@ COND_PLATFORM_OS2_1___exec___os2_emxbindcmd = $(NM) exec$(EXEEXT) | if grep -q \
|
||||
@COND_PLATFORM_OS2_1@__exec_os2_lib_res = \
|
||||
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
|
||||
@COND_PLATFORM_MACOSX_1@__exec_bundle___depname = exec_bundle
|
||||
@COND_TOOLKIT_COCOA@____exec_BUNDLE_TGT_REF_DEP = exec.app/Contents/PkgInfo
|
||||
@COND_TOOLKIT_MAC@____exec_BUNDLE_TGT_REF_DEP = exec.app/Contents/PkgInfo
|
||||
COND_MONOLITHIC_0___WXLIB_CORE_p = \
|
||||
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)
|
||||
@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
|
||||
@@ -99,7 +101,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 exec$(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: ###
|
||||
@@ -128,7 +130,7 @@ exec$(EXEEXT): $(EXEC_OBJECTS) $(__exec___win32rc)
|
||||
$(__exec___os2_emxbindcmd)
|
||||
$(SAMPLES_RPATH_POSTLINK)
|
||||
|
||||
exec.app/Contents/PkgInfo: exec$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
|
||||
exec.app/Contents/PkgInfo: exec$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
|
||||
mkdir -p exec.app/Contents
|
||||
mkdir -p exec.app/Contents/MacOS
|
||||
mkdir -p exec.app/Contents/Resources
|
||||
@@ -146,10 +148,10 @@ exec.app/Contents/PkgInfo: exec$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist
|
||||
ln -f exec$(EXEEXT) exec.app/Contents/MacOS/exec
|
||||
|
||||
|
||||
ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc exec.app/Contents/Resources/exec.rsrc
|
||||
ln -sf $(top_srcdir)/src/mac/carbon/wxmac.icns exec.app/Contents/Resources/wxmac.icns
|
||||
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc exec.app/Contents/Resources/exec.rsrc
|
||||
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns exec.app/Contents/Resources/wxmac.icns
|
||||
|
||||
@COND_PLATFORM_MACOSX_1@exec_bundle: exec.app/Contents/PkgInfo
|
||||
@COND_PLATFORM_MACOSX_1@exec_bundle: $(____exec_BUNDLE_TGT_REF_DEP)
|
||||
|
||||
exec_exec.o: $(srcdir)/exec.cpp
|
||||
$(CXXC) -c -o $@ $(EXEC_CXXFLAGS) $<
|
||||
|
Reference in New Issue
Block a user