Compatibility updates; Boost Regex is now statically linked, changed to <hunspell/hunspell.hxx>

MakeAM.sh

@@ -13,7 +13,9 @@ AUTOMAKE_OPTIONS = subdir-objects
 
 bin_PROGRAMS = magicseteditor
 AM_CXXFLAGS = @WX_CXXFLAGS@ \$(BOOST_CXXFLAGS) -DUNICODE -I . -Wall
-AM_LDFLAGS  = @WX_LIBS@ \$(BOOST_LDFLAGS) \$(BOOST_REGEX_LIB)
+AM_LDFLAGS  = @WX_LIBS@ \$(BOOST_LDFLAGS)
+
+magicseteditor_LDADD = \$(BOOST_REGEX_LIB)
 
 magicseteditor_SOURCES =
 

Makefile.in

@@ -205,7 +205,8 @@ am_magicseteditor_OBJECTS = ./src/util/version.$(OBJEXT) \
 	./src/cli/text_io_handler.$(OBJEXT) \
 	./src/code_template.$(OBJEXT)
 magicseteditor_OBJECTS = $(am_magicseteditor_OBJECTS)
-magicseteditor_LDADD = $(LDADD)
+am__DEPENDENCIES_1 =
+magicseteditor_DEPENDENCIES = $(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -334,7 +335,8 @@ top_srcdir = @top_srcdir@
 # This flag allows us to use subdirectories:
 AUTOMAKE_OPTIONS = subdir-objects
 AM_CXXFLAGS = @WX_CXXFLAGS@ $(BOOST_CXXFLAGS) -DUNICODE -I . -Wall
-AM_LDFLAGS = @WX_LIBS@ $(BOOST_LDFLAGS) $(BOOST_REGEX_LIB)
+AM_LDFLAGS = @WX_LIBS@ $(BOOST_LDFLAGS)
+magicseteditor_LDADD = $(BOOST_REGEX_LIB)
 
 # The script used to generate is MakeAM.sh
 magicseteditor_SOURCES = ./src/util/version.cpp \

configure.ac

@@ -18,10 +18,12 @@ AC_PROG_CXX
 # Do not pass -O2, because that causes failures for now.
 CXXFLAGS=-g
 # Checks for libraries.
+AC_CHECK_LIB([hunspell],[Hunspell_create])
 
 # Check for Boost
-AX_BOOST_BASE([1.36.0])
+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/script/profiler.hpp

@@ -13,7 +13,9 @@
 #include <script/script.hpp>
 #include <script/context.hpp>
 
+#ifndef USE_SCRIPT_PROFILING
 #define USE_SCRIPT_PROFILING 1
+#endif
 
 #if USE_SCRIPT_PROFILING
 
@@ -34,6 +36,10 @@ DECLARE_POINTER_TYPE(FunctionProfile);
 		QueryPerformanceFrequency(&i);
 		return i.QuadPart;
 	}
+
+	inline const char * mangled_name(const type_info& t) {
+		return t.raw_name();
+	}
 #else
 	// clock() has nanosecond resolution on Linux
 	// on any other platform, stil the best way.
@@ -45,6 +51,10 @@ DECLARE_POINTER_TYPE(FunctionProfile);
 	inline ProfileTime timer_resolution() {
 		return CLOCKS_PER_SEC;
 	}
+
+	inline const char * mangled_name(const type_info& t) {
+		return t.name();
+	}
 #endif
 
 /// Simple execution timer

src/script/to_value.hpp

@@ -282,7 +282,7 @@ class ScriptObject : public ScriptValue {
 	virtual ScriptValueP getMember(const String& name) const {
 		#if USE_SCRIPT_PROFILING
 			Timer t;
-			Profiler prof(t, (void*)typeid(T).raw_name(), _("get member of ") + type_name(*value));
+			Profiler prof(t, (void*)mangled_name(typeid(T)), _("get member of ") + type_name(*value));
 		#endif
 		GetMember gm(name);
 		gm.handle(*value);

src/util/spell_checker.hpp

@@ -10,7 +10,7 @@
 // ----------------------------------------------------------------------------- : Includes
 
 #include <util/prec.hpp>
-#include "hunspell.hxx"
+#include "hunspell/hunspell.hxx"
 
 DECLARE_POINTER_TYPE(SpellChecker);