Makefile modifications for Linux; bug changes to follow

Makefile.am

-
-#+----------------------------------------------------------------------------+
-#| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
-#| Copyright:    (C) 2001 - 2008 Twan van Laarhoven and "coppro"            |
-#| License:      GNU General Public License 2 or later (see file COPYING)     |
-#+----------------------------------------------------------------------------+
-
-# This file is generated by MakeAM.sh. DO NOT EDIT!
-
-# This flag allows us to use subdirectories:
-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)
-
-magicseteditor_SOURCES = 
-
-# The script used to generate is MakeAM.sh 
-magicseteditor_SOURCES += ./src/util/version.cpp
-magicseteditor_SOURCES += ./src/util/alignment.cpp
-magicseteditor_SOURCES += ./src/util/rotation.cpp
-magicseteditor_SOURCES += ./src/util/tagged_string.cpp
-magicseteditor_SOURCES += ./src/util/regex.cpp
-magicseteditor_SOURCES += ./src/util/spec_sort.cpp
-magicseteditor_SOURCES += ./src/util/io/get_member.cpp
-magicseteditor_SOURCES += ./src/util/io/package_manager.cpp
-magicseteditor_SOURCES += ./src/util/io/writer.cpp
-magicseteditor_SOURCES += ./src/util/io/reader.cpp
-magicseteditor_SOURCES += ./src/util/io/package.cpp
-magicseteditor_SOURCES += ./src/util/action_stack.cpp
-magicseteditor_SOURCES += ./src/util/error.cpp
-magicseteditor_SOURCES += ./src/util/age.cpp
-magicseteditor_SOURCES += ./src/util/file_utils.cpp
-magicseteditor_SOURCES += ./src/util/string.cpp
-magicseteditor_SOURCES += ./src/gfx/color.cpp
-magicseteditor_SOURCES += ./src/gfx/mask_image.cpp
-magicseteditor_SOURCES += ./src/gfx/rotate_image.cpp
-magicseteditor_SOURCES += ./src/gfx/image_effects.cpp
-magicseteditor_SOURCES += ./src/gfx/resample_text.cpp
-magicseteditor_SOURCES += ./src/gfx/combine_image.cpp
-magicseteditor_SOURCES += ./src/gfx/polynomial.cpp
-magicseteditor_SOURCES += ./src/gfx/bezier.cpp
-magicseteditor_SOURCES += ./src/gfx/generated_image.cpp
-magicseteditor_SOURCES += ./src/gfx/resample_image.cpp
-magicseteditor_SOURCES += ./src/gfx/blend_image.cpp
-magicseteditor_SOURCES += ./src/main.cpp
-magicseteditor_SOURCES += ./src/render/card/viewer.cpp
-magicseteditor_SOURCES += ./src/render/text/compound.cpp
-magicseteditor_SOURCES += ./src/render/text/symbol.cpp
-magicseteditor_SOURCES += ./src/render/text/font.cpp
-magicseteditor_SOURCES += ./src/render/text/viewer.cpp
-magicseteditor_SOURCES += ./src/render/text/element.cpp
-magicseteditor_SOURCES += ./src/render/symbol/filter.cpp
-magicseteditor_SOURCES += ./src/render/symbol/viewer.cpp
-magicseteditor_SOURCES += ./src/render/value/multiple_choice.cpp
-magicseteditor_SOURCES += ./src/render/value/symbol.cpp
-magicseteditor_SOURCES += ./src/render/value/color.cpp
-magicseteditor_SOURCES += ./src/render/value/package_choice.cpp
-magicseteditor_SOURCES += ./src/render/value/viewer.cpp
-magicseteditor_SOURCES += ./src/render/value/text.cpp
-magicseteditor_SOURCES += ./src/render/value/information.cpp
-magicseteditor_SOURCES += ./src/render/value/choice.cpp
-magicseteditor_SOURCES += ./src/render/value/image.cpp
-magicseteditor_SOURCES += ./src/script/scriptable.cpp
-magicseteditor_SOURCES += ./src/script/profiler.cpp
-magicseteditor_SOURCES += ./src/script/script_manager.cpp
-magicseteditor_SOURCES += ./src/script/functions/english.cpp
-magicseteditor_SOURCES += ./src/script/functions/basic.cpp
-magicseteditor_SOURCES += ./src/script/functions/construction.cpp
-magicseteditor_SOURCES += ./src/script/functions/regex.cpp
-magicseteditor_SOURCES += ./src/script/functions/editor.cpp
-magicseteditor_SOURCES += ./src/script/functions/image.cpp
-magicseteditor_SOURCES += ./src/script/functions/export.cpp
-magicseteditor_SOURCES += ./src/script/context.cpp
-magicseteditor_SOURCES += ./src/script/dependency.cpp
-magicseteditor_SOURCES += ./src/script/value.cpp
-magicseteditor_SOURCES += ./src/script/script.cpp
-magicseteditor_SOURCES += ./src/script/parser.cpp
-magicseteditor_SOURCES += ./src/script/image.cpp
-magicseteditor_SOURCES += ./src/data/statistics.cpp
-magicseteditor_SOURCES += ./src/data/add_cards_script.cpp
-magicseteditor_SOURCES += ./src/data/locale.cpp
-magicseteditor_SOURCES += ./src/data/card.cpp
-magicseteditor_SOURCES += ./src/data/symbol.cpp
-magicseteditor_SOURCES += ./src/data/game.cpp
-magicseteditor_SOURCES += ./src/data/font.cpp
-magicseteditor_SOURCES += ./src/data/symbol_font.cpp
-magicseteditor_SOURCES += ./src/data/stylesheet.cpp
-magicseteditor_SOURCES += ./src/data/format/html.cpp
-magicseteditor_SOURCES += ./src/data/format/mse1.cpp
-magicseteditor_SOURCES += ./src/data/format/mse2.cpp
-magicseteditor_SOURCES += ./src/data/format/apprentice.cpp
-magicseteditor_SOURCES += ./src/data/format/clipboard.cpp
-magicseteditor_SOURCES += ./src/data/format/image_to_symbol.cpp
-magicseteditor_SOURCES += ./src/data/format/mws.cpp
-magicseteditor_SOURCES += ./src/data/format/image.cpp
-magicseteditor_SOURCES += ./src/data/format/mtg_editor.cpp
-magicseteditor_SOURCES += ./src/data/format/formats.cpp
-magicseteditor_SOURCES += ./src/data/settings.cpp
-magicseteditor_SOURCES += ./src/data/keyword.cpp
-magicseteditor_SOURCES += ./src/data/export_template.cpp
-magicseteditor_SOURCES += ./src/data/field.cpp
-magicseteditor_SOURCES += ./src/data/word_list.cpp
-magicseteditor_SOURCES += ./src/data/field/multiple_choice.cpp
-magicseteditor_SOURCES += ./src/data/field/symbol.cpp
-magicseteditor_SOURCES += ./src/data/field/color.cpp
-magicseteditor_SOURCES += ./src/data/field/package_choice.cpp
-magicseteditor_SOURCES += ./src/data/field/boolean.cpp
-magicseteditor_SOURCES += ./src/data/field/text.cpp
-magicseteditor_SOURCES += ./src/data/field/information.cpp
-magicseteditor_SOURCES += ./src/data/field/choice.cpp
-magicseteditor_SOURCES += ./src/data/field/image.cpp
-magicseteditor_SOURCES += ./src/data/installer.cpp
-magicseteditor_SOURCES += ./src/data/set.cpp
-magicseteditor_SOURCES += ./src/data/action/symbol_part.cpp
-magicseteditor_SOURCES += ./src/data/action/symbol.cpp
-magicseteditor_SOURCES += ./src/data/action/keyword.cpp
-magicseteditor_SOURCES += ./src/data/action/value.cpp
-magicseteditor_SOURCES += ./src/data/action/set.cpp
-magicseteditor_SOURCES += ./src/data/pack.cpp
-magicseteditor_SOURCES += ./src/gui/new_window.cpp
-magicseteditor_SOURCES += ./src/gui/update_checker.cpp
-magicseteditor_SOURCES += ./src/gui/icon_menu.cpp
-magicseteditor_SOURCES += ./src/gui/util.cpp
-magicseteditor_SOURCES += ./src/gui/image_slice_window.cpp
-magicseteditor_SOURCES += ./src/gui/preferences_window.cpp
-magicseteditor_SOURCES += ./src/gui/card_select_window.cpp
-magicseteditor_SOURCES += ./src/gui/symbol/control.cpp
-magicseteditor_SOURCES += ./src/gui/symbol/point_editor.cpp
-magicseteditor_SOURCES += ./src/gui/symbol/symmetry_editor.cpp
-magicseteditor_SOURCES += ./src/gui/symbol/select_editor.cpp
-magicseteditor_SOURCES += ./src/gui/symbol/basic_shape_editor.cpp
-magicseteditor_SOURCES += ./src/gui/symbol/editor.cpp
-magicseteditor_SOURCES += ./src/gui/symbol/window.cpp
-magicseteditor_SOURCES += ./src/gui/symbol/part_list.cpp
-magicseteditor_SOURCES += ./src/gui/symbol/selection.cpp
-magicseteditor_SOURCES += ./src/gui/set/cards_panel.cpp
-magicseteditor_SOURCES += ./src/gui/set/style_panel.cpp
-magicseteditor_SOURCES += ./src/gui/set/set_info_panel.cpp
-magicseteditor_SOURCES += ./src/gui/set/keywords_panel.cpp
-magicseteditor_SOURCES += ./src/gui/set/panel.cpp
-magicseteditor_SOURCES += ./src/gui/set/stats_panel.cpp
-magicseteditor_SOURCES += ./src/gui/set/random_pack_panel.cpp
-magicseteditor_SOURCES += ./src/gui/set/window.cpp
-magicseteditor_SOURCES += ./src/gui/thumbnail_thread.cpp
-magicseteditor_SOURCES += ./src/gui/welcome_window.cpp
-magicseteditor_SOURCES += ./src/gui/value/multiple_choice.cpp
-magicseteditor_SOURCES += ./src/gui/value/symbol.cpp
-magicseteditor_SOURCES += ./src/gui/value/color.cpp
-magicseteditor_SOURCES += ./src/gui/value/package_choice.cpp
-magicseteditor_SOURCES += ./src/gui/value/editor.cpp
-magicseteditor_SOURCES += ./src/gui/value/text.cpp
-magicseteditor_SOURCES += ./src/gui/value/information.cpp
-magicseteditor_SOURCES += ./src/gui/value/choice.cpp
-magicseteditor_SOURCES += ./src/gui/value/image.cpp
-magicseteditor_SOURCES += ./src/gui/images_export_window.cpp
-magicseteditor_SOURCES += ./src/gui/print_window.cpp
-magicseteditor_SOURCES += ./src/gui/control/card_editor.cpp
-magicseteditor_SOURCES += ./src/gui/control/package_list.cpp
-magicseteditor_SOURCES += ./src/gui/control/native_look_editor.cpp
-magicseteditor_SOURCES += ./src/gui/control/keyword_list.cpp
-magicseteditor_SOURCES += ./src/gui/control/graph.cpp
-magicseteditor_SOURCES += ./src/gui/control/card_list.cpp
-magicseteditor_SOURCES += ./src/gui/control/gallery_list.cpp
-magicseteditor_SOURCES += ./src/gui/control/item_list.cpp
-magicseteditor_SOURCES += ./src/gui/control/filtered_card_list.cpp
-magicseteditor_SOURCES += ./src/gui/control/image_card_list.cpp
-magicseteditor_SOURCES += ./src/gui/control/card_viewer.cpp
-magicseteditor_SOURCES += ./src/gui/control/tree_list.cpp
-magicseteditor_SOURCES += ./src/gui/control/text_ctrl.cpp
-magicseteditor_SOURCES += ./src/gui/control/card_list_column_select.cpp
-magicseteditor_SOURCES += ./src/gui/control/select_card_list.cpp
-magicseteditor_SOURCES += ./src/gui/package_update_list.cpp
-magicseteditor_SOURCES += ./src/gui/about_window.cpp
-magicseteditor_SOURCES += ./src/gui/drop_down_list.cpp
-magicseteditor_SOURCES += ./src/gui/auto_replace_window.cpp
-magicseteditor_SOURCES += ./src/gui/packages_window.cpp
-magicseteditor_SOURCES += ./src/gui/html_export_window.cpp
-magicseteditor_SOURCES += ./src/cli/win32_cli_wrapper.cpp
-magicseteditor_SOURCES += ./src/cli/cli_main.cpp
-magicseteditor_SOURCES += ./src/cli/text_io_handler.cpp
-magicseteditor_SOURCES += ./src/code_template.cpp

