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

Exclude win32 wrapper.

Browse Source
This commit is contained in:
Lymia Aluysia
2017-01-18 06:57:12 -06:00
parent 1c639de511
commit 116b7e9265
5 changed files with 16 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MakeAM.sh
+1 -1
View File
@@ -39,5 +39,5 @@ endif
# The script used to generate is MakeAM.sh' > Makefile.am;
find . -name *.cpp | sed "s/\./magicseteditor_SOURCES += ./" >> Makefile.am;
find . -name *.cpp | grep -v "win32_cli_wrapper\.cpp$" | sed "s/\./magicseteditor_SOURCES += ./" >> Makefile.am;
Makefile.am
-1
View File
@@ -39,7 +39,6 @@ endif
# The script used to generate is MakeAM.sh
magicseteditor_SOURCES += ./src/cli/cli_main.cpp
magicseteditor_SOURCES += ./src/cli/text_io_handler.cpp
magicseteditor_SOURCES += ./src/cli/win32_cli_wrapper.cpp
magicseteditor_SOURCES += ./src/data/action/keyword.cpp
magicseteditor_SOURCES += ./src/data/action/set.cpp
magicseteditor_SOURCES += ./src/data/action/symbol.cpp
Makefile.in
+11 -30
View File
@@ -117,12 +117,11 @@ am__installdirs = "$(DESTDIR)$(bindir)"
PROGRAMS = $(bin_PROGRAMS)
am__magicseteditor_SOURCES_DIST = ./src/util/prec.gch \
./src/cli/cli_main.cpp ./src/cli/text_io_handler.cpp \
./src/cli/win32_cli_wrapper.cpp ./src/data/action/keyword.cpp \
./src/data/action/set.cpp ./src/data/action/symbol.cpp \
./src/data/action/symbol_part.cpp ./src/data/action/value.cpp \
./src/data/field/boolean.cpp ./src/data/field/choice.cpp \
./src/data/field/color.cpp ./src/data/field/image.cpp \
./src/data/field/information.cpp \
./src/data/action/keyword.cpp ./src/data/action/set.cpp \
./src/data/action/symbol.cpp ./src/data/action/symbol_part.cpp \
./src/data/action/value.cpp ./src/data/field/boolean.cpp \
./src/data/field/choice.cpp ./src/data/field/color.cpp \
./src/data/field/image.cpp ./src/data/field/information.cpp \
./src/data/field/multiple_choice.cpp \
./src/data/field/package_choice.cpp \
./src/data/field/symbol.cpp ./src/data/field/text.cpp \
@@ -225,7 +224,6 @@ am__dirstamp = $(am__leading_dot)dirstamp
am_magicseteditor_OBJECTS = $(am__objects_1) \
./src/cli/magicseteditor-cli_main.$(OBJEXT) \
./src/cli/magicseteditor-text_io_handler.$(OBJEXT) \
./src/cli/magicseteditor-win32_cli_wrapper.$(OBJEXT) \
./src/data/action/magicseteditor-keyword.$(OBJEXT) \
./src/data/action/magicseteditor-set.$(OBJEXT) \
./src/data/action/magicseteditor-symbol.$(OBJEXT) \
@@ -608,12 +606,12 @@ magicseteditor_CXXFLAGS = $(AM_CXXFLAGS) $(am__append_2)
# The script used to generate is MakeAM.sh
magicseteditor_SOURCES = $(am__append_1) ./src/cli/cli_main.cpp \
./src/cli/text_io_handler.cpp ./src/cli/win32_cli_wrapper.cpp \
./src/data/action/keyword.cpp ./src/data/action/set.cpp \
./src/data/action/symbol.cpp ./src/data/action/symbol_part.cpp \
./src/data/action/value.cpp ./src/data/field/boolean.cpp \
./src/data/field/choice.cpp ./src/data/field/color.cpp \
./src/data/field/image.cpp ./src/data/field/information.cpp \
./src/cli/text_io_handler.cpp ./src/data/action/keyword.cpp \
./src/data/action/set.cpp ./src/data/action/symbol.cpp \
./src/data/action/symbol_part.cpp ./src/data/action/value.cpp \
./src/data/field/boolean.cpp ./src/data/field/choice.cpp \
./src/data/field/color.cpp ./src/data/field/image.cpp \
./src/data/field/information.cpp \
./src/data/field/multiple_choice.cpp \
./src/data/field/package_choice.cpp \
./src/data/field/symbol.cpp ./src/data/field/text.cpp \
@@ -823,8 +821,6 @@ src/cli/$(DEPDIR)/$(am__dirstamp):
src/cli/$(DEPDIR)/$(am__dirstamp)
./src/cli/magicseteditor-text_io_handler.$(OBJEXT): \
src/cli/$(am__dirstamp) src/cli/$(DEPDIR)/$(am__dirstamp)
./src/cli/magicseteditor-win32_cli_wrapper.$(OBJEXT): \
src/cli/$(am__dirstamp) src/cli/$(DEPDIR)/$(am__dirstamp)
src/data/action/$(am__dirstamp):
@$(MKDIR_P) ./src/data/action
@: > src/data/action/$(am__dirstamp)
@@ -1418,7 +1414,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./src/$(DEPDIR)/magicseteditor-main.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./src/cli/$(DEPDIR)/magicseteditor-cli_main.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./src/cli/$(DEPDIR)/magicseteditor-text_io_handler.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./src/cli/$(DEPDIR)/magicseteditor-win32_cli_wrapper.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./src/data/$(DEPDIR)/magicseteditor-add_cards_script.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./src/data/$(DEPDIR)/magicseteditor-card.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./src/data/$(DEPDIR)/magicseteditor-export_template.Po@am__quote@
@@ -1630,20 +1625,6 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(magicseteditor_CXXFLAGS) $(CXXFLAGS) -c -o ./src/cli/magicseteditor-text_io_handler.obj `if test -f './src/cli/text_io_handler.cpp'; then $(CYGPATH_W) './src/cli/text_io_handler.cpp'; else $(CYGPATH_W) '$(srcdir)/./src/cli/text_io_handler.cpp'; fi`
./src/cli/magicseteditor-win32_cli_wrapper.o: ./src/cli/win32_cli_wrapper.cpp
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(magicseteditor_CXXFLAGS) $(CXXFLAGS) -MT ./src/cli/magicseteditor-win32_cli_wrapper.o -MD -MP -MF ./src/cli/$(DEPDIR)/magicseteditor-win32_cli_wrapper.Tpo -c -o ./src/cli/magicseteditor-win32_cli_wrapper.o `test -f './src/cli/win32_cli_wrapper.cpp' || echo '$(srcdir)/'`./src/cli/win32_cli_wrapper.cpp
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ./src/cli/$(DEPDIR)/magicseteditor-win32_cli_wrapper.Tpo ./src/cli/$(DEPDIR)/magicseteditor-win32_cli_wrapper.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='./src/cli/win32_cli_wrapper.cpp' object='./src/cli/magicseteditor-win32_cli_wrapper.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(magicseteditor_CXXFLAGS) $(CXXFLAGS) -c -o ./src/cli/magicseteditor-win32_cli_wrapper.o `test -f './src/cli/win32_cli_wrapper.cpp' || echo '$(srcdir)/'`./src/cli/win32_cli_wrapper.cpp
./src/cli/magicseteditor-win32_cli_wrapper.obj: ./src/cli/win32_cli_wrapper.cpp
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(magicseteditor_CXXFLAGS) $(CXXFLAGS) -MT ./src/cli/magicseteditor-win32_cli_wrapper.obj -MD -MP -MF ./src/cli/$(DEPDIR)/magicseteditor-win32_cli_wrapper.Tpo -c -o ./src/cli/magicseteditor-win32_cli_wrapper.obj `if test -f './src/cli/win32_cli_wrapper.cpp'; then $(CYGPATH_W) './src/cli/win32_cli_wrapper.cpp'; else $(CYGPATH_W) '$(srcdir)/./src/cli/win32_cli_wrapper.cpp'; fi`
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ./src/cli/$(DEPDIR)/magicseteditor-win32_cli_wrapper.Tpo ./src/cli/$(DEPDIR)/magicseteditor-win32_cli_wrapper.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='./src/cli/win32_cli_wrapper.cpp' object='./src/cli/magicseteditor-win32_cli_wrapper.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(magicseteditor_CXXFLAGS) $(CXXFLAGS) -c -o ./src/cli/magicseteditor-win32_cli_wrapper.obj `if test -f './src/cli/win32_cli_wrapper.cpp'; then $(CYGPATH_W) './src/cli/win32_cli_wrapper.cpp'; else $(CYGPATH_W) '$(srcdir)/./src/cli/win32_cli_wrapper.cpp'; fi`
./src/data/action/magicseteditor-keyword.o: ./src/data/action/keyword.cpp
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(magicseteditor_CXXFLAGS) $(CXXFLAGS) -MT ./src/data/action/magicseteditor-keyword.o -MD -MP -MF ./src/data/action/$(DEPDIR)/magicseteditor-keyword.Tpo -c -o ./src/data/action/magicseteditor-keyword.o `test -f './src/data/action/keyword.cpp' || echo '$(srcdir)/'`./src/data/action/keyword.cpp
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) ./src/data/action/$(DEPDIR)/magicseteditor-keyword.Tpo ./src/data/action/$(DEPDIR)/magicseteditor-keyword.Po
configure
Vendored
+2 -7
View File
@@ -3044,9 +3044,6 @@ fi
# Checks for programs.
if test -n "${CXXFLAGS}"; then
user_set_cxxflags=yes
fi
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3757,11 +3754,9 @@ else
DEFAULT_CXXFLAGS="-O2"
WXCONFIG_FLAGS=""
fi
DEFAULT_CXXFLAGS="$DEFAULT_CXXFLAGS -std=gnu++98"
if test X$user_set_cxxflags != Xyes; then
CXXFLAGS=${DEFAULT_CXXFLAGS}
fi
CXXFLAGS="${CXXFLAGS} ${DEFAULT_CXXFLAGS} -std=gnu++98"
LDFLAGS="${LDFLAGS}"
# Checks for libraries.
ac_ext=c
configure.ac
+2 -7
View File
@@ -16,9 +16,6 @@ AC_CONFIG_HEADER([src/config.h])
AM_INIT_AUTOMAKE([foreign])
# Checks for programs.
if test -n "${CXXFLAGS}"; then
user_set_cxxflags=yes
fi
AC_PROG_CXX
AC_ARG_ENABLE(debug, [--enable-debug Enable debug build (requires debug
versions of wxWidgets and libstdc++.])
@@ -29,11 +26,9 @@ else
DEFAULT_CXXFLAGS="-O2"
WXCONFIG_FLAGS=""
fi
DEFAULT_CXXFLAGS="$DEFAULT_CXXFLAGS -std=gnu++98"
if test X$user_set_cxxflags != Xyes; then
CXXFLAGS=${DEFAULT_CXXFLAGS}
fi
CXXFLAGS="${CXXFLAGS} ${DEFAULT_CXXFLAGS} -std=gnu++98"
LDFLAGS="${LDFLAGS}"
# Checks for libraries.
AC_CHECK_LIB([hunspell],[Hunspell_create])