Updated makefiles etc. for 2.5.1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23603 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -20,6 +20,7 @@ EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@
|
||||
HOST_SUFFIX = @HOST_SUFFIX@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LDFLAGS_GUI = @LDFLAGS_GUI@
|
||||
NM = @NM@
|
||||
RESCOMP = @RESCOMP@
|
||||
SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
|
||||
SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
|
||||
@@ -41,7 +42,7 @@ ISOSURF_OBJECTS = \
|
||||
$(__isosurf___win32rc) \
|
||||
isosurf_isosurf.o
|
||||
LIBDIRNAME = $(top_builddir)lib
|
||||
WX_VERSION = 2.5.0
|
||||
WX_VERSION = 2.5.1
|
||||
|
||||
### Conditionally set variables: ###
|
||||
|
||||
@@ -77,7 +78,7 @@ WX_VERSION = 2.5.0
|
||||
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
|
||||
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \
|
||||
$(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o isosurf$(EXEEXT) Carbon.r \
|
||||
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
|
||||
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r
|
||||
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
|
||||
@COND_MONOLITHIC_0@__WXLIB_BASE_p = \
|
||||
@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
|
||||
@@ -93,8 +94,9 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
|
||||
@COND_PLATFORM_MAC_1@__isosurf___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
|
||||
@COND_PLATFORM_MAC_1@__isosurf___mac_setfilecmd = \
|
||||
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C isosurf$(EXEEXT)
|
||||
@COND_PLATFORM_OS2_1@__isosurf___os2_emxbindcmd = \
|
||||
@COND_PLATFORM_OS2_1@ emxbind -ep isosurf$(EXEEXT)
|
||||
COND_PLATFORM_OS2_1___isosurf___os2_emxbindcmd = $(NM) isosurf$(EXEEXT) | if \
|
||||
grep -q pmwin.763 ; then emxbind -ep isosurf$(EXEEXT) ; fi
|
||||
@COND_PLATFORM_OS2_1@__isosurf___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___isosurf___os2_emxbindcmd)
|
||||
@COND_PLATFORM_WIN32_1@__isosurf___win32rc = isosurf_sample_rc.o
|
||||
@COND_PLATFORM_MACOSX_1@__isosurf_bundle___depname = isosurf_bundle
|
||||
|
||||
@@ -130,7 +132,7 @@ isosurf$(EXEEXT): $(ISOSURF_OBJECTS) $(__isosurf___win32rc)
|
||||
$(__isosurf___os2_emxbindcmd)
|
||||
$(SAMPLES_RPATH_POSTLINK)
|
||||
|
||||
isosurf.app/Contents/PkgInfo: isosurf$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
|
||||
isosurf.app/Contents/PkgInfo: isosurf$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
|
||||
mkdir -p isosurf.app/Contents
|
||||
mkdir -p isosurf.app/Contents/MacOS
|
||||
mkdir -p isosurf.app/Contents/Resources
|
||||
@@ -148,7 +150,7 @@ isosurf.app/Contents/PkgInfo: isosurf$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
|
||||
ln -f isosurf$(EXEEXT) isosurf.app/Contents/MacOS/isosurf
|
||||
|
||||
|
||||
ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc isosurf.app/Contents/Resources/isosurf.rsrc
|
||||
ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc isosurf.app/Contents/Resources/isosurf.rsrc
|
||||
ln -f $(top_srcdir)/src/mac/wxmac.icns isosurf.app/Contents/Resources/wxmac.icns
|
||||
|
||||
@COND_PLATFORM_MACOSX_1@isosurf_bundle: isosurf.app/Contents/PkgInfo
|
||||
@@ -157,7 +159,7 @@ isosurf_isosurf.o: $(srcdir)/isosurf.cpp
|
||||
$(CXXC) -c -o $@ $(ISOSURF_CXXFLAGS) $<
|
||||
|
||||
isosurf_sample_rc.o: $(srcdir)/../../../samples/sample.rc
|
||||
$(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples
|
||||
$(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples
|
||||
|
||||
uninstall:
|
||||
|
||||
|
Reference in New Issue
Block a user