Makefile.in

@@ -59,7 +59,8 @@ PROGRAMS = $(bin_PROGRAMS)
 am__dirstamp = $(am__leading_dot)dirstamp
 am_magicseteditor_OBJECTS = ./src/util/version.$(OBJEXT) \
 	./src/util/alignment.$(OBJEXT) ./src/util/rotation.$(OBJEXT) \
-	./src/util/tagged_string.$(OBJEXT) ./src/util/regex.$(OBJEXT) \
+	./src/util/tagged_string.$(OBJEXT) \
+	./src/util/spell_checker.$(OBJEXT) ./src/util/regex.$(OBJEXT) \
 	./src/util/spec_sort.$(OBJEXT) \
 	./src/util/io/get_member.$(OBJEXT) \
 	./src/util/io/package_manager.$(OBJEXT) \
@@ -97,6 +98,7 @@ am_magicseteditor_OBJECTS = ./src/util/version.$(OBJEXT) \
 	./src/script/scriptable.$(OBJEXT) \
 	./src/script/profiler.$(OBJEXT) \
 	./src/script/script_manager.$(OBJEXT) \
+	./src/script/functions/spelling.$(OBJEXT) \
 	./src/script/functions/english.$(OBJEXT) \
 	./src/script/functions/basic.$(OBJEXT) \
 	./src/script/functions/construction.$(OBJEXT) \
