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@
|
||||
@@ -54,8 +53,6 @@ WXCONFIGTOOL_OBJECTS = \
|
||||
|
||||
### 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
|
||||
@@ -85,8 +82,8 @@ WXCONFIGTOOL_OBJECTS = \
|
||||
@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 wxconfigtool$(EXEEXT) \
|
||||
Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
|
||||
$(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o wxconfigtool 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_ADV_p = \
|
||||
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)
|
||||
@@ -110,17 +107,17 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
|
||||
@COND_PLATFORM_MAC_1@__wxconfigtool___mac_rezcmd = \
|
||||
@COND_PLATFORM_MAC_1@ $(__MACOSX_RESOURCES_p_1)
|
||||
@COND_PLATFORM_MAC_1@__wxconfigtool___mac_setfilecmd = \
|
||||
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C wxconfigtool$(EXEEXT)
|
||||
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C wxconfigtool
|
||||
@COND_PLATFORM_WIN32_1@__wxconfigtool___win32rc = wxconfigtool_sample_rc.o
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all: wxconfigtool$(EXEEXT) data
|
||||
all: wxconfigtool data
|
||||
|
||||
clean:
|
||||
rm -rf ./.deps ./.pch
|
||||
rm -f ./*.o
|
||||
rm -f wxconfigtool$(EXEEXT)
|
||||
rm -f wxconfigtool
|
||||
|
||||
data:
|
||||
@mkdir -p .
|
||||
@@ -139,55 +136,55 @@ install-strip: install
|
||||
|
||||
uninstall:
|
||||
|
||||
wxconfigtool$(EXEEXT): $(WXCONFIGTOOL_OBJECTS) $(__wxconfigtool___win32rc)
|
||||
wxconfigtool: $(WXCONFIGTOOL_OBJECTS) $(__wxconfigtool___win32rc)
|
||||
$(CXX) -o $@ $(WXCONFIGTOOL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_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)
|
||||
$(__wxconfigtool___mac_rezcmd)
|
||||
$(__wxconfigtool___mac_setfilecmd)
|
||||
|
||||
wxconfigtool_appsettings.o: $(srcdir)/appsettings.cpp
|
||||
$(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $<
|
||||
$(CXX) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $<
|
||||
|
||||
wxconfigtool_configitem.o: $(srcdir)/configitem.cpp
|
||||
$(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $<
|
||||
$(CXX) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $<
|
||||
|
||||
wxconfigtool_configitemselector.o: $(srcdir)/configitemselector.cpp
|
||||
$(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $<
|
||||
$(CXX) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $<
|
||||
|
||||
wxconfigtool_configtooldoc.o: $(srcdir)/configtooldoc.cpp
|
||||
$(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $<
|
||||
$(CXX) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $<
|
||||
|
||||
wxconfigtool_configtoolview.o: $(srcdir)/configtoolview.cpp
|
||||
$(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $<
|
||||
$(CXX) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $<
|
||||
|
||||
wxconfigtool_configtree.o: $(srcdir)/configtree.cpp
|
||||
$(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $<
|
||||
$(CXX) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $<
|
||||
|
||||
wxconfigtool_custompropertydialog.o: $(srcdir)/custompropertydialog.cpp
|
||||
$(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $<
|
||||
$(CXX) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $<
|
||||
|
||||
wxconfigtool_htmlparser.o: $(srcdir)/htmlparser.cpp
|
||||
$(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $<
|
||||
$(CXX) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $<
|
||||
|
||||
wxconfigtool_mainframe.o: $(srcdir)/mainframe.cpp
|
||||
$(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $<
|
||||
$(CXX) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $<
|
||||
|
||||
wxconfigtool_propeditor.o: $(srcdir)/propeditor.cpp
|
||||
$(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $<
|
||||
$(CXX) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $<
|
||||
|
||||
wxconfigtool_property.o: $(srcdir)/property.cpp
|
||||
$(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $<
|
||||
$(CXX) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $<
|
||||
|
||||
wxconfigtool_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
|
||||
|
||||
wxconfigtool_settingsdialog.o: $(srcdir)/settingsdialog.cpp
|
||||
$(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $<
|
||||
$(CXX) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $<
|
||||
|
||||
wxconfigtool_utils.o: $(srcdir)/utils.cpp
|
||||
$(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $<
|
||||
$(CXX) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $<
|
||||
|
||||
wxconfigtool_wxconfigtool.o: $(srcdir)/wxconfigtool.cpp
|
||||
$(CXXC) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $<
|
||||
$(CXX) -c -o $@ $(WXCONFIGTOOL_CXXFLAGS) $<
|
||||
|
||||
|
||||
# Include dependency info, if present:
|
||||
|
Reference in New Issue
Block a user