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
|
||||
@@ -76,8 +73,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 -i $(srcdir)/../../include -o \
|
||||
stctest$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \
|
||||
sample.r
|
||||
stctest 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 = \
|
||||
@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
|
||||
@@ -91,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@__stctest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
|
||||
@COND_PLATFORM_MAC_1@__stctest___mac_setfilecmd = \
|
||||
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C stctest$(EXEEXT)
|
||||
@COND_PLATFORM_MAC_1@__stctest___mac_setfilecmd = $(SETFILE) -a C stctest
|
||||
@COND_PLATFORM_WIN32_1@__stctest___win32rc = stctest_sample_rc.o
|
||||
@COND_PLATFORM_MACOSX_1@__stctest_bundle___depname = stctest_bundle
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all: stctest$(EXEEXT) $(__stctest_bundle___depname) data
|
||||
all: stctest $(__stctest_bundle___depname) data
|
||||
|
||||
clean:
|
||||
rm -rf ./.deps ./.pch
|
||||
rm -f ./*.o
|
||||
rm -f stctest$(EXEEXT)
|
||||
rm -f stctest
|
||||
rm -rf stctest.app
|
||||
|
||||
data:
|
||||
@@ -121,13 +116,13 @@ install: all
|
||||
|
||||
install-strip: install
|
||||
|
||||
stctest$(EXEEXT): $(STCTEST_OBJECTS) $(__stctest___win32rc)
|
||||
stctest: $(STCTEST_OBJECTS) $(__stctest___win32rc)
|
||||
$(CXX) -o $@ $(STCTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX) $(__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)
|
||||
$(__stctest___mac_rezcmd)
|
||||
$(__stctest___mac_setfilecmd)
|
||||
$(SAMPLES_RPATH_POSTLINK)
|
||||
|
||||
stctest.app/Contents: stctest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
|
||||
stctest.app/Contents: stctest $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
|
||||
mkdir -p stctest.app/Contents
|
||||
mkdir -p stctest.app/Contents/MacOS
|
||||
mkdir -p stctest.app/Contents/Resources
|
||||
@@ -142,7 +137,7 @@ stctest.app/Contents: stctest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB
|
||||
echo -n "APPL????" >stctest.app/Contents/PkgInfo
|
||||
|
||||
|
||||
ln -f stctest$(EXEEXT) stctest.app/Contents/MacOS/stctest
|
||||
ln -f stctest stctest.app/Contents/MacOS/stctest
|
||||
|
||||
|
||||
ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc stctest.app/Contents/Resources/stctest.rsrc
|
||||
@@ -154,7 +149,7 @@ stctest_sample_rc.o: $(srcdir)/../../../samples/sample.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
|
||||
|
||||
stctest_stctest.o: $(srcdir)/stctest.cpp
|
||||
$(CXXC) -c -o $@ $(STCTEST_CXXFLAGS) $<
|
||||
$(CXX) -c -o $@ $(STCTEST_CXXFLAGS) $<
|
||||
|
||||
uninstall:
|
||||
|
||||
|
Reference in New Issue
Block a user