@@ -337,23 +339,23 @@ AM_LDFLAGS = @WX_LIBS@ $(BOOST_LDFLAGS) $(BOOST_REGEX_LIB)
 # The script used to generate is MakeAM.sh 
 magicseteditor_SOURCES = ./src/util/version.cpp \
 	./src/util/alignment.cpp ./src/util/rotation.cpp \
-	./src/util/tagged_string.cpp ./src/util/regex.cpp \
-	./src/util/spec_sort.cpp ./src/util/io/get_member.cpp \
-	./src/util/io/package_manager.cpp ./src/util/io/writer.cpp \
-	./src/util/io/reader.cpp ./src/util/io/package.cpp \
-	./src/util/action_stack.cpp ./src/util/error.cpp \
-	./src/util/age.cpp ./src/util/file_utils.cpp \
-	./src/util/string.cpp ./src/gfx/color.cpp \
-	./src/gfx/mask_image.cpp ./src/gfx/rotate_image.cpp \
-	./src/gfx/image_effects.cpp ./src/gfx/resample_text.cpp \
-	./src/gfx/combine_image.cpp ./src/gfx/polynomial.cpp \
-	./src/gfx/bezier.cpp ./src/gfx/generated_image.cpp \
-	./src/gfx/resample_image.cpp ./src/gfx/blend_image.cpp \
-	./src/main.cpp ./src/render/card/viewer.cpp \
-	./src/render/text/compound.cpp ./src/render/text/symbol.cpp \
-	./src/render/text/font.cpp ./src/render/text/viewer.cpp \
-	./src/render/text/element.cpp ./src/render/symbol/filter.cpp \
-	./src/render/symbol/viewer.cpp \
+	./src/util/tagged_string.cpp ./src/util/spell_checker.cpp \
+	./src/util/regex.cpp ./src/util/spec_sort.cpp \
+	./src/util/io/get_member.cpp ./src/util/io/package_manager.cpp \
+	./src/util/io/writer.cpp ./src/util/io/reader.cpp \
+	./src/util/io/package.cpp ./src/util/action_stack.cpp \
+	./src/util/error.cpp ./src/util/age.cpp \
+	./src/util/file_utils.cpp ./src/util/string.cpp \
+	./src/gfx/color.cpp ./src/gfx/mask_image.cpp \
+	./src/gfx/rotate_image.cpp ./src/gfx/image_effects.cpp \
+	./src/gfx/resample_text.cpp ./src/gfx/combine_image.cpp \
+	./src/gfx/polynomial.cpp ./src/gfx/bezier.cpp \
+	./src/gfx/generated_image.cpp ./src/gfx/resample_image.cpp \
+	./src/gfx/blend_image.cpp ./src/main.cpp \
+	./src/render/card/viewer.cpp ./src/render/text/compound.cpp \
+	./src/render/text/symbol.cpp ./src/render/text/font.cpp \
+	./src/render/text/viewer.cpp ./src/render/text/element.cpp \
+	./src/render/symbol/filter.cpp ./src/render/symbol/viewer.cpp \
 	./src/render/value/multiple_choice.cpp \
 	./src/render/value/symbol.cpp ./src/render/value/color.cpp \
 	./src/render/value/package_choice.cpp \
