amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 04:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

More updates to build system

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1435 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
coppro
2010-01-20 03:19:57 +00:00
parent c0ce05a341
commit 81c6fb87cd
6 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MakeAM.sh
+2 -1
View File
@@ -25,7 +25,7 @@ AM_LDFLAGS = @WX_LIBS@ $(BOOST_LDFLAGS)
gcc -x c - -c -o $@ <<<""
magicseteditor_LDADD = $(BOOST_REGEX_LIB)
magicseteditor_CXXFLAGS = -fpch-deps $(AM_CXXFLAGS)
magicseteditor_CXXFLAGS = $(AM_CXXFLAGS)
magicseteditor_SOURCES =
if GLIBCPP_BUILD_PCH
@@ -34,6 +34,7 @@ clean-local:
rm -f ./src/util/prec.gch
include ./src/util/$(DEPDIR)/prec.Pch
magicseteditor_SOURCES += ./src/util/prec.gch
magicseteditor_CXXFLAGS += -fpch-deps
endif
# The script used to generate is MakeAM.sh' > Makefile.am;
Makefile.am
+2 -1
View File
@@ -24,7 +24,7 @@ AM_LDFLAGS = @WX_LIBS@ $(BOOST_LDFLAGS)
gcc -x c - -c -o $@ <<<""
magicseteditor_LDADD = $(BOOST_REGEX_LIB)
magicseteditor_CXXFLAGS = -fpch-deps $(AM_CXXFLAGS)
magicseteditor_CXXFLAGS = $(AM_CXXFLAGS)
magicseteditor_SOURCES =
if GLIBCPP_BUILD_PCH
@@ -33,6 +33,7 @@ clean-local:
rm -f ./src/util/prec.gch
include ./src/util/$(DEPDIR)/prec.Pch
magicseteditor_SOURCES += ./src/util/prec.gch
magicseteditor_CXXFLAGS += -fpch-deps
endif
# The script used to generate is MakeAM.sh
Makefile.in
+2 -1
View File
@@ -42,6 +42,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
bin_PROGRAMS = magicseteditor$(EXEEXT)
@GLIBCPP_BUILD_PCH_TRUE@am__append_1 = ./src/util/prec.gch
@GLIBCPP_BUILD_PCH_TRUE@am__append_2 = -fpch-deps
subdir = .
DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(top_srcdir)/configure \
@@ -471,7 +472,7 @@ AUTOMAKE_OPTIONS = subdir-objects
AM_CXXFLAGS = @WX_CXXFLAGS@ $(BOOST_CXXFLAGS) -I. -Wall
AM_LDFLAGS = @WX_LIBS@ $(BOOST_LDFLAGS)
magicseteditor_LDADD = $(BOOST_REGEX_LIB)
magicseteditor_CXXFLAGS = -fpch-deps $(AM_CXXFLAGS)
magicseteditor_CXXFLAGS = $(AM_CXXFLAGS) $(am__append_2)
# The script used to generate is MakeAM.sh
magicseteditor_SOURCES = $(am__append_1) ./src/code_template.cpp \
configure
Vendored
-1
View File
@@ -4637,7 +4637,6 @@ fi
LDFLAGS="$LDFLAGS_SAVED"
fi
BOOST_REGEX_LIB="-Wl,-Bstatic $BOOST_REGEX_LIB -Wl,-Bdynamic"
# Check for wxWidgets
configure.ac
-1
View File
@@ -38,7 +38,6 @@ AC_CHECK_LIB([hunspell],[Hunspell_create])
# Check for Boost
AX_BOOST_BASE([1.37.0])
AX_BOOST_REGEX
BOOST_REGEX_LIB="-Wl,-Bstatic $BOOST_REGEX_LIB -Wl,-Bdynamic"
# Check for wxWidgets
AM_OPTIONS_WXCONFIG
src/gui/control/item_list.cpp
+1 -1
View File
@@ -154,7 +154,7 @@ void ItemList::refreshList(bool refresh_current_only) {
getItems(sorted_list);
// Sort the list
if (sort_by_column >= 0) {
sort(sorted_list.begin(), sorted_list.end(), ItemComparer(*this));
stable_sort(sorted_list.begin(), sorted_list.end(), ItemComparer(*this));
}
// Has the entire list changed?
if (refresh_current_only && sorted_list == old_sorted_list) {