regenerated makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -13,7 +13,6 @@ INSTALL = @INSTALL@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CXX = @CXX@
|
||||
CXXFLAGS = @CXXFLAGS@
|
||||
EXEEXT = @EXEEXT@
|
||||
EXTRALIBS = @EXTRALIBS@
|
||||
EXTRALIBS_GUI = @EXTRALIBS_GUI@
|
||||
HOST_SUFFIX = @HOST_SUFFIX@
|
||||
@@ -44,8 +43,6 @@ WX_VERSION = 2.5.0
|
||||
|
||||
### Conditionally set variables: ###
|
||||
|
||||
@COND_DEPS_TRACKING_0@CXXC = $(CXX)
|
||||
@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
|
||||
@COND_USE_GUI_0@PORTNAME = base
|
||||
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
|
||||
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
|
||||
@@ -75,7 +72,7 @@ WX_VERSION = 2.5.0
|
||||
@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX)
|
||||
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 help$(EXEEXT) Carbon.r \
|
||||
$(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o help Carbon.r \
|
||||
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
|
||||
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
|
||||
@COND_MONOLITHIC_0@__WXLIB_BASE_p = \
|
||||
@@ -93,31 +90,30 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
|
||||
@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
|
||||
@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
|
||||
@COND_PLATFORM_MAC_1@__help___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
|
||||
@COND_PLATFORM_MAC_1@__help___mac_setfilecmd = \
|
||||
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C help$(EXEEXT)
|
||||
@COND_PLATFORM_MAC_1@__help___mac_setfilecmd = $(SETFILE) -a C help
|
||||
@COND_PLATFORM_WIN32_1@__help___win32rc = help_demo_rc.o
|
||||
@COND_PLATFORM_MACOSX_1@__help_bundle___depname = help_bundle
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all: help$(EXEEXT) $(__help_bundle___depname)
|
||||
all: help $(__help_bundle___depname)
|
||||
|
||||
clean:
|
||||
rm -rf ./.deps ./.pch
|
||||
rm -f ./*.o
|
||||
rm -f help$(EXEEXT)
|
||||
rm -f help
|
||||
rm -rf help.app
|
||||
|
||||
distclean: clean
|
||||
rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
|
||||
|
||||
help$(EXEEXT): $(HELP_OBJECTS) $(__help___win32rc)
|
||||
help: $(HELP_OBJECTS) $(__help___win32rc)
|
||||
$(CXX) -o $@ $(HELP_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_HTML_p) $(__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)
|
||||
$(__help___mac_rezcmd)
|
||||
$(__help___mac_setfilecmd)
|
||||
$(SAMPLES_RPATH_POSTLINK)
|
||||
|
||||
help.app/Contents: help$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
|
||||
help.app/Contents: help $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
|
||||
mkdir -p help.app/Contents
|
||||
mkdir -p help.app/Contents/MacOS
|
||||
mkdir -p help.app/Contents/Resources
|
||||
@@ -132,7 +128,7 @@ help.app/Contents: help$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAM
|
||||
echo -n "APPL????" >help.app/Contents/PkgInfo
|
||||
|
||||
|
||||
ln -f help$(EXEEXT) help.app/Contents/MacOS/help
|
||||
ln -f help help.app/Contents/MacOS/help
|
||||
|
||||
|
||||
ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc help.app/Contents/Resources/help.rsrc
|
||||
@@ -141,7 +137,7 @@ help.app/Contents: help$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAM
|
||||
@COND_PLATFORM_MACOSX_1@help_bundle: help.app/Contents
|
||||
|
||||
help_demo.o: $(srcdir)/demo.cpp
|
||||
$(CXXC) -c -o $@ $(HELP_CXXFLAGS) $<
|
||||
$(CXX) -c -o $@ $(HELP_CXXFLAGS) $<
|
||||
|
||||
help_demo_rc.o: $(srcdir)/demo.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
|
||||
|
Reference in New Issue
Block a user