@@ -362,6 +364,7 @@ magicseteditor_SOURCES = ./src/util/version.cpp \
 	./src/render/value/choice.cpp ./src/render/value/image.cpp \
 	./src/script/scriptable.cpp ./src/script/profiler.cpp \
 	./src/script/script_manager.cpp \
+	./src/script/functions/spelling.cpp \
 	./src/script/functions/english.cpp \
 	./src/script/functions/basic.cpp \
 	./src/script/functions/construction.cpp \
@@ -525,6 +528,8 @@ src/util/$(DEPDIR)/$(am__dirstamp):
 	src/util/$(DEPDIR)/$(am__dirstamp)
 ./src/util/tagged_string.$(OBJEXT): src/util/$(am__dirstamp) \
 	src/util/$(DEPDIR)/$(am__dirstamp)
+./src/util/spell_checker.$(OBJEXT): src/util/$(am__dirstamp) \
+	src/util/$(DEPDIR)/$(am__dirstamp)
 ./src/util/regex.$(OBJEXT): src/util/$(am__dirstamp) \
 	src/util/$(DEPDIR)/$(am__dirstamp)
 ./src/util/spec_sort.$(OBJEXT): src/util/$(am__dirstamp) \
@@ -672,6 +677,9 @@ src/script/functions/$(am__dirstamp):
 src/script/functions/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) ./src/script/functions/$(DEPDIR)
 	@: > src/script/functions/$(DEPDIR)/$(am__dirstamp)
