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 scrollsub$(EXEEXT) Carbon.r \
|
||||
$(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o scrollsub 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 = \
|
||||
@@ -91,18 +88,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
|
||||
@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
|
||||
@COND_PLATFORM_MAC_1@__scrollsub___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
|
||||
@COND_PLATFORM_MAC_1@__scrollsub___mac_setfilecmd = \
|
||||
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C scrollsub$(EXEEXT)
|
||||
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C scrollsub
|
||||
@COND_PLATFORM_WIN32_1@__scrollsub___win32rc = scrollsub_scrollsub_rc.o
|
||||
@COND_PLATFORM_MACOSX_1@__scrollsub_bundle___depname = scrollsub_bundle
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all: scrollsub$(EXEEXT) $(__scrollsub_bundle___depname)
|
||||
all: scrollsub $(__scrollsub_bundle___depname)
|
||||
|
||||
clean:
|
||||
rm -rf ./.deps ./.pch
|
||||
rm -f ./*.o
|
||||
rm -f scrollsub$(EXEEXT)
|
||||
rm -f scrollsub
|
||||
rm -rf scrollsub.app
|
||||
|
||||
distclean: clean
|
||||
@@ -112,13 +109,13 @@ install: all
|
||||
|
||||
install-strip: install
|
||||
|
||||
scrollsub$(EXEEXT): $(SCROLLSUB_OBJECTS) $(__scrollsub___win32rc)
|
||||
scrollsub: $(SCROLLSUB_OBJECTS) $(__scrollsub___win32rc)
|
||||
$(CXX) -o $@ $(SCROLLSUB_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)
|
||||
$(__scrollsub___mac_rezcmd)
|
||||
$(__scrollsub___mac_setfilecmd)
|
||||
$(SAMPLES_RPATH_POSTLINK)
|
||||
|
||||
scrollsub.app/Contents: scrollsub$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
|
||||
scrollsub.app/Contents: scrollsub $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
|
||||
mkdir -p scrollsub.app/Contents
|
||||
mkdir -p scrollsub.app/Contents/MacOS
|
||||
mkdir -p scrollsub.app/Contents/Resources
|
||||
@@ -133,7 +130,7 @@ scrollsub.app/Contents: scrollsub$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $
|
||||
echo -n "APPL????" >scrollsub.app/Contents/PkgInfo
|
||||
|
||||
|
||||
ln -f scrollsub$(EXEEXT) scrollsub.app/Contents/MacOS/scrollsub
|
||||
ln -f scrollsub scrollsub.app/Contents/MacOS/scrollsub
|
||||
|
||||
|
||||
ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc scrollsub.app/Contents/Resources/scrollsub.rsrc
|
||||
@@ -142,7 +139,7 @@ scrollsub.app/Contents: scrollsub$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $
|
||||
@COND_PLATFORM_MACOSX_1@scrollsub_bundle: scrollsub.app/Contents
|
||||
|
||||
scrollsub_scrollsub.o: $(srcdir)/scrollsub.cpp
|
||||
$(CXXC) -c -o $@ $(SCROLLSUB_CXXFLAGS) $<
|
||||
$(CXX) -c -o $@ $(SCROLLSUB_CXXFLAGS) $<
|
||||
|
||||
scrollsub_scrollsub_rc.o: $(srcdir)/scrollsub.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