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

Set BOOST_USE_WINDOWS_H in configure.ac and suppress wxWidgets header warnings.

Browse Source
This commit is contained in:
Lymia Aluysia
2017-01-18 07:01:28 -06:00
parent 116b7e9265
commit 42a5478313
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MakeAM.sh
+1 -1
View File
@@ -12,7 +12,7 @@ echo '
AUTOMAKE_OPTIONS = subdir-objects AUTOMAKE_OPTIONS = subdir-objects
bin_PROGRAMS = magicseteditor 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) AM_LDFLAGS = $(BOOST_LDFLAGS)
.hpp.gch: .hpp.gch:
Makefile.am
+1 -1
View File
@@ -11,7 +11,7 @@
AUTOMAKE_OPTIONS = subdir-objects AUTOMAKE_OPTIONS = subdir-objects
bin_PROGRAMS = magicseteditor 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) AM_LDFLAGS = $(BOOST_LDFLAGS)
.hpp.gch: .hpp.gch:
Makefile.in
+1 -1
View File
@@ -599,7 +599,7 @@ top_srcdir = @top_srcdir@
# This flag allows us to use subdirectories: # This flag allows us to use subdirectories:
AUTOMAKE_OPTIONS = subdir-objects 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) AM_LDFLAGS = $(BOOST_LDFLAGS)
magicseteditor_LDADD = @WX_LIBS@ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) magicseteditor_LDADD = @WX_LIBS@ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB)
magicseteditor_CXXFLAGS = $(AM_CXXFLAGS) $(am__append_2) magicseteditor_CXXFLAGS = $(AM_CXXFLAGS) $(am__append_2)
configure
Vendored
+1 -1
View File
@@ -3755,7 +3755,7 @@ else
WXCONFIG_FLAGS="" WXCONFIG_FLAGS=""
fi fi
CXXFLAGS="${CXXFLAGS} ${DEFAULT_CXXFLAGS} -std=gnu++98" CXXFLAGS="${CXXFLAGS} ${DEFAULT_CXXFLAGS} -std=gnu++98 -DBOOST_USE_WINDOWS_H"
LDFLAGS="${LDFLAGS}" LDFLAGS="${LDFLAGS}"
# Checks for libraries. # Checks for libraries.
configure.ac
+1 -1
View File
@@ -27,7 +27,7 @@ else
WXCONFIG_FLAGS="" WXCONFIG_FLAGS=""
fi fi
CXXFLAGS="${CXXFLAGS} ${DEFAULT_CXXFLAGS} -std=gnu++98" CXXFLAGS="${CXXFLAGS} ${DEFAULT_CXXFLAGS} -std=gnu++98 -DBOOST_USE_WINDOWS_H"
LDFLAGS="${LDFLAGS}" LDFLAGS="${LDFLAGS}"
# Checks for libraries. # Checks for libraries.