+./src/script/functions/spelling.$(OBJEXT):  \
+	src/script/functions/$(am__dirstamp) \
+	src/script/functions/$(DEPDIR)/$(am__dirstamp)
 ./src/script/functions/english.$(OBJEXT):  \
 	src/script/functions/$(am__dirstamp) \
 	src/script/functions/$(DEPDIR)/$(am__dirstamp)
@@ -1147,6 +1155,7 @@ mostlyclean-compile:
 	-rm -f ./src/script/functions/export.$(OBJEXT)
 	-rm -f ./src/script/functions/image.$(OBJEXT)
 	-rm -f ./src/script/functions/regex.$(OBJEXT)
+	-rm -f ./src/script/functions/spelling.$(OBJEXT)
 	-rm -f ./src/script/image.$(OBJEXT)
 	-rm -f ./src/script/parser.$(OBJEXT)
 	-rm -f ./src/script/profiler.$(OBJEXT)
@@ -1167,6 +1176,7 @@ mostlyclean-compile:
 	-rm -f ./src/util/regex.$(OBJEXT)
 	-rm -f ./src/util/rotation.$(OBJEXT)
 	-rm -f ./src/util/spec_sort.$(OBJEXT)
+	-rm -f ./src/util/spell_checker.$(OBJEXT)
 	-rm -f ./src/util/string.$(OBJEXT)
 	-rm -f ./src/util/tagged_string.$(OBJEXT)
 	-rm -f ./src/util/version.$(OBJEXT)
@@ -1322,6 +1332,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./src/script/functions/$(DEPDIR)/export.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./src/script/functions/$(DEPDIR)/image.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./src/script/functions/$(DEPDIR)/regex.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./src/script/functions/$(DEPDIR)/spelling.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./src/util/$(DEPDIR)/action_stack.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./src/util/$(DEPDIR)/age.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./src/util/$(DEPDIR)/alignment.Po@am__quote@
@@ -1330,6 +1341,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./src/util/$(DEPDIR)/regex.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./src/util/$(DEPDIR)/rotation.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./src/util/$(DEPDIR)/spec_sort.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./src/util/$(DEPDIR)/spell_checker.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./src/util/$(DEPDIR)/string.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./src/util/$(DEPDIR)/tagged_string.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./src/util/$(DEPDIR)/version.Po@am__quote@