From 42a547831360acc93bb2dc5950e15f59f9381dc1 Mon Sep 17 00:00:00 2001
From: Lymia Aluysia <lymia@lymiahugs.com>
Date: Wed, 18 Jan 2017 07:01:28 -0600
Subject: [PATCH] Set BOOST_USE_WINDOWS_H in configure.ac and suppress
 wxWidgets header warnings.

---
 MakeAM.sh    | 2 +-
 Makefile.am  | 2 +-
 Makefile.in  | 2 +-
 configure    | 2 +-
 configure.ac | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/MakeAM.sh b/MakeAM.sh
index e7a62fcb..95e81eeb 100755
--- a/MakeAM.sh
+++ b/MakeAM.sh
@@ -12,7 +12,7 @@ echo '
 AUTOMAKE_OPTIONS = subdir-objects
 
 bin_PROGRAMS = magicseteditor
-AM_CXXFLAGS = @WX_CXXFLAGS@ $(BOOST_CXXFLAGS) -I. -Wall
+AM_CXXFLAGS = @WX_CXXFLAGS@ $(BOOST_CXXFLAGS) -I. -Wall -Wno-unused-local-typedefs
 AM_LDFLAGS  = $(BOOST_LDFLAGS)
 
 .hpp.gch:
diff --git a/Makefile.am b/Makefile.am
index 952e4ddf..41335dab 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,7 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
 bin_PROGRAMS = magicseteditor
-AM_CXXFLAGS = @WX_CXXFLAGS@ $(BOOST_CXXFLAGS) -I. -Wall
+AM_CXXFLAGS = @WX_CXXFLAGS@ $(BOOST_CXXFLAGS) -I. -Wall -Wno-unused-local-typedefs
 AM_LDFLAGS  = $(BOOST_LDFLAGS)
 
 .hpp.gch:
diff --git a/Makefile.in b/Makefile.in
index 01ae8997..5ddc9b57 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -599,7 +599,7 @@ top_srcdir = @top_srcdir@
 
 # This flag allows us to use subdirectories:
 AUTOMAKE_OPTIONS = subdir-objects
-AM_CXXFLAGS = @WX_CXXFLAGS@ $(BOOST_CXXFLAGS) -I. -Wall
+AM_CXXFLAGS = @WX_CXXFLAGS@ $(BOOST_CXXFLAGS) -I. -Wall -Wno-unused-local-typedefs
 AM_LDFLAGS = $(BOOST_LDFLAGS)
 magicseteditor_LDADD = @WX_LIBS@ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB)
 magicseteditor_CXXFLAGS = $(AM_CXXFLAGS) $(am__append_2)
diff --git a/configure b/configure
index 65425cba..ffb595d0 100755
--- a/configure
+++ b/configure
@@ -3755,7 +3755,7 @@ else
   WXCONFIG_FLAGS=""
 fi
 
-CXXFLAGS="${CXXFLAGS} ${DEFAULT_CXXFLAGS} -std=gnu++98"
+CXXFLAGS="${CXXFLAGS} ${DEFAULT_CXXFLAGS} -std=gnu++98 -DBOOST_USE_WINDOWS_H"
 LDFLAGS="${LDFLAGS}"
 
 # Checks for libraries.
diff --git a/configure.ac b/configure.ac
index ebe6e953..48a6df33 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ else
   WXCONFIG_FLAGS=""
 fi
 
-CXXFLAGS="${CXXFLAGS} ${DEFAULT_CXXFLAGS} -std=gnu++98"
+CXXFLAGS="${CXXFLAGS} ${DEFAULT_CXXFLAGS} -std=gnu++98 -DBOOST_USE_WINDOWS_H"
 LDFLAGS="${LDFLAGS}"
 
 # Checks for libraries.