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 widget$(EXEEXT) Carbon.r \
|
||||
$(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o widget 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,19 +90,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@__widget___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
|
||||
@COND_PLATFORM_MAC_1@__widget___mac_setfilecmd = \
|
||||
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C widget$(EXEEXT)
|
||||
@COND_PLATFORM_MAC_1@__widget___mac_setfilecmd = $(SETFILE) -a C widget
|
||||
@COND_PLATFORM_WIN32_1@__widget___win32rc = widget_widget_rc.o
|
||||
@COND_PLATFORM_MACOSX_1@__widget_bundle___depname = widget_bundle
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all: widget$(EXEEXT) $(__widget_bundle___depname) data
|
||||
all: widget $(__widget_bundle___depname) data
|
||||
|
||||
clean:
|
||||
rm -rf ./.deps ./.pch
|
||||
rm -f ./*.o
|
||||
rm -f widget$(EXEEXT)
|
||||
rm -f widget
|
||||
rm -rf widget.app
|
||||
|
||||
data:
|
||||
@@ -125,13 +121,13 @@ install-strip: install
|
||||
|
||||
uninstall:
|
||||
|
||||
widget$(EXEEXT): $(WIDGET_OBJECTS) $(__widget___win32rc)
|
||||
widget: $(WIDGET_OBJECTS) $(__widget___win32rc)
|
||||
$(CXX) -o $@ $(WIDGET_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)
|
||||
$(__widget___mac_rezcmd)
|
||||
$(__widget___mac_setfilecmd)
|
||||
$(SAMPLES_RPATH_POSTLINK)
|
||||
|
||||
widget.app/Contents: widget$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
|
||||
widget.app/Contents: widget $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
|
||||
mkdir -p widget.app/Contents
|
||||
mkdir -p widget.app/Contents/MacOS
|
||||
mkdir -p widget.app/Contents/Resources
|
||||
@@ -146,7 +142,7 @@ widget.app/Contents: widget$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI
|
||||
echo -n "APPL????" >widget.app/Contents/PkgInfo
|
||||
|
||||
|
||||
ln -f widget$(EXEEXT) widget.app/Contents/MacOS/widget
|
||||
ln -f widget widget.app/Contents/MacOS/widget
|
||||
|
||||
|
||||
ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc widget.app/Contents/Resources/widget.rsrc
|
||||
@@ -155,7 +151,7 @@ widget.app/Contents: widget$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI
|
||||
@COND_PLATFORM_MACOSX_1@widget_bundle: widget.app/Contents
|
||||
|
||||
widget_widget.o: $(srcdir)/widget.cpp
|
||||
$(CXXC) -c -o $@ $(WIDGET_CXXFLAGS) $<
|
||||
$(CXX) -c -o $@ $(WIDGET_CXXFLAGS) $<
|
||||
|
||||
widget_widget_rc.o: $(srcdir)/widget.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