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:
@@ -19,6 +19,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
|
||||
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@
|
||||
@@ -40,7 +41,7 @@ EXEC_OBJECTS = \
|
||||
exec_exec.o \
|
||||
$(__exec___win32rc)
|
||||
LIBDIRNAME = $(top_builddir)lib
|
||||
WX_VERSION = 2.5.0
|
||||
WX_VERSION = 2.5.1
|
||||
|
||||
### Conditionally set variables: ###
|
||||
|
||||
@@ -76,7 +77,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 exec$(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)
|
||||
@@ -92,6 +93,9 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
|
||||
@COND_PLATFORM_MAC_1@__exec___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
|
||||
@COND_PLATFORM_MAC_1@__exec___mac_setfilecmd = \
|
||||
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C exec$(EXEEXT)
|
||||
COND_PLATFORM_OS2_1___exec___os2_emxbindcmd = $(NM) exec$(EXEEXT) | if grep -q \
|
||||
pmwin.763 ; then emxbind -ep exec$(EXEEXT) ; fi
|
||||
@COND_PLATFORM_OS2_1@__exec___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___exec___os2_emxbindcmd)
|
||||
@COND_PLATFORM_WIN32_1@__exec___win32rc = exec_exec_rc.o
|
||||
@COND_PLATFORM_MACOSX_1@__exec_bundle___depname = exec_bundle
|
||||
|
||||
@@ -109,12 +113,13 @@ distclean: clean
|
||||
rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
|
||||
|
||||
exec$(EXEEXT): $(EXEC_OBJECTS) $(__exec___win32rc)
|
||||
$(CXX) -o $@ $(EXEC_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__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)
|
||||
$(CXX) -o $@ $(EXEC_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__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)
|
||||
$(__exec___mac_rezcmd)
|
||||
$(__exec___mac_setfilecmd)
|
||||
$(__exec___os2_emxbindcmd)
|
||||
$(SAMPLES_RPATH_POSTLINK)
|
||||
|
||||
exec.app/Contents/PkgInfo: exec$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
|
||||
exec.app/Contents/PkgInfo: exec$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
|
||||
mkdir -p exec.app/Contents
|
||||
mkdir -p exec.app/Contents/MacOS
|
||||
mkdir -p exec.app/Contents/Resources
|
||||
@@ -132,7 +137,7 @@ exec.app/Contents/PkgInfo: exec$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L
|
||||
ln -f exec$(EXEEXT) exec.app/Contents/MacOS/exec
|
||||
|
||||
|
||||
ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc exec.app/Contents/Resources/exec.rsrc
|
||||
ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc exec.app/Contents/Resources/exec.rsrc
|
||||
ln -f $(top_srcdir)/src/mac/wxmac.icns exec.app/Contents/Resources/wxmac.icns
|
||||
|
||||
@COND_PLATFORM_MACOSX_1@exec_bundle: exec.app/Contents/PkgInfo
|
||||
@@ -141,7 +146,7 @@ exec_exec.o: $(srcdir)/exec.cpp
|
||||
$(CXXC) -c -o $@ $(EXEC_CXXFLAGS) $<
|
||||
|
||||
exec_exec_rc.o: $(srcdir)/exec.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
|
||||
|
||||
install: all
|
||||
|
||||
|
Reference in New Issue
Block a user