Regenerate all of the Makefile.in files with Bakefile 0.2.2.
* Minor whitespace changes in WINDRES commands * Updates version to 2.8.4 from 2.8.2. * Other minor generation differences. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@48108 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
# =========================================================================
|
||||
# This makefile was generated by
|
||||
# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
|
||||
# Bakefile 0.2.2 (http://bakefile.sourceforge.net)
|
||||
# Do not modify, all changes will be overwritten!
|
||||
# =========================================================================
|
||||
|
||||
@@ -40,15 +40,15 @@ wx_top_builddir = @wx_top_builddir@
|
||||
|
||||
DESTDIR =
|
||||
WX_RELEASE = 2.8
|
||||
WX_VERSION = $(WX_RELEASE).2
|
||||
WX_VERSION = $(WX_RELEASE).4
|
||||
LIBDIRNAME = $(wx_top_builddir)/lib
|
||||
TEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
|
||||
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \
|
||||
-I$(srcdir)/../../../include $(CPPFLAGS) $(CXXFLAGS)
|
||||
TEST_OBJECTS = \
|
||||
$(__test___win32rc) \
|
||||
$(__test_os2_lib_res) \
|
||||
$(__test___win32rc) \
|
||||
test_test.o
|
||||
|
||||
### Conditionally set variables: ###
|
||||
@@ -91,12 +91,12 @@ COND_PLATFORM_OS2_1___test___os2_emxbindcmd = $(NM) test$(EXEEXT) | if grep -q \
|
||||
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
|
||||
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
|
||||
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
|
||||
@COND_PLATFORM_WIN32_1@__test___win32rc = test_sample_rc.o
|
||||
@COND_PLATFORM_OS2_1@__test_os2_lib_res = \
|
||||
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
|
||||
@COND_PLATFORM_MACOSX_1@__test_bundle___depname = test_bundle
|
||||
@COND_TOOLKIT_COCOA@____test_BUNDLE_TGT_REF_DEP = test.app/Contents/PkgInfo
|
||||
@COND_TOOLKIT_MAC@____test_BUNDLE_TGT_REF_DEP = test.app/Contents/PkgInfo
|
||||
@COND_PLATFORM_WIN32_1@__test___win32rc = test_sample_rc.o
|
||||
COND_MONOLITHIC_0___WXLIB_CORE_p = \
|
||||
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
|
||||
@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
|
||||
@@ -180,7 +180,7 @@ test.app/Contents/PkgInfo: test$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist
|
||||
@COND_PLATFORM_MACOSX_1@test_bundle: $(____test_BUNDLE_TGT_REF_DEP)
|
||||
|
||||
test_sample_rc.o: $(srcdir)/../../../../samples/sample.rc
|
||||
$(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
|
||||
$(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include --include-dir $(srcdir)/../../../include
|
||||
|
||||
test_test.o: $(srcdir)/test.cpp
|
||||
$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/test.cpp
|
||||
|
Reference in New Issue
Block a user