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:
Julian Smart
2004-05-24 14:12:40 +00:00
parent adb8a71bbc
commit c4839ccf58
874 changed files with 9141 additions and 8228 deletions

View File

@@ -43,7 +43,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
### Variables: ###
DESTDIR =
WX_VERSION = 2.5.1
WX_VERSION = 2.5.2
LIBDIRNAME = $(top_builddir)lib
PLUGINS_INST_DIR = $(libdir)/wx/$(PLUGIN_VERSION0)
RENDER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
@@ -69,8 +69,8 @@ RENDDLL_OBJECTS = \
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@COND_PLATFORM_UNIX_0@PLUGIN_VERSION0 = 251
@COND_PLATFORM_UNIX_1@PLUGIN_VERSION0 = 2.5.1
@COND_PLATFORM_UNIX_0@PLUGIN_VERSION0 = 252
@COND_PLATFORM_UNIX_1@PLUGIN_VERSION0 = 2.5.2
@COND_PLATFORM_UNIX_0@PLUGVERDELIM =
@COND_PLATFORM_UNIX_1@PLUGVERDELIM = -
@COND_BUILD_RELEASE_UNICODE_0@PLUGINSUFFIX =
@@ -92,6 +92,10 @@ COND_PLATFORM_OS2_1___render___os2_emxbindcmd = $(NM) render$(EXEEXT) | if grep
@COND_PLATFORM_OS2_1@__render_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__render_bundle___depname = render_bundle
@COND_TOOLKIT_COCOA@____render_BUNDLE_TGT_REF_DEP = \
@COND_TOOLKIT_COCOA@ render.app/Contents/PkgInfo
@COND_TOOLKIT_MAC@____render_BUNDLE_TGT_REF_DEP = \
@COND_TOOLKIT_MAC@ render.app/Contents/PkgInfo
COND_SHARED_1___renddll___depname = \
$(DLLPREFIX_MODULE)renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
@COND_SHARED_1@__renddll___depname = $(COND_SHARED_1___renddll___depname)
@@ -99,7 +103,7 @@ COND_SHARED_1___renddll___depname = \
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 render$(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)
@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
COND_MONOLITHIC_0___WXLIB_CORE_p = \
@@ -156,7 +160,7 @@ render$(EXEEXT): $(RENDER_OBJECTS) $(__render___win32rc)
$(__render___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
render.app/Contents/PkgInfo: render$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
render.app/Contents/PkgInfo: render$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p render.app/Contents
mkdir -p render.app/Contents/MacOS
mkdir -p render.app/Contents/Resources
@@ -174,10 +178,10 @@ render.app/Contents/PkgInfo: render$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p
ln -f render$(EXEEXT) render.app/Contents/MacOS/render
ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc render.app/Contents/Resources/render.rsrc
ln -sf $(top_srcdir)/src/mac/carbon/wxmac.icns render.app/Contents/Resources/wxmac.icns
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc render.app/Contents/Resources/render.rsrc
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns render.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@render_bundle: render.app/Contents/PkgInfo
@COND_PLATFORM_MACOSX_1@render_bundle: $(____render_BUNDLE_TGT_REF_DEP)
@COND_SHARED_1@$(DLLPREFIX_MODULE)renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE): $(RENDDLL_OBJECTS)
@COND_SHARED_1@ $(SHARED_LD_MODULE_CXX) $@ $(RENDDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)