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 layout$(EXEEXT) Carbon.r \
|
||||
$(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o layout 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 = \
|
||||
@@ -90,19 +87,18 @@ 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@__layout___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
|
||||
@COND_PLATFORM_MAC_1@__layout___mac_setfilecmd = \
|
||||
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C layout$(EXEEXT)
|
||||
@COND_PLATFORM_MAC_1@__layout___mac_setfilecmd = $(SETFILE) -a C layout
|
||||
@COND_PLATFORM_WIN32_1@__layout___win32rc = layout_layout_rc.o
|
||||
@COND_PLATFORM_MACOSX_1@__layout_bundle___depname = layout_bundle
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all: layout$(EXEEXT) $(__layout_bundle___depname)
|
||||
all: layout $(__layout_bundle___depname)
|
||||
|
||||
clean:
|
||||
rm -rf ./.deps ./.pch
|
||||
rm -f ./*.o
|
||||
rm -f layout$(EXEEXT)
|
||||
rm -f layout
|
||||
rm -rf layout.app
|
||||
|
||||
distclean: clean
|
||||
@@ -112,13 +108,13 @@ install: all
|
||||
|
||||
install-strip: install
|
||||
|
||||
layout$(EXEEXT): $(LAYOUT_OBJECTS) $(__layout___win32rc)
|
||||
layout: $(LAYOUT_OBJECTS) $(__layout___win32rc)
|
||||
$(CXX) -o $@ $(LAYOUT_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)
|
||||
$(__layout___mac_rezcmd)
|
||||
$(__layout___mac_setfilecmd)
|
||||
$(SAMPLES_RPATH_POSTLINK)
|
||||
|
||||
layout.app/Contents: layout$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
|
||||
layout.app/Contents: layout $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
|
||||
mkdir -p layout.app/Contents
|
||||
mkdir -p layout.app/Contents/MacOS
|
||||
mkdir -p layout.app/Contents/Resources
|
||||
@@ -133,7 +129,7 @@ layout.app/Contents: layout$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI
|
||||
echo -n "APPL????" >layout.app/Contents/PkgInfo
|
||||
|
||||
|
||||
ln -f layout$(EXEEXT) layout.app/Contents/MacOS/layout
|
||||
ln -f layout layout.app/Contents/MacOS/layout
|
||||
|
||||
|
||||
ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc layout.app/Contents/Resources/layout.rsrc
|
||||
@@ -142,7 +138,7 @@ layout.app/Contents: layout$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI
|
||||
@COND_PLATFORM_MACOSX_1@layout_bundle: layout.app/Contents
|
||||
|
||||
layout_layout.o: $(srcdir)/layout.cpp
|
||||
$(CXXC) -c -o $@ $(LAYOUT_CXXFLAGS) $<
|
||||
$(CXX) -c -o $@ $(LAYOUT_CXXFLAGS) $<
|
||||
|
||||
layout_layout_rc.o: $(srcdir)/layout.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