Compiled Linux version. The welcome screen doesn't display the icon images, and the buttons don't work. Data is found at *prefix*/Magic Set Editor/data and the images at *prefix*/Magic Set Editor/resource. On Ubuntu, *prefix* is /usr/local/share. Resource files are all the image files from resource. I haven't configured them, because I haven't made it past the welcome screen.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@188 0fc631ac-6414-0410-93d0-97cfa31319b6

Makefile

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # Makefile.  Generated from Makefile.in by configure.
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20,8 +20,6 @@
 #| License:      GNU General Public License 2 or later (see file COPYING)     |
 #+----------------------------------------------------------------------------+
 
-SOURCES = $(magicseteditor_SOURCES)
-
 srcdir = .
 top_srcdir = .
 
@@ -44,10 +42,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 bin_PROGRAMS = magicseteditor$(EXEEXT)
 subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(top_srcdir)/configure \
-	$(top_srcdir)/src/config.h.in COPYING ChangeLog INSTALL TODO \
-	depcomp install-sh missing
+	$(top_srcdir)/src/config.h.in COPYING TODO depcomp install-sh \
+	missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -193,30 +191,31 @@ DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
-ACLOCAL = ${SHELL} /home/twanvl/mse/missing --run aclocal-1.9
+ACLOCAL = ${SHELL} /home/coppro/C++/MSE/trunk/missing --run aclocal-1.9
 AMDEP_FALSE = #
 AMDEP_TRUE = 
-AMTAR = ${SHELL} /home/twanvl/mse/missing --run tar
-AUTOCONF = ${SHELL} /home/twanvl/mse/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/twanvl/mse/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/twanvl/mse/missing --run automake-1.9
+AMTAR = ${SHELL} /home/coppro/C++/MSE/trunk/missing --run tar
+AUTOCONF = ${SHELL} /home/coppro/C++/MSE/trunk/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/coppro/C++/MSE/trunk/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/coppro/C++/MSE/trunk/missing --run automake-1.9
 AWK = mawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2
+CFLAGS = -g3 -O0
 CPP = gcc -E
 CPPFLAGS = 
 CXX = g++
 CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O2
+CXXFLAGS = -g3 -O0
 CYGPATH_W = echo
 DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
 ECHO_C = 
 ECHO_N = -n
 ECHO_T = 
-EGREP = grep -E
+EGREP = /bin/grep -E
 EXEEXT = 
+GREP = /bin/grep
 INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
@@ -225,7 +224,7 @@ LDFLAGS =
 LIBOBJS = 
 LIBS = 
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /home/twanvl/mse/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/coppro/C++/MSE/trunk/missing --run makeinfo
 OBJEXT = o
 PACKAGE = magicseteditor
 PACKAGE_BUGREPORT = twanvl@users.sourceforge.net
@@ -235,21 +234,20 @@ PACKAGE_TARNAME = magicseteditor
 PACKAGE_VERSION = 0.3.0
 PATH_SEPARATOR = :
 SET_MAKE = 
-SHELL = /bin/sh
+SHELL = /bin/bash
 STRIP = 
 VERSION = 0.3.0
-WX_CFLAGS = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA 
+WX_CFLAGS = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -DNO_GCC_PRAGMA 
 WX_CFLAGS_ONLY = 
 WX_CONFIG_PATH = /usr/bin/wx-config
-WX_CPPFLAGS = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA
-WX_CXXFLAGS = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA  
-WX_CXXFLAGS_ONLY = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA
+WX_CPPFLAGS = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -DNO_GCC_PRAGMA
+WX_CXXFLAGS = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -DNO_GCC_PRAGMA  
+WX_CXXFLAGS_ONLY = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -DNO_GCC_PRAGMA
 WX_LIBS = -pthread   -lwx_gtk2u_xrc-2.6 -lwx_gtk2u_qa-2.6 -lwx_gtk2u_html-2.6 -lwx_gtk2u_adv-2.6 -lwx_gtk2u_core-2.6 -lwx_baseu_xml-2.6 -lwx_baseu_net-2.6 -lwx_baseu-2.6 
-WX_LIBS_STATIC = 
-WX_VERSION = 2.6.1
+WX_LIBS_STATIC =  -pthread    /usr/lib/libwx_gtk-2.4.a -L/usr/lib -lgtk -lgdk -rdynamic -lgmodule -lgthread -lglib -lpthread -ldl -lXi -lXext -lX11 -lm -lpng -ljpeg -ltiff -lz -ldl -lm 
+WX_VERSION = 2.6.3
 ac_ct_CC = gcc
 ac_ct_CXX = g++
-ac_ct_STRIP = 
 am__fastdepCC_FALSE = #
 am__fastdepCC_TRUE = 
 am__fastdepCXX_FALSE = #
@@ -261,20 +259,27 @@ am__tar = ${AMTAR} chof - "$$tardir"
 am__untar = ${AMTAR} xf -
 bindir = ${exec_prefix}/bin
 build_alias = 
-datadir = ${prefix}/share
+datadir = ${datarootdir}
+datarootdir = ${prefix}/share
+docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
+dvidir = ${docdir}
 exec_prefix = ${prefix}
 host_alias = 
+htmldir = ${docdir}
 includedir = ${prefix}/include
-infodir = ${prefix}/info
-install_sh = /home/twanvl/mse/install-sh
+infodir = ${datarootdir}/info
+install_sh = /home/coppro/C++/MSE/trunk/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
+localedir = ${datarootdir}/locale
 localstatedir = ${prefix}/var
-mandir = ${prefix}/man
+mandir = ${datarootdir}/man
 mkdir_p = mkdir -p --
 oldincludedir = /usr/include
+pdfdir = ${docdir}
 prefix = /usr/local
 program_transform_name = s,x,x,
+psdir = ${docdir}
 sbindir = ${exec_prefix}/sbin
 sharedstatedir = ${prefix}/com
 sysconfdir = ${prefix}/etc
@@ -282,7 +287,7 @@ target_alias =
 
 # This flag allows us to use subdirectories:
 AUTOMAKE_OPTIONS = subdir-objects
-AM_CXXFLAGS = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA   -DUNICODE -I . -Wall
+AM_CXXFLAGS = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -DNO_GCC_PRAGMA   -DUNICODE -I . -Wall
 AM_LDFLAGS = -pthread   -lwx_gtk2u_xrc-2.6 -lwx_gtk2u_qa-2.6 -lwx_gtk2u_html-2.6 -lwx_gtk2u_adv-2.6 -lwx_gtk2u_core-2.6 -lwx_baseu_xml-2.6 -lwx_baseu_net-2.6 -lwx_baseu-2.6 
 
 # List of source files, generated using:
@@ -435,399 +440,389 @@ uninstall-binPROGRAMS:
 
 clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-./src/gfx/$(am__dirstamp):
+src/gfx/$(am__dirstamp):
 	@$(mkdir_p) ./src/gfx
-	@: > ./src/gfx/$(am__dirstamp)
-./src/gfx/$(DEPDIR)/$(am__dirstamp):
+	@: > src/gfx/$(am__dirstamp)
+src/gfx/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) ./src/gfx/$(DEPDIR)
-	@: > ./src/gfx/$(DEPDIR)/$(am__dirstamp)
-./src/gfx/color.$(OBJEXT): ./src/gfx/$(am__dirstamp) \
-	./src/gfx/$(DEPDIR)/$(am__dirstamp)
-./src/gfx/bezier.$(OBJEXT): ./src/gfx/$(am__dirstamp) \
-	./src/gfx/$(DEPDIR)/$(am__dirstamp)
-./src/gfx/blend_image.$(OBJEXT): ./src/gfx/$(am__dirstamp) \
-	./src/gfx/$(DEPDIR)/$(am__dirstamp)
-./src/gfx/resample_image.$(OBJEXT): ./src/gfx/$(am__dirstamp) \
-	./src/gfx/$(DEPDIR)/$(am__dirstamp)
-./src/gfx/resample_text.$(OBJEXT): ./src/gfx/$(am__dirstamp) \
-	./src/gfx/$(DEPDIR)/$(am__dirstamp)
-./src/gfx/image_effects.$(OBJEXT): ./src/gfx/$(am__dirstamp) \
-	./src/gfx/$(DEPDIR)/$(am__dirstamp)
-./src/gfx/rotate_image.$(OBJEXT): ./src/gfx/$(am__dirstamp) \
-	./src/gfx/$(DEPDIR)/$(am__dirstamp)
-./src/gfx/combine_image.$(OBJEXT): ./src/gfx/$(am__dirstamp) \
-	./src/gfx/$(DEPDIR)/$(am__dirstamp)
-./src/gfx/polynomial.$(OBJEXT): ./src/gfx/$(am__dirstamp) \
-	./src/gfx/$(DEPDIR)/$(am__dirstamp)
-./src/gfx/mask_image.$(OBJEXT): ./src/gfx/$(am__dirstamp) \
-	./src/gfx/$(DEPDIR)/$(am__dirstamp)
-./src/gui/set/$(am__dirstamp):
+	@: > src/gfx/$(DEPDIR)/$(am__dirstamp)
+./src/gfx/color.$(OBJEXT): src/gfx/$(am__dirstamp) \
+	src/gfx/$(DEPDIR)/$(am__dirstamp)
+./src/gfx/bezier.$(OBJEXT): src/gfx/$(am__dirstamp) \
+	src/gfx/$(DEPDIR)/$(am__dirstamp)
+./src/gfx/blend_image.$(OBJEXT): src/gfx/$(am__dirstamp) \
+	src/gfx/$(DEPDIR)/$(am__dirstamp)
+./src/gfx/resample_image.$(OBJEXT): src/gfx/$(am__dirstamp) \
+	src/gfx/$(DEPDIR)/$(am__dirstamp)
+./src/gfx/resample_text.$(OBJEXT): src/gfx/$(am__dirstamp) \
+	src/gfx/$(DEPDIR)/$(am__dirstamp)
+./src/gfx/image_effects.$(OBJEXT): src/gfx/$(am__dirstamp) \
+	src/gfx/$(DEPDIR)/$(am__dirstamp)
+./src/gfx/rotate_image.$(OBJEXT): src/gfx/$(am__dirstamp) \
+	src/gfx/$(DEPDIR)/$(am__dirstamp)
+./src/gfx/combine_image.$(OBJEXT): src/gfx/$(am__dirstamp) \
+	src/gfx/$(DEPDIR)/$(am__dirstamp)
+./src/gfx/polynomial.$(OBJEXT): src/gfx/$(am__dirstamp) \
+	src/gfx/$(DEPDIR)/$(am__dirstamp)
+./src/gfx/mask_image.$(OBJEXT): src/gfx/$(am__dirstamp) \
+	src/gfx/$(DEPDIR)/$(am__dirstamp)
+src/gui/set/$(am__dirstamp):
 	@$(mkdir_p) ./src/gui/set
-	@: > ./src/gui/set/$(am__dirstamp)
-./src/gui/set/$(DEPDIR)/$(am__dirstamp):
+	@: > src/gui/set/$(am__dirstamp)
+src/gui/set/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) ./src/gui/set/$(DEPDIR)
-	@: > ./src/gui/set/$(DEPDIR)/$(am__dirstamp)
-./src/gui/set/stats_panel.$(OBJEXT): ./src/gui/set/$(am__dirstamp) \
-	./src/gui/set/$(DEPDIR)/$(am__dirstamp)
-./src/gui/set/panel.$(OBJEXT): ./src/gui/set/$(am__dirstamp) \
-	./src/gui/set/$(DEPDIR)/$(am__dirstamp)
-./src/gui/set/set_info_panel.$(OBJEXT): ./src/gui/set/$(am__dirstamp) \
-	./src/gui/set/$(DEPDIR)/$(am__dirstamp)
-./src/gui/set/style_panel.$(OBJEXT): ./src/gui/set/$(am__dirstamp) \
-	./src/gui/set/$(DEPDIR)/$(am__dirstamp)
-./src/gui/set/keywords_panel.$(OBJEXT): ./src/gui/set/$(am__dirstamp) \
-	./src/gui/set/$(DEPDIR)/$(am__dirstamp)
-./src/gui/set/window.$(OBJEXT): ./src/gui/set/$(am__dirstamp) \
-	./src/gui/set/$(DEPDIR)/$(am__dirstamp)
-./src/gui/set/cards_panel.$(OBJEXT): ./src/gui/set/$(am__dirstamp) \
-	./src/gui/set/$(DEPDIR)/$(am__dirstamp)
-./src/gui/control/$(am__dirstamp):
+	@: > src/gui/set/$(DEPDIR)/$(am__dirstamp)
+./src/gui/set/stats_panel.$(OBJEXT): src/gui/set/$(am__dirstamp) \
+	src/gui/set/$(DEPDIR)/$(am__dirstamp)
+./src/gui/set/panel.$(OBJEXT): src/gui/set/$(am__dirstamp) \
+	src/gui/set/$(DEPDIR)/$(am__dirstamp)
+./src/gui/set/set_info_panel.$(OBJEXT): src/gui/set/$(am__dirstamp) \
+	src/gui/set/$(DEPDIR)/$(am__dirstamp)
+./src/gui/set/style_panel.$(OBJEXT): src/gui/set/$(am__dirstamp) \
+	src/gui/set/$(DEPDIR)/$(am__dirstamp)
+./src/gui/set/keywords_panel.$(OBJEXT): src/gui/set/$(am__dirstamp) \
+	src/gui/set/$(DEPDIR)/$(am__dirstamp)
+./src/gui/set/window.$(OBJEXT): src/gui/set/$(am__dirstamp) \
+	src/gui/set/$(DEPDIR)/$(am__dirstamp)
+./src/gui/set/cards_panel.$(OBJEXT): src/gui/set/$(am__dirstamp) \
+	src/gui/set/$(DEPDIR)/$(am__dirstamp)
+src/gui/control/$(am__dirstamp):
 	@$(mkdir_p) ./src/gui/control
-	@: > ./src/gui/control/$(am__dirstamp)
-./src/gui/control/$(DEPDIR)/$(am__dirstamp):
+	@: > src/gui/control/$(am__dirstamp)
+src/gui/control/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) ./src/gui/control/$(DEPDIR)
-	@: > ./src/gui/control/$(DEPDIR)/$(am__dirstamp)
+	@: > src/gui/control/$(DEPDIR)/$(am__dirstamp)
 ./src/gui/control/card_viewer.$(OBJEXT):  \
-	./src/gui/control/$(am__dirstamp) \
-	./src/gui/control/$(DEPDIR)/$(am__dirstamp)
+	src/gui/control/$(am__dirstamp) \
+	src/gui/control/$(DEPDIR)/$(am__dirstamp)
 ./src/gui/control/filtered_card_list.$(OBJEXT):  \
-	./src/gui/control/$(am__dirstamp) \
-	./src/gui/control/$(DEPDIR)/$(am__dirstamp)
+	src/gui/control/$(am__dirstamp) \
+	src/gui/control/$(DEPDIR)/$(am__dirstamp)
 ./src/gui/control/select_card_list.$(OBJEXT):  \
-	./src/gui/control/$(am__dirstamp) \
-	./src/gui/control/$(DEPDIR)/$(am__dirstamp)
+	src/gui/control/$(am__dirstamp) \
+	src/gui/control/$(DEPDIR)/$(am__dirstamp)
 ./src/gui/control/package_list.$(OBJEXT):  \
-	./src/gui/control/$(am__dirstamp) \
-	./src/gui/control/$(DEPDIR)/$(am__dirstamp)
+	src/gui/control/$(am__dirstamp) \
+	src/gui/control/$(DEPDIR)/$(am__dirstamp)
 ./src/gui/control/gallery_list.$(OBJEXT):  \
-	./src/gui/control/$(am__dirstamp) \
-	./src/gui/control/$(DEPDIR)/$(am__dirstamp)
-./src/gui/control/graph.$(OBJEXT): ./src/gui/control/$(am__dirstamp) \
-	./src/gui/control/$(DEPDIR)/$(am__dirstamp)
+	src/gui/control/$(am__dirstamp) \
+	src/gui/control/$(DEPDIR)/$(am__dirstamp)
+./src/gui/control/graph.$(OBJEXT): src/gui/control/$(am__dirstamp) \
+	src/gui/control/$(DEPDIR)/$(am__dirstamp)
 ./src/gui/control/image_card_list.$(OBJEXT):  \
-	./src/gui/control/$(am__dirstamp) \
-	./src/gui/control/$(DEPDIR)/$(am__dirstamp)
+	src/gui/control/$(am__dirstamp) \
+	src/gui/control/$(DEPDIR)/$(am__dirstamp)
 ./src/gui/control/card_list.$(OBJEXT):  \
-	./src/gui/control/$(am__dirstamp) \
-	./src/gui/control/$(DEPDIR)/$(am__dirstamp)
+	src/gui/control/$(am__dirstamp) \
+	src/gui/control/$(DEPDIR)/$(am__dirstamp)
 ./src/gui/control/card_list_column_select.$(OBJEXT):  \
-	./src/gui/control/$(am__dirstamp) \
-	./src/gui/control/$(DEPDIR)/$(am__dirstamp)
+	src/gui/control/$(am__dirstamp) \
+	src/gui/control/$(DEPDIR)/$(am__dirstamp)
 ./src/gui/control/native_look_editor.$(OBJEXT):  \
-	./src/gui/control/$(am__dirstamp) \
-	./src/gui/control/$(DEPDIR)/$(am__dirstamp)
+	src/gui/control/$(am__dirstamp) \
+	src/gui/control/$(DEPDIR)/$(am__dirstamp)
 ./src/gui/control/card_editor.$(OBJEXT):  \
-	./src/gui/control/$(am__dirstamp) \
-	./src/gui/control/$(DEPDIR)/$(am__dirstamp)
+	src/gui/control/$(am__dirstamp) \
+	src/gui/control/$(DEPDIR)/$(am__dirstamp)
 ./src/gui/control/text_ctrl.$(OBJEXT):  \
-	./src/gui/control/$(am__dirstamp) \
-	./src/gui/control/$(DEPDIR)/$(am__dirstamp)
-./src/gui/$(am__dirstamp):
+	src/gui/control/$(am__dirstamp) \
+	src/gui/control/$(DEPDIR)/$(am__dirstamp)
+src/gui/$(am__dirstamp):
 	@$(mkdir_p) ./src/gui
-	@: > ./src/gui/$(am__dirstamp)
-./src/gui/$(DEPDIR)/$(am__dirstamp):
+	@: > src/gui/$(am__dirstamp)
+src/gui/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) ./src/gui/$(DEPDIR)
-	@: > ./src/gui/$(DEPDIR)/$(am__dirstamp)
-./src/gui/preferences_window.$(OBJEXT): ./src/gui/$(am__dirstamp) \
-	./src/gui/$(DEPDIR)/$(am__dirstamp)
-./src/gui/drop_down_list.$(OBJEXT): ./src/gui/$(am__dirstamp) \
-	./src/gui/$(DEPDIR)/$(am__dirstamp)
-./src/gui/card_select_window.$(OBJEXT): ./src/gui/$(am__dirstamp) \
-	./src/gui/$(DEPDIR)/$(am__dirstamp)
-./src/gui/welcome_window.$(OBJEXT): ./src/gui/$(am__dirstamp) \
-	./src/gui/$(DEPDIR)/$(am__dirstamp)
-./src/gui/value/$(am__dirstamp):
+	@: > src/gui/$(DEPDIR)/$(am__dirstamp)
+./src/gui/preferences_window.$(OBJEXT): src/gui/$(am__dirstamp) \
+	src/gui/$(DEPDIR)/$(am__dirstamp)
+./src/gui/drop_down_list.$(OBJEXT): src/gui/$(am__dirstamp) \
+	src/gui/$(DEPDIR)/$(am__dirstamp)
+./src/gui/card_select_window.$(OBJEXT): src/gui/$(am__dirstamp) \
+	src/gui/$(DEPDIR)/$(am__dirstamp)
+./src/gui/welcome_window.$(OBJEXT): src/gui/$(am__dirstamp) \
+	src/gui/$(DEPDIR)/$(am__dirstamp)
+src/gui/value/$(am__dirstamp):
 	@$(mkdir_p) ./src/gui/value
-	@: > ./src/gui/value/$(am__dirstamp)
-./src/gui/value/$(DEPDIR)/$(am__dirstamp):
+	@: > src/gui/value/$(am__dirstamp)
+src/gui/value/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) ./src/gui/value/$(DEPDIR)
-	@: > ./src/gui/value/$(DEPDIR)/$(am__dirstamp)
-./src/gui/value/color.$(OBJEXT): ./src/gui/value/$(am__dirstamp) \
-	./src/gui/value/$(DEPDIR)/$(am__dirstamp)
-./src/gui/value/symbol.$(OBJEXT): ./src/gui/value/$(am__dirstamp) \
-	./src/gui/value/$(DEPDIR)/$(am__dirstamp)
+	@: > src/gui/value/$(DEPDIR)/$(am__dirstamp)
+./src/gui/value/color.$(OBJEXT): src/gui/value/$(am__dirstamp) \
+	src/gui/value/$(DEPDIR)/$(am__dirstamp)
+./src/gui/value/symbol.$(OBJEXT): src/gui/value/$(am__dirstamp) \
+	src/gui/value/$(DEPDIR)/$(am__dirstamp)
 ./src/gui/value/multiple_choice.$(OBJEXT):  \
-	./src/gui/value/$(am__dirstamp) \
-	./src/gui/value/$(DEPDIR)/$(am__dirstamp)
-./src/gui/value/choice.$(OBJEXT): ./src/gui/value/$(am__dirstamp) \
-	./src/gui/value/$(DEPDIR)/$(am__dirstamp)
-./src/gui/value/text.$(OBJEXT): ./src/gui/value/$(am__dirstamp) \
-	./src/gui/value/$(DEPDIR)/$(am__dirstamp)
-./src/gui/value/image.$(OBJEXT): ./src/gui/value/$(am__dirstamp) \
-	./src/gui/value/$(DEPDIR)/$(am__dirstamp)
-./src/gui/value/editor.$(OBJEXT): ./src/gui/value/$(am__dirstamp) \
-	./src/gui/value/$(DEPDIR)/$(am__dirstamp)
-./src/gui/image_slice_window.$(OBJEXT): ./src/gui/$(am__dirstamp) \
-	./src/gui/$(DEPDIR)/$(am__dirstamp)
-./src/gui/thumbnail_thread.$(OBJEXT): ./src/gui/$(am__dirstamp) \
-	./src/gui/$(DEPDIR)/$(am__dirstamp)
-./src/gui/print_window.$(OBJEXT): ./src/gui/$(am__dirstamp) \
-	./src/gui/$(DEPDIR)/$(am__dirstamp)
-./src/gui/about_window.$(OBJEXT): ./src/gui/$(am__dirstamp) \
-	./src/gui/$(DEPDIR)/$(am__dirstamp)
-./src/gui/symbol/$(am__dirstamp):
+	src/gui/value/$(am__dirstamp) \
+	src/gui/value/$(DEPDIR)/$(am__dirstamp)
+./src/gui/value/choice.$(OBJEXT): src/gui/value/$(am__dirstamp) \
+	src/gui/value/$(DEPDIR)/$(am__dirstamp)
+./src/gui/value/text.$(OBJEXT): src/gui/value/$(am__dirstamp) \
+	src/gui/value/$(DEPDIR)/$(am__dirstamp)
+./src/gui/value/image.$(OBJEXT): src/gui/value/$(am__dirstamp) \
+	src/gui/value/$(DEPDIR)/$(am__dirstamp)
+./src/gui/value/editor.$(OBJEXT): src/gui/value/$(am__dirstamp) \
+	src/gui/value/$(DEPDIR)/$(am__dirstamp)
+./src/gui/image_slice_window.$(OBJEXT): src/gui/$(am__dirstamp) \
+	src/gui/$(DEPDIR)/$(am__dirstamp)
+./src/gui/thumbnail_thread.$(OBJEXT): src/gui/$(am__dirstamp) \
+	src/gui/$(DEPDIR)/$(am__dirstamp)
+./src/gui/print_window.$(OBJEXT): src/gui/$(am__dirstamp) \
+	src/gui/$(DEPDIR)/$(am__dirstamp)
+./src/gui/about_window.$(OBJEXT): src/gui/$(am__dirstamp) \
+	src/gui/$(DEPDIR)/$(am__dirstamp)
+src/gui/symbol/$(am__dirstamp):
 	@$(mkdir_p) ./src/gui/symbol
-	@: > ./src/gui/symbol/$(am__dirstamp)
-./src/gui/symbol/$(DEPDIR)/$(am__dirstamp):
+	@: > src/gui/symbol/$(am__dirstamp)
+src/gui/symbol/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) ./src/gui/symbol/$(DEPDIR)
-	@: > ./src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
+	@: > src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
 ./src/gui/symbol/point_editor.$(OBJEXT):  \
-	./src/gui/symbol/$(am__dirstamp) \
-	./src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
+	src/gui/symbol/$(am__dirstamp) \
+	src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
 ./src/gui/symbol/basic_shape_editor.$(OBJEXT):  \
-	./src/gui/symbol/$(am__dirstamp) \
-	./src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
-./src/gui/symbol/control.$(OBJEXT): ./src/gui/symbol/$(am__dirstamp) \
-	./src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
+	src/gui/symbol/$(am__dirstamp) \
+	src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
+./src/gui/symbol/control.$(OBJEXT): src/gui/symbol/$(am__dirstamp) \
+	src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
 ./src/gui/symbol/select_editor.$(OBJEXT):  \
-	./src/gui/symbol/$(am__dirstamp) \
-	./src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
-./src/gui/symbol/editor.$(OBJEXT): ./src/gui/symbol/$(am__dirstamp) \
-	./src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
-./src/gui/symbol/part_list.$(OBJEXT):  \
-	./src/gui/symbol/$(am__dirstamp) \
-	./src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
-./src/gui/symbol/window.$(OBJEXT): ./src/gui/symbol/$(am__dirstamp) \
-	./src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
-./src/gui/update_checker.$(OBJEXT): ./src/gui/$(am__dirstamp) \
-	./src/gui/$(DEPDIR)/$(am__dirstamp)
-./src/gui/new_window.$(OBJEXT): ./src/gui/$(am__dirstamp) \
-	./src/gui/$(DEPDIR)/$(am__dirstamp)
-./src/gui/icon_menu.$(OBJEXT): ./src/gui/$(am__dirstamp) \
-	./src/gui/$(DEPDIR)/$(am__dirstamp)
-./src/gui/util.$(OBJEXT): ./src/gui/$(am__dirstamp) \
-	./src/gui/$(DEPDIR)/$(am__dirstamp)
-./src/data/$(am__dirstamp):
+	src/gui/symbol/$(am__dirstamp) \
+	src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
+./src/gui/symbol/editor.$(OBJEXT): src/gui/symbol/$(am__dirstamp) \
+	src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
+./src/gui/symbol/part_list.$(OBJEXT): src/gui/symbol/$(am__dirstamp) \
+	src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
+./src/gui/symbol/window.$(OBJEXT): src/gui/symbol/$(am__dirstamp) \
+	src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
+./src/gui/update_checker.$(OBJEXT): src/gui/$(am__dirstamp) \
+	src/gui/$(DEPDIR)/$(am__dirstamp)
+./src/gui/new_window.$(OBJEXT): src/gui/$(am__dirstamp) \
+	src/gui/$(DEPDIR)/$(am__dirstamp)
+./src/gui/icon_menu.$(OBJEXT): src/gui/$(am__dirstamp) \
+	src/gui/$(DEPDIR)/$(am__dirstamp)
+./src/gui/util.$(OBJEXT): src/gui/$(am__dirstamp) \
+	src/gui/$(DEPDIR)/$(am__dirstamp)
+src/data/$(am__dirstamp):
 	@$(mkdir_p) ./src/data
-	@: > ./src/data/$(am__dirstamp)
-./src/data/$(DEPDIR)/$(am__dirstamp):
+	@: > src/data/$(am__dirstamp)
+src/data/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) ./src/data/$(DEPDIR)
-	@: > ./src/data/$(DEPDIR)/$(am__dirstamp)
-./src/data/field.$(OBJEXT): ./src/data/$(am__dirstamp) \
-	./src/data/$(DEPDIR)/$(am__dirstamp)
-./src/data/field/$(am__dirstamp):
+	@: > src/data/$(DEPDIR)/$(am__dirstamp)
+./src/data/field.$(OBJEXT): src/data/$(am__dirstamp) \
+	src/data/$(DEPDIR)/$(am__dirstamp)
+src/data/field/$(am__dirstamp):
 	@$(mkdir_p) ./src/data/field
-	@: > ./src/data/field/$(am__dirstamp)
-./src/data/field/$(DEPDIR)/$(am__dirstamp):
+	@: > src/data/field/$(am__dirstamp)
+src/data/field/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) ./src/data/field/$(DEPDIR)
-	@: > ./src/data/field/$(DEPDIR)/$(am__dirstamp)
-./src/data/field/color.$(OBJEXT): ./src/data/field/$(am__dirstamp) \
-	./src/data/field/$(DEPDIR)/$(am__dirstamp)
-./src/data/field/symbol.$(OBJEXT): ./src/data/field/$(am__dirstamp) \
-	./src/data/field/$(DEPDIR)/$(am__dirstamp)
+	@: > src/data/field/$(DEPDIR)/$(am__dirstamp)
+./src/data/field/color.$(OBJEXT): src/data/field/$(am__dirstamp) \
+	src/data/field/$(DEPDIR)/$(am__dirstamp)
+./src/data/field/symbol.$(OBJEXT): src/data/field/$(am__dirstamp) \
+	src/data/field/$(DEPDIR)/$(am__dirstamp)
 ./src/data/field/multiple_choice.$(OBJEXT):  \
-	./src/data/field/$(am__dirstamp) \
-	./src/data/field/$(DEPDIR)/$(am__dirstamp)
-./src/data/field/choice.$(OBJEXT): ./src/data/field/$(am__dirstamp) \
-	./src/data/field/$(DEPDIR)/$(am__dirstamp)
-./src/data/field/boolean.$(OBJEXT): ./src/data/field/$(am__dirstamp) \
-	./src/data/field/$(DEPDIR)/$(am__dirstamp)
-./src/data/field/text.$(OBJEXT): ./src/data/field/$(am__dirstamp) \
-	./src/data/field/$(DEPDIR)/$(am__dirstamp)
-./src/data/field/image.$(OBJEXT): ./src/data/field/$(am__dirstamp) \
-	./src/data/field/$(DEPDIR)/$(am__dirstamp)
-./src/data/symbol.$(OBJEXT): ./src/data/$(am__dirstamp) \
-	./src/data/$(DEPDIR)/$(am__dirstamp)
-./src/data/stylesheet.$(OBJEXT): ./src/data/$(am__dirstamp) \
-	./src/data/$(DEPDIR)/$(am__dirstamp)
-./src/data/set.$(OBJEXT): ./src/data/$(am__dirstamp) \
-	./src/data/$(DEPDIR)/$(am__dirstamp)
-./src/data/font.$(OBJEXT): ./src/data/$(am__dirstamp) \
-	./src/data/$(DEPDIR)/$(am__dirstamp)
-./src/data/locale.$(OBJEXT): ./src/data/$(am__dirstamp) \
-	./src/data/$(DEPDIR)/$(am__dirstamp)
-./src/data/symbol_font.$(OBJEXT): ./src/data/$(am__dirstamp) \
-	./src/data/$(DEPDIR)/$(am__dirstamp)
-./src/data/action/$(am__dirstamp):
+	src/data/field/$(am__dirstamp) \
+	src/data/field/$(DEPDIR)/$(am__dirstamp)
+./src/data/field/choice.$(OBJEXT): src/data/field/$(am__dirstamp) \
+	src/data/field/$(DEPDIR)/$(am__dirstamp)
+./src/data/field/boolean.$(OBJEXT): src/data/field/$(am__dirstamp) \
+	src/data/field/$(DEPDIR)/$(am__dirstamp)
+./src/data/field/text.$(OBJEXT): src/data/field/$(am__dirstamp) \
+	src/data/field/$(DEPDIR)/$(am__dirstamp)
+./src/data/field/image.$(OBJEXT): src/data/field/$(am__dirstamp) \
+	src/data/field/$(DEPDIR)/$(am__dirstamp)
+./src/data/symbol.$(OBJEXT): src/data/$(am__dirstamp) \
+	src/data/$(DEPDIR)/$(am__dirstamp)
+./src/data/stylesheet.$(OBJEXT): src/data/$(am__dirstamp) \
+	src/data/$(DEPDIR)/$(am__dirstamp)
+./src/data/set.$(OBJEXT): src/data/$(am__dirstamp) \
+	src/data/$(DEPDIR)/$(am__dirstamp)
+./src/data/font.$(OBJEXT): src/data/$(am__dirstamp) \
+	src/data/$(DEPDIR)/$(am__dirstamp)
+./src/data/locale.$(OBJEXT): src/data/$(am__dirstamp) \
+	src/data/$(DEPDIR)/$(am__dirstamp)
+./src/data/symbol_font.$(OBJEXT): src/data/$(am__dirstamp) \
+	src/data/$(DEPDIR)/$(am__dirstamp)
+src/data/action/$(am__dirstamp):
 	@$(mkdir_p) ./src/data/action
-	@: > ./src/data/action/$(am__dirstamp)
-./src/data/action/$(DEPDIR)/$(am__dirstamp):
+	@: > src/data/action/$(am__dirstamp)
+src/data/action/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) ./src/data/action/$(DEPDIR)
-	@: > ./src/data/action/$(DEPDIR)/$(am__dirstamp)
-./src/data/action/symbol.$(OBJEXT): ./src/data/action/$(am__dirstamp) \
-	./src/data/action/$(DEPDIR)/$(am__dirstamp)
-./src/data/action/set.$(OBJEXT): ./src/data/action/$(am__dirstamp) \
-	./src/data/action/$(DEPDIR)/$(am__dirstamp)
+	@: > src/data/action/$(DEPDIR)/$(am__dirstamp)
+./src/data/action/symbol.$(OBJEXT): src/data/action/$(am__dirstamp) \
+	src/data/action/$(DEPDIR)/$(am__dirstamp)
+./src/data/action/set.$(OBJEXT): src/data/action/$(am__dirstamp) \
+	src/data/action/$(DEPDIR)/$(am__dirstamp)
 ./src/data/action/symbol_part.$(OBJEXT):  \
-	./src/data/action/$(am__dirstamp) \
-	./src/data/action/$(DEPDIR)/$(am__dirstamp)
-./src/data/action/value.$(OBJEXT): ./src/data/action/$(am__dirstamp) \
-	./src/data/action/$(DEPDIR)/$(am__dirstamp)
-./src/data/card.$(OBJEXT): ./src/data/$(am__dirstamp) \
-	./src/data/$(DEPDIR)/$(am__dirstamp)
-./src/data/format/$(am__dirstamp):
+	src/data/action/$(am__dirstamp) \
+	src/data/action/$(DEPDIR)/$(am__dirstamp)
+./src/data/action/value.$(OBJEXT): src/data/action/$(am__dirstamp) \
+	src/data/action/$(DEPDIR)/$(am__dirstamp)
+./src/data/card.$(OBJEXT): src/data/$(am__dirstamp) \
+	src/data/$(DEPDIR)/$(am__dirstamp)
+src/data/format/$(am__dirstamp):
 	@$(mkdir_p) ./src/data/format
-	@: > ./src/data/format/$(am__dirstamp)
-./src/data/format/$(DEPDIR)/$(am__dirstamp):
+	@: > src/data/format/$(am__dirstamp)
+src/data/format/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) ./src/data/format/$(DEPDIR)
-	@: > ./src/data/format/$(DEPDIR)/$(am__dirstamp)
-./src/data/format/html.$(OBJEXT): ./src/data/format/$(am__dirstamp) \
-	./src/data/format/$(DEPDIR)/$(am__dirstamp)
+	@: > src/data/format/$(DEPDIR)/$(am__dirstamp)
+./src/data/format/html.$(OBJEXT): src/data/format/$(am__dirstamp) \
+	src/data/format/$(DEPDIR)/$(am__dirstamp)
 ./src/data/format/apprentice.$(OBJEXT):  \
-	./src/data/format/$(am__dirstamp) \
-	./src/data/format/$(DEPDIR)/$(am__dirstamp)
+	src/data/format/$(am__dirstamp) \
+	src/data/format/$(DEPDIR)/$(am__dirstamp)
 ./src/data/format/mtg_editor.$(OBJEXT):  \
-	./src/data/format/$(am__dirstamp) \
-	./src/data/format/$(DEPDIR)/$(am__dirstamp)
-./src/data/format/formats.$(OBJEXT):  \
-	./src/data/format/$(am__dirstamp) \
-	./src/data/format/$(DEPDIR)/$(am__dirstamp)
-./src/data/format/image.$(OBJEXT): ./src/data/format/$(am__dirstamp) \
-	./src/data/format/$(DEPDIR)/$(am__dirstamp)
-./src/data/format/mws.$(OBJEXT): ./src/data/format/$(am__dirstamp) \
-	./src/data/format/$(DEPDIR)/$(am__dirstamp)
-./src/data/format/mse1.$(OBJEXT): ./src/data/format/$(am__dirstamp) \
-	./src/data/format/$(DEPDIR)/$(am__dirstamp)
-./src/data/format/mse2.$(OBJEXT): ./src/data/format/$(am__dirstamp) \
-	./src/data/format/$(DEPDIR)/$(am__dirstamp)
+	src/data/format/$(am__dirstamp) \
+	src/data/format/$(DEPDIR)/$(am__dirstamp)
+./src/data/format/formats.$(OBJEXT): src/data/format/$(am__dirstamp) \
+	src/data/format/$(DEPDIR)/$(am__dirstamp)
+./src/data/format/image.$(OBJEXT): src/data/format/$(am__dirstamp) \
+	src/data/format/$(DEPDIR)/$(am__dirstamp)
+./src/data/format/mws.$(OBJEXT): src/data/format/$(am__dirstamp) \
+	src/data/format/$(DEPDIR)/$(am__dirstamp)
+./src/data/format/mse1.$(OBJEXT): src/data/format/$(am__dirstamp) \
+	src/data/format/$(DEPDIR)/$(am__dirstamp)
+./src/data/format/mse2.$(OBJEXT): src/data/format/$(am__dirstamp) \
+	src/data/format/$(DEPDIR)/$(am__dirstamp)
 ./src/data/format/clipboard.$(OBJEXT):  \
-	./src/data/format/$(am__dirstamp) \
-	./src/data/format/$(DEPDIR)/$(am__dirstamp)
-./src/data/statistics.$(OBJEXT): ./src/data/$(am__dirstamp) \
-	./src/data/$(DEPDIR)/$(am__dirstamp)
-./src/data/settings.$(OBJEXT): ./src/data/$(am__dirstamp) \
-	./src/data/$(DEPDIR)/$(am__dirstamp)
-./src/data/keyword.$(OBJEXT): ./src/data/$(am__dirstamp) \
-	./src/data/$(DEPDIR)/$(am__dirstamp)
-./src/data/game.$(OBJEXT): ./src/data/$(am__dirstamp) \
-	./src/data/$(DEPDIR)/$(am__dirstamp)
-./src/util/io/$(am__dirstamp):
+	src/data/format/$(am__dirstamp) \
+	src/data/format/$(DEPDIR)/$(am__dirstamp)
+./src/data/statistics.$(OBJEXT): src/data/$(am__dirstamp) \
+	src/data/$(DEPDIR)/$(am__dirstamp)
+./src/data/settings.$(OBJEXT): src/data/$(am__dirstamp) \
+	src/data/$(DEPDIR)/$(am__dirstamp)
+./src/data/keyword.$(OBJEXT): src/data/$(am__dirstamp) \
+	src/data/$(DEPDIR)/$(am__dirstamp)
+./src/data/game.$(OBJEXT): src/data/$(am__dirstamp) \
+	src/data/$(DEPDIR)/$(am__dirstamp)
+src/util/io/$(am__dirstamp):
 	@$(mkdir_p) ./src/util/io
-	@: > ./src/util/io/$(am__dirstamp)
-./src/util/io/$(DEPDIR)/$(am__dirstamp):
+	@: > src/util/io/$(am__dirstamp)
+src/util/io/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) ./src/util/io/$(DEPDIR)
-	@: > ./src/util/io/$(DEPDIR)/$(am__dirstamp)
-./src/util/io/package.$(OBJEXT): ./src/util/io/$(am__dirstamp) \
-	./src/util/io/$(DEPDIR)/$(am__dirstamp)
-./src/util/io/writer.$(OBJEXT): ./src/util/io/$(am__dirstamp) \
-	./src/util/io/$(DEPDIR)/$(am__dirstamp)
-./src/util/io/get_member.$(OBJEXT): ./src/util/io/$(am__dirstamp) \
-	./src/util/io/$(DEPDIR)/$(am__dirstamp)
-./src/util/io/reader.$(OBJEXT): ./src/util/io/$(am__dirstamp) \
-	./src/util/io/$(DEPDIR)/$(am__dirstamp)
-./src/util/io/package_manager.$(OBJEXT):  \
-	./src/util/io/$(am__dirstamp) \
-	./src/util/io/$(DEPDIR)/$(am__dirstamp)
-./src/util/$(am__dirstamp):
+	@: > src/util/io/$(DEPDIR)/$(am__dirstamp)
+./src/util/io/package.$(OBJEXT): src/util/io/$(am__dirstamp) \
+	src/util/io/$(DEPDIR)/$(am__dirstamp)
+./src/util/io/writer.$(OBJEXT): src/util/io/$(am__dirstamp) \
+	src/util/io/$(DEPDIR)/$(am__dirstamp)
+./src/util/io/get_member.$(OBJEXT): src/util/io/$(am__dirstamp) \
+	src/util/io/$(DEPDIR)/$(am__dirstamp)
+./src/util/io/reader.$(OBJEXT): src/util/io/$(am__dirstamp) \
+	src/util/io/$(DEPDIR)/$(am__dirstamp)
+./src/util/io/package_manager.$(OBJEXT): src/util/io/$(am__dirstamp) \
+	src/util/io/$(DEPDIR)/$(am__dirstamp)
+src/util/$(am__dirstamp):
 	@$(mkdir_p) ./src/util
-	@: > ./src/util/$(am__dirstamp)
-./src/util/$(DEPDIR)/$(am__dirstamp):
+	@: > src/util/$(am__dirstamp)
+src/util/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) ./src/util/$(DEPDIR)
-	@: > ./src/util/$(DEPDIR)/$(am__dirstamp)
-./src/util/rotation.$(OBJEXT): ./src/util/$(am__dirstamp) \
-	./src/util/$(DEPDIR)/$(am__dirstamp)
-./src/util/action_stack.$(OBJEXT): ./src/util/$(am__dirstamp) \
-	./src/util/$(DEPDIR)/$(am__dirstamp)
-./src/util/alignment.$(OBJEXT): ./src/util/$(am__dirstamp) \
-	./src/util/$(DEPDIR)/$(am__dirstamp)
-./src/util/version.$(OBJEXT): ./src/util/$(am__dirstamp) \
-	./src/util/$(DEPDIR)/$(am__dirstamp)
-./src/util/string.$(OBJEXT): ./src/util/$(am__dirstamp) \
-	./src/util/$(DEPDIR)/$(am__dirstamp)
-./src/util/tagged_string.$(OBJEXT): ./src/util/$(am__dirstamp) \
-	./src/util/$(DEPDIR)/$(am__dirstamp)
-./src/util/age.$(OBJEXT): ./src/util/$(am__dirstamp) \
-	./src/util/$(DEPDIR)/$(am__dirstamp)
-./src/util/error.$(OBJEXT): ./src/util/$(am__dirstamp) \
-	./src/util/$(DEPDIR)/$(am__dirstamp)
-./src/$(am__dirstamp):
+	@: > src/util/$(DEPDIR)/$(am__dirstamp)
+./src/util/rotation.$(OBJEXT): src/util/$(am__dirstamp) \
+	src/util/$(DEPDIR)/$(am__dirstamp)
+./src/util/action_stack.$(OBJEXT): src/util/$(am__dirstamp) \
+	src/util/$(DEPDIR)/$(am__dirstamp)
+./src/util/alignment.$(OBJEXT): src/util/$(am__dirstamp) \
+	src/util/$(DEPDIR)/$(am__dirstamp)
+./src/util/version.$(OBJEXT): src/util/$(am__dirstamp) \
+	src/util/$(DEPDIR)/$(am__dirstamp)
+./src/util/string.$(OBJEXT): src/util/$(am__dirstamp) \
+	src/util/$(DEPDIR)/$(am__dirstamp)
+./src/util/tagged_string.$(OBJEXT): src/util/$(am__dirstamp) \
+	src/util/$(DEPDIR)/$(am__dirstamp)
+./src/util/age.$(OBJEXT): src/util/$(am__dirstamp) \
+	src/util/$(DEPDIR)/$(am__dirstamp)
+./src/util/error.$(OBJEXT): src/util/$(am__dirstamp) \
+	src/util/$(DEPDIR)/$(am__dirstamp)
+src/$(am__dirstamp):
 	@$(mkdir_p) ./src
-	@: > ./src/$(am__dirstamp)
-./src/$(DEPDIR)/$(am__dirstamp):
+	@: > src/$(am__dirstamp)
+src/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) ./src/$(DEPDIR)
-	@: > ./src/$(DEPDIR)/$(am__dirstamp)
-./src/main.$(OBJEXT): ./src/$(am__dirstamp) \
-	./src/$(DEPDIR)/$(am__dirstamp)
-./src/code_template.$(OBJEXT): ./src/$(am__dirstamp) \
-	./src/$(DEPDIR)/$(am__dirstamp)
-./src/render/card/$(am__dirstamp):
+	@: > src/$(DEPDIR)/$(am__dirstamp)
+./src/main.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+./src/code_template.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/render/card/$(am__dirstamp):
 	@$(mkdir_p) ./src/render/card
-	@: > ./src/render/card/$(am__dirstamp)
-./src/render/card/$(DEPDIR)/$(am__dirstamp):
+	@: > src/render/card/$(am__dirstamp)
+src/render/card/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) ./src/render/card/$(DEPDIR)
-	@: > ./src/render/card/$(DEPDIR)/$(am__dirstamp)
-./src/render/card/viewer.$(OBJEXT): ./src/render/card/$(am__dirstamp) \
-	./src/render/card/$(DEPDIR)/$(am__dirstamp)
-./src/render/text/$(am__dirstamp):
+	@: > src/render/card/$(DEPDIR)/$(am__dirstamp)
+./src/render/card/viewer.$(OBJEXT): src/render/card/$(am__dirstamp) \
+	src/render/card/$(DEPDIR)/$(am__dirstamp)
+src/render/text/$(am__dirstamp):
 	@$(mkdir_p) ./src/render/text
-	@: > ./src/render/text/$(am__dirstamp)
-./src/render/text/$(DEPDIR)/$(am__dirstamp):
+	@: > src/render/text/$(am__dirstamp)
+src/render/text/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) ./src/render/text/$(DEPDIR)
-	@: > ./src/render/text/$(DEPDIR)/$(am__dirstamp)
-./src/render/text/symbol.$(OBJEXT): ./src/render/text/$(am__dirstamp) \
-	./src/render/text/$(DEPDIR)/$(am__dirstamp)
-./src/render/text/font.$(OBJEXT): ./src/render/text/$(am__dirstamp) \
-	./src/render/text/$(DEPDIR)/$(am__dirstamp)
-./src/render/text/compound.$(OBJEXT):  \
-	./src/render/text/$(am__dirstamp) \
-	./src/render/text/$(DEPDIR)/$(am__dirstamp)
-./src/render/text/viewer.$(OBJEXT): ./src/render/text/$(am__dirstamp) \
-	./src/render/text/$(DEPDIR)/$(am__dirstamp)
-./src/render/text/element.$(OBJEXT):  \
-	./src/render/text/$(am__dirstamp) \
-	./src/render/text/$(DEPDIR)/$(am__dirstamp)
-./src/render/value/$(am__dirstamp):
+	@: > src/render/text/$(DEPDIR)/$(am__dirstamp)
+./src/render/text/symbol.$(OBJEXT): src/render/text/$(am__dirstamp) \
+	src/render/text/$(DEPDIR)/$(am__dirstamp)
+./src/render/text/font.$(OBJEXT): src/render/text/$(am__dirstamp) \
+	src/render/text/$(DEPDIR)/$(am__dirstamp)
+./src/render/text/compound.$(OBJEXT): src/render/text/$(am__dirstamp) \
+	src/render/text/$(DEPDIR)/$(am__dirstamp)
+./src/render/text/viewer.$(OBJEXT): src/render/text/$(am__dirstamp) \
+	src/render/text/$(DEPDIR)/$(am__dirstamp)
+./src/render/text/element.$(OBJEXT): src/render/text/$(am__dirstamp) \
+	src/render/text/$(DEPDIR)/$(am__dirstamp)
+src/render/value/$(am__dirstamp):
 	@$(mkdir_p) ./src/render/value
-	@: > ./src/render/value/$(am__dirstamp)
-./src/render/value/$(DEPDIR)/$(am__dirstamp):
+	@: > src/render/value/$(am__dirstamp)
+src/render/value/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) ./src/render/value/$(DEPDIR)
-	@: > ./src/render/value/$(DEPDIR)/$(am__dirstamp)
-./src/render/value/color.$(OBJEXT):  \
-	./src/render/value/$(am__dirstamp) \
-	./src/render/value/$(DEPDIR)/$(am__dirstamp)
-./src/render/value/symbol.$(OBJEXT):  \
-	./src/render/value/$(am__dirstamp) \
-	./src/render/value/$(DEPDIR)/$(am__dirstamp)
+	@: > src/render/value/$(DEPDIR)/$(am__dirstamp)
+./src/render/value/color.$(OBJEXT): src/render/value/$(am__dirstamp) \
+	src/render/value/$(DEPDIR)/$(am__dirstamp)
+./src/render/value/symbol.$(OBJEXT): src/render/value/$(am__dirstamp) \
+	src/render/value/$(DEPDIR)/$(am__dirstamp)
 ./src/render/value/multiple_choice.$(OBJEXT):  \
-	./src/render/value/$(am__dirstamp) \
-	./src/render/value/$(DEPDIR)/$(am__dirstamp)
-./src/render/value/choice.$(OBJEXT):  \
-	./src/render/value/$(am__dirstamp) \
-	./src/render/value/$(DEPDIR)/$(am__dirstamp)
-./src/render/value/text.$(OBJEXT): ./src/render/value/$(am__dirstamp) \
-	./src/render/value/$(DEPDIR)/$(am__dirstamp)
-./src/render/value/image.$(OBJEXT):  \
-	./src/render/value/$(am__dirstamp) \
-	./src/render/value/$(DEPDIR)/$(am__dirstamp)
-./src/render/value/viewer.$(OBJEXT):  \
-	./src/render/value/$(am__dirstamp) \
-	./src/render/value/$(DEPDIR)/$(am__dirstamp)
-./src/render/symbol/$(am__dirstamp):
+	src/render/value/$(am__dirstamp) \
+	src/render/value/$(DEPDIR)/$(am__dirstamp)
+./src/render/value/choice.$(OBJEXT): src/render/value/$(am__dirstamp) \
+	src/render/value/$(DEPDIR)/$(am__dirstamp)
+./src/render/value/text.$(OBJEXT): src/render/value/$(am__dirstamp) \
+	src/render/value/$(DEPDIR)/$(am__dirstamp)
+./src/render/value/image.$(OBJEXT): src/render/value/$(am__dirstamp) \
+	src/render/value/$(DEPDIR)/$(am__dirstamp)
+./src/render/value/viewer.$(OBJEXT): src/render/value/$(am__dirstamp) \
+	src/render/value/$(DEPDIR)/$(am__dirstamp)
+src/render/symbol/$(am__dirstamp):
 	@$(mkdir_p) ./src/render/symbol
-	@: > ./src/render/symbol/$(am__dirstamp)
-./src/render/symbol/$(DEPDIR)/$(am__dirstamp):
+	@: > src/render/symbol/$(am__dirstamp)
+src/render/symbol/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) ./src/render/symbol/$(DEPDIR)
-	@: > ./src/render/symbol/$(DEPDIR)/$(am__dirstamp)
+	@: > src/render/symbol/$(DEPDIR)/$(am__dirstamp)
 ./src/render/symbol/filter.$(OBJEXT):  \
-	./src/render/symbol/$(am__dirstamp) \
-	./src/render/symbol/$(DEPDIR)/$(am__dirstamp)
+	src/render/symbol/$(am__dirstamp) \
+	src/render/symbol/$(DEPDIR)/$(am__dirstamp)
 ./src/render/symbol/viewer.$(OBJEXT):  \
-	./src/render/symbol/$(am__dirstamp) \
-	./src/render/symbol/$(DEPDIR)/$(am__dirstamp)
-./src/script/$(am__dirstamp):
+	src/render/symbol/$(am__dirstamp) \
+	src/render/symbol/$(DEPDIR)/$(am__dirstamp)
+src/script/$(am__dirstamp):
 	@$(mkdir_p) ./src/script
-	@: > ./src/script/$(am__dirstamp)
-./src/script/$(DEPDIR)/$(am__dirstamp):
+	@: > src/script/$(am__dirstamp)
+src/script/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) ./src/script/$(DEPDIR)
-	@: > ./src/script/$(DEPDIR)/$(am__dirstamp)
-./src/script/parser.$(OBJEXT): ./src/script/$(am__dirstamp) \
-	./src/script/$(DEPDIR)/$(am__dirstamp)
-./src/script/functions.$(OBJEXT): ./src/script/$(am__dirstamp) \
-	./src/script/$(DEPDIR)/$(am__dirstamp)
-./src/script/image.$(OBJEXT): ./src/script/$(am__dirstamp) \
-	./src/script/$(DEPDIR)/$(am__dirstamp)
-./src/script/dependency.$(OBJEXT): ./src/script/$(am__dirstamp) \
-	./src/script/$(DEPDIR)/$(am__dirstamp)
-./src/script/value.$(OBJEXT): ./src/script/$(am__dirstamp) \
-	./src/script/$(DEPDIR)/$(am__dirstamp)
-./src/script/script.$(OBJEXT): ./src/script/$(am__dirstamp) \
-	./src/script/$(DEPDIR)/$(am__dirstamp)
-./src/script/context.$(OBJEXT): ./src/script/$(am__dirstamp) \
-	./src/script/$(DEPDIR)/$(am__dirstamp)
-./src/script/script_manager.$(OBJEXT): ./src/script/$(am__dirstamp) \
-	./src/script/$(DEPDIR)/$(am__dirstamp)
-./src/script/scriptable.$(OBJEXT): ./src/script/$(am__dirstamp) \
-	./src/script/$(DEPDIR)/$(am__dirstamp)
+	@: > src/script/$(DEPDIR)/$(am__dirstamp)
+./src/script/parser.$(OBJEXT): src/script/$(am__dirstamp) \
+	src/script/$(DEPDIR)/$(am__dirstamp)
+./src/script/functions.$(OBJEXT): src/script/$(am__dirstamp) \
+	src/script/$(DEPDIR)/$(am__dirstamp)
+./src/script/image.$(OBJEXT): src/script/$(am__dirstamp) \
+	src/script/$(DEPDIR)/$(am__dirstamp)
+./src/script/dependency.$(OBJEXT): src/script/$(am__dirstamp) \
+	src/script/$(DEPDIR)/$(am__dirstamp)
+./src/script/value.$(OBJEXT): src/script/$(am__dirstamp) \
+	src/script/$(DEPDIR)/$(am__dirstamp)
+./src/script/script.$(OBJEXT): src/script/$(am__dirstamp) \
+	src/script/$(DEPDIR)/$(am__dirstamp)
+./src/script/context.$(OBJEXT): src/script/$(am__dirstamp) \
+	src/script/$(DEPDIR)/$(am__dirstamp)
+./src/script/script_manager.$(OBJEXT): src/script/$(am__dirstamp) \
+	src/script/$(DEPDIR)/$(am__dirstamp)
+./src/script/scriptable.$(OBJEXT): src/script/$(am__dirstamp) \
+	src/script/$(DEPDIR)/$(am__dirstamp)
 magicseteditor$(EXEEXT): $(magicseteditor_OBJECTS) $(magicseteditor_DEPENDENCIES) 
 	@rm -f magicseteditor$(EXEEXT)
 	$(CXXLINK) $(magicseteditor_LDFLAGS) $(magicseteditor_OBJECTS) $(magicseteditor_LDADD) $(LIBS)
@@ -1310,42 +1305,42 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-rm -f ./src/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ./src/$(am__dirstamp)
-	-rm -f ./src/data/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ./src/data/$(am__dirstamp)
-	-rm -f ./src/data/action/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ./src/data/action/$(am__dirstamp)
-	-rm -f ./src/data/field/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ./src/data/field/$(am__dirstamp)
-	-rm -f ./src/data/format/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ./src/data/format/$(am__dirstamp)
-	-rm -f ./src/gfx/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ./src/gfx/$(am__dirstamp)
-	-rm -f ./src/gui/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ./src/gui/$(am__dirstamp)
-	-rm -f ./src/gui/control/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ./src/gui/control/$(am__dirstamp)
-	-rm -f ./src/gui/set/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ./src/gui/set/$(am__dirstamp)
-	-rm -f ./src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ./src/gui/symbol/$(am__dirstamp)
-	-rm -f ./src/gui/value/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ./src/gui/value/$(am__dirstamp)
-	-rm -f ./src/render/card/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ./src/render/card/$(am__dirstamp)
-	-rm -f ./src/render/symbol/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ./src/render/symbol/$(am__dirstamp)
-	-rm -f ./src/render/text/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ./src/render/text/$(am__dirstamp)
-	-rm -f ./src/render/value/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ./src/render/value/$(am__dirstamp)
-	-rm -f ./src/script/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ./src/script/$(am__dirstamp)
-	-rm -f ./src/util/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ./src/util/$(am__dirstamp)
-	-rm -f ./src/util/io/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ./src/util/io/$(am__dirstamp)
+	-rm -f src/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/$(am__dirstamp)
+	-rm -f src/data/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/data/$(am__dirstamp)
+	-rm -f src/data/action/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/data/action/$(am__dirstamp)
+	-rm -f src/data/field/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/data/field/$(am__dirstamp)
+	-rm -f src/data/format/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/data/format/$(am__dirstamp)
+	-rm -f src/gfx/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/gfx/$(am__dirstamp)
+	-rm -f src/gui/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/gui/$(am__dirstamp)
+	-rm -f src/gui/control/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/gui/control/$(am__dirstamp)
+	-rm -f src/gui/set/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/gui/set/$(am__dirstamp)
+	-rm -f src/gui/symbol/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/gui/symbol/$(am__dirstamp)
+	-rm -f src/gui/value/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/gui/value/$(am__dirstamp)
+	-rm -f src/render/card/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/render/card/$(am__dirstamp)
+	-rm -f src/render/symbol/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/render/symbol/$(am__dirstamp)
+	-rm -f src/render/text/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/render/text/$(am__dirstamp)
+	-rm -f src/render/value/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/render/value/$(am__dirstamp)
+	-rm -f src/script/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/script/$(am__dirstamp)
+	-rm -f src/util/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/util/$(am__dirstamp)
+	-rm -f src/util/io/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/util/io/$(am__dirstamp)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"

configure.ac

@@ -10,6 +10,7 @@ AC_INIT(magicseteditor, 0.3.0, twanvl@users.sourceforge.net)
 AC_CONFIG_SRCDIR([src/main.cpp])
 # TODO: Actually use the config header
 AC_CONFIG_HEADER([src/config.h])
+CXXFLAGS = [-g3 -O0]
 
 AM_INIT_AUTOMAKE([-Wall foreign])
 

install-sh

@@ -0,0 +1,323 @@
+#!/bin/sh
+# install - install a program, script, or datafile
+
+scriptversion=2005-05-14.22
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# `make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.  It can only install one file at a time, a restriction
+# shared with many OS's install programs.
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit="${DOITPROG-}"
+
+# put in absolute paths if you don't have them in your path; or use env. vars.
+
+mvprog="${MVPROG-mv}"
+cpprog="${CPPROG-cp}"
+chmodprog="${CHMODPROG-chmod}"
+chownprog="${CHOWNPROG-chown}"
+chgrpprog="${CHGRPPROG-chgrp}"
+stripprog="${STRIPPROG-strip}"
+rmprog="${RMPROG-rm}"
+mkdirprog="${MKDIRPROG-mkdir}"
+
+chmodcmd="$chmodprog 0755"
+chowncmd=
+chgrpcmd=
+stripcmd=
+rmcmd="$rmprog -f"
+mvcmd="$mvprog"
+src=
+dst=
+dir_arg=
+dstarg=
+no_target_directory=
+
+usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+   or: $0 [OPTION]... -d DIRECTORIES...
+
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
+
+Options:
+-c         (ignored)
+-d         create directories instead of installing files.
+-g GROUP   $chgrpprog installed files to GROUP.
+-m MODE    $chmodprog installed files to MODE.
+-o USER    $chownprog installed files to USER.
+-s         $stripprog installed files.
+-t DIRECTORY  install into DIRECTORY.
+-T         report an error if DSTFILE is a directory.
+--help     display this help and exit.
+--version  display version info and exit.
+
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+"
+
+while test -n "$1"; do
+  case $1 in
+    -c) shift
+        continue;;
+
+    -d) dir_arg=true
+        shift
+        continue;;
+
+    -g) chgrpcmd="$chgrpprog $2"
+        shift
+        shift
+        continue;;
+
+    --help) echo "$usage"; exit $?;;
+
+    -m) chmodcmd="$chmodprog $2"
+        shift
+        shift
+        continue;;
+
+    -o) chowncmd="$chownprog $2"
+        shift
+        shift
+        continue;;
+
+    -s) stripcmd=$stripprog
+        shift
+        continue;;
+
+    -t) dstarg=$2
+	shift
+	shift
+	continue;;
+
+    -T) no_target_directory=true
+	shift
+	continue;;
+
+    --version) echo "$0 $scriptversion"; exit $?;;
+
+    *)  # When -d is used, all remaining arguments are directories to create.
+	# When -t is used, the destination is already specified.
+	test -n "$dir_arg$dstarg" && break
+        # Otherwise, the last argument is the destination.  Remove it from $@.
+	for arg
+	do
+          if test -n "$dstarg"; then
+	    # $@ is not empty: it contains at least $arg.
+	    set fnord "$@" "$dstarg"
+	    shift # fnord
+	  fi
+	  shift # arg
+	  dstarg=$arg
+	done
+	break;;
+  esac
+done
+
+if test -z "$1"; then
+  if test -z "$dir_arg"; then
+    echo "$0: no input file specified." >&2
+    exit 1
+  fi
+  # It's OK to call `install-sh -d' without argument.
+  # This can happen when creating conditional directories.
+  exit 0
+fi
+
+for src
+do
+  # Protect names starting with `-'.
+  case $src in
+    -*) src=./$src ;;
+  esac
+
+  if test -n "$dir_arg"; then
+    dst=$src
+    src=
+
+    if test -d "$dst"; then
+      mkdircmd=:
+      chmodcmd=
+    else
+      mkdircmd=$mkdirprog
+    fi
+  else
+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+    # might cause directories to be created, which would be especially bad
+    # if $src (and thus $dsttmp) contains '*'.
+    if test ! -f "$src" && test ! -d "$src"; then
+      echo "$0: $src does not exist." >&2
+      exit 1
+    fi
+
+    if test -z "$dstarg"; then
+      echo "$0: no destination specified." >&2
+      exit 1
+    fi
+
+    dst=$dstarg
+    # Protect names starting with `-'.
+    case $dst in
+      -*) dst=./$dst ;;
+    esac
+
+    # If destination is a directory, append the input filename; won't work
+    # if double slashes aren't ignored.
+    if test -d "$dst"; then
+      if test -n "$no_target_directory"; then
+	echo "$0: $dstarg: Is a directory" >&2
+	exit 1
+      fi
+      dst=$dst/`basename "$src"`
+    fi
+  fi
+
+  # This sed command emulates the dirname command.
+  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
+
+  # Make sure that the destination directory exists.
+
+  # Skip lots of stat calls in the usual case.
+  if test ! -d "$dstdir"; then
+    defaultIFS='
+	 '
+    IFS="${IFS-$defaultIFS}"
+
+    oIFS=$IFS
+    # Some sh's can't handle IFS=/ for some reason.
+    IFS='%'
+    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+    shift
+    IFS=$oIFS
+
+    pathcomp=
+
+    while test $# -ne 0 ; do
+      pathcomp=$pathcomp$1
+      shift
+      if test ! -d "$pathcomp"; then
+        $mkdirprog "$pathcomp"
+	# mkdir can fail with a `File exist' error in case several
+	# install-sh are creating the directory concurrently.  This
+	# is OK.
+	test -d "$pathcomp" || exit
+      fi
+      pathcomp=$pathcomp/
+    done
+  fi
+
+  if test -n "$dir_arg"; then
+    $doit $mkdircmd "$dst" \
+      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
+      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
+      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
+
+  else
+    dstfile=`basename "$dst"`
+
+    # Make a couple of temp file names in the proper directory.
+    dsttmp=$dstdir/_inst.$$_
+    rmtmp=$dstdir/_rm.$$_
+
+    # Trap to clean up those temp files at exit.
+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+    trap '(exit $?); exit' 1 2 13 15
+
+    # Copy the file name to the temp name.
+    $doit $cpprog "$src" "$dsttmp" &&
+
+    # and set any options; do chmod last to preserve setuid bits.
+    #
+    # If any of these fail, we abort the whole thing.  If we want to
+    # ignore errors from any of these, just make sure not to ignore
+    # errors from the above "$doit $cpprog $src $dsttmp" command.
+    #
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
+      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
+      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
+
+    # Now rename the file to the real destination.
+    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
+      || {
+	   # The rename failed, perhaps because mv can't rename something else
+	   # to itself, or perhaps because mv is so ancient that it does not
+	   # support -f.
+
+	   # Now remove or move aside any old file at destination location.
+	   # We try this two ways since rm can't unlink itself on some
+	   # systems and the destination file might be busy for other
+	   # reasons.  In this case, the final cleanup might fail but the new
+	   # file should still install successfully.
+	   {
+	     if test -f "$dstdir/$dstfile"; then
+	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
+	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
+	       || {
+		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+		 (exit 1); exit 1
+	       }
+	     else
+	       :
+	     fi
+	   } &&
+
+	   # Now rename the file to the real destination.
+	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+	 }
+    }
+  fi || { (exit 1); exit 1; }
+done
+
+# The final little trick to "correctly" pass the exit status to the exit trap.
+{
+  (exit 0); exit 0
+}
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:

missing

@@ -0,0 +1,360 @@
+#! /bin/sh
+# Common stub for a few missing GNU programs while installing.
+
+scriptversion=2005-06-08.21
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+#   Free Software Foundation, Inc.
+# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+if test $# -eq 0; then
+  echo 1>&2 "Try \`$0 --help' for more information"
+  exit 1
+fi
+
+run=:
+
+# In the cases where this matters, `missing' is being run in the
+# srcdir already.
+if test -f configure.ac; then
+  configure_ac=configure.ac
+else
+  configure_ac=configure.in
+fi
+
+msg="missing on your system"
+
+case "$1" in
+--run)
+  # Try to run requested program, and just exit if it succeeds.
+  run=
+  shift
+  "$@" && exit 0
+  # Exit code 63 means version mismatch.  This often happens
+  # when the user try to use an ancient version of a tool on
+  # a file that requires a minimum version.  In this case we
+  # we should proceed has if the program had been absent, or
+  # if --run hadn't been passed.
+  if test $? = 63; then
+    run=:
+    msg="probably too old"
+  fi
+  ;;
+
+  -h|--h|--he|--hel|--help)
+    echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
+error status if there is no known handling for PROGRAM.
+
+Options:
+  -h, --help      display this help and exit
+  -v, --version   output version information and exit
+  --run           try to run the given command, and emulate it if it fails
+
+Supported PROGRAM values:
+  aclocal      touch file \`aclocal.m4'
+  autoconf     touch file \`configure'
+  autoheader   touch file \`config.h.in'
+  automake     touch all \`Makefile.in' files
+  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
+  flex         create \`lex.yy.c', if possible, from existing .c
+  help2man     touch the output file
+  lex          create \`lex.yy.c', if possible, from existing .c
+  makeinfo     touch the output file
+  tar          try tar, gnutar, gtar, then tar without non-portable flags
+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Send bug reports to <bug-automake@gnu.org>."
+    exit $?
+    ;;
+
+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+    echo "missing $scriptversion (GNU Automake)"
+    exit $?
+    ;;
+
+  -*)
+    echo 1>&2 "$0: Unknown \`$1' option"
+    echo 1>&2 "Try \`$0 --help' for more information"
+    exit 1
+    ;;
+
+esac
+
+# Now exit if we have it, but it failed.  Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program).
+case "$1" in
+  lex|yacc)
+    # Not GNU programs, they don't have --version.
+    ;;
+
+  tar)
+    if test -n "$run"; then
+       echo 1>&2 "ERROR: \`tar' requires --run"
+       exit 1
+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+       exit 1
+    fi
+    ;;
+
+  *)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+       # Could not run --version or --help.  This is probably someone
+       # running `$TOOL --version' or `$TOOL --help' to check whether
+       # $TOOL exists and not knowing $TOOL uses missing.
+       exit 1
+    fi
+    ;;
+esac
+
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case "$1" in
+  aclocal*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
+         to install the \`Automake' and \`Perl' packages.  Grab them from
+         any GNU archive site."
+    touch aclocal.m4
+    ;;
+
+  autoconf)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`${configure_ac}'.  You might want to install the
+         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
+         archive site."
+    touch configure
+    ;;
+
+  autoheader)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
+         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
+         from any GNU archive site."
+    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
+    test -z "$files" && files="config.h"
+    touch_files=
+    for f in $files; do
+      case "$f" in
+      *:*) touch_files="$touch_files "`echo "$f" |
+				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
+      *) touch_files="$touch_files $f.in";;
+      esac
+    done
+    touch $touch_files
+    ;;
+
+  automake*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
+         You might want to install the \`Automake' and \`Perl' packages.
+         Grab them from any GNU archive site."
+    find . -type f -name Makefile.am -print |
+	   sed 's/\.am$/.in/' |
+	   while read f; do touch "$f"; done
+    ;;
+
+  autom4te)
+    echo 1>&2 "\
+WARNING: \`$1' is needed, but is $msg.
+         You might have modified some files without having the
+         proper tools for further handling them.
+         You can get \`$1' as part of \`Autoconf' from any GNU
+         archive site."
+
+    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+    if test -f "$file"; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo "#! /bin/sh"
+	echo "# Created by GNU Automake missing as a replacement of"
+	echo "#  $ $@"
+	echo "exit 0"
+	chmod +x $file
+	exit 1
+    fi
+    ;;
+
+  bison|yacc)
+    echo 1>&2 "\
+WARNING: \`$1' $msg.  You should only need it if
+         you modified a \`.y' file.  You may need the \`Bison' package
+         in order for those modifications to take effect.  You can get
+         \`Bison' from any GNU archive site."
+    rm -f y.tab.c y.tab.h
+    if [ $# -ne 1 ]; then
+        eval LASTARG="\${$#}"
+	case "$LASTARG" in
+	*.y)
+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+	    if [ -f "$SRCFILE" ]; then
+	         cp "$SRCFILE" y.tab.c
+	    fi
+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
+	    if [ -f "$SRCFILE" ]; then
+	         cp "$SRCFILE" y.tab.h
+	    fi
+	  ;;
+	esac
+    fi
+    if [ ! -f y.tab.h ]; then
+	echo >y.tab.h
+    fi
+    if [ ! -f y.tab.c ]; then
+	echo 'main() { return 0; }' >y.tab.c
+    fi
+    ;;
+
+  lex|flex)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified a \`.l' file.  You may need the \`Flex' package
+         in order for those modifications to take effect.  You can get
+         \`Flex' from any GNU archive site."
+    rm -f lex.yy.c
+    if [ $# -ne 1 ]; then
+        eval LASTARG="\${$#}"
+	case "$LASTARG" in
+	*.l)
+	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+	    if [ -f "$SRCFILE" ]; then
+	         cp "$SRCFILE" lex.yy.c
+	    fi
+	  ;;
+	esac
+    fi
+    if [ ! -f lex.yy.c ]; then
+	echo 'main() { return 0; }' >lex.yy.c
+    fi
+    ;;
+
+  help2man)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+	 you modified a dependency of a manual page.  You may need the
+	 \`Help2man' package in order for those modifications to take
+	 effect.  You can get \`Help2man' from any GNU archive site."
+
+    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    if test -z "$file"; then
+	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+    fi
+    if [ -f "$file" ]; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo ".ab help2man is required to generate this page"
+	exit 1
+    fi
+    ;;
+
+  makeinfo)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified a \`.texi' or \`.texinfo' file, or any other file
+         indirectly affecting the aspect of the manual.  The spurious
+         call might also be the consequence of using a buggy \`make' (AIX,
+         DU, IRIX).  You might want to install the \`Texinfo' package or
+         the \`GNU make' package.  Grab either from any GNU archive site."
+    # The file to touch is that specified with -o ...
+    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    if test -z "$file"; then
+      # ... or it is the one specified with @setfilename ...
+      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+      # ... or it is derived from the source name (dir/f.texi becomes f.info)
+      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+    fi
+    # If the file does not exist, the user really needs makeinfo;
+    # let's fail without touching anything.
+    test -f $file || exit 1
+    touch $file
+    ;;
+
+  tar)
+    shift
+
+    # We have already tried tar in the generic part.
+    # Look for gnutar/gtar before invocation to avoid ugly error
+    # messages.
+    if (gnutar --version > /dev/null 2>&1); then
+       gnutar "$@" && exit 0
+    fi
+    if (gtar --version > /dev/null 2>&1); then
+       gtar "$@" && exit 0
+    fi
+    firstarg="$1"
+    if shift; then
+	case "$firstarg" in
+	*o*)
+	    firstarg=`echo "$firstarg" | sed s/o//`
+	    tar "$firstarg" "$@" && exit 0
+	    ;;
+	esac
+	case "$firstarg" in
+	*h*)
+	    firstarg=`echo "$firstarg" | sed s/h//`
+	    tar "$firstarg" "$@" && exit 0
+	    ;;
+	esac
+    fi
+
+    echo 1>&2 "\
+WARNING: I can't seem to be able to run \`tar' with the given arguments.
+         You may want to install GNU tar or Free paxutils, or check the
+         command line arguments."
+    exit 1
+    ;;
+
+  *)
+    echo 1>&2 "\
+WARNING: \`$1' is needed, and is $msg.
+         You might have modified some files without having the
+         proper tools for further handling them.  Check the \`README' file,
+         it often tells you about the needed prerequisites for installing
+         this package.  You may also peek at any GNU archive site, in case
+         some other package would contain this missing \`$1' program."
+    exit 1
+    ;;
+esac
+
+exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:

src/data/settings.cpp

@@ -88,8 +88,8 @@ Settings::Settings()
 	, set_window_width     (790)
 	, set_window_height    (300)
 	, card_notes_height    (40)
-	, check_updates        (CHECK_IF_CONNECTED)
 	, updates_url          (_("http://magicseteditor.sourceforge.net/updates"))
+	, check_updates        (CHECK_IF_CONNECTED)
 {}
 
 void Settings::addRecentFile(const String& filename) {
@@ -136,7 +136,7 @@ StyleSheetSettings& Settings::stylesheetSettingsFor(const StyleSheet& stylesheet
 /// Retrieve the directory to use for settings and other data files
 String user_settings_dir() {
 	String dir = wxStandardPaths::Get().GetUserDataDir();
-	if (!wxDirExists(dir)) wxMkDir(dir);
+	if (!wxDirExists(dir)) wxMkDir(wxConvLocal.cWX2MB(dir), 0777);
 	return dir + _("/");
 }
 

src/gui/control/text_ctrl.cpp

@@ -63,7 +63,7 @@ void TextCtrl::setValue(String* value) {
 void TextCtrl::valueChanged() {
 	if (!viewers.empty()) {
 		TextValue& tv = static_cast<TextValue&>(*viewers.front()->getValue());
-		tv.value.assign(value ? *value : wxEmptyString);
+		tv.value.assign(value ? String(*value) : String(wxEmptyString));
 		viewers.front()->onValueChange();
 	}
 	onChange();

src/gui/icon_menu.cpp

@@ -6,7 +6,8 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
-#include "icon_menu.hpp"
+#include <gui/icon_menu.hpp>
+#include <gui/util.hpp>
 
 // ----------------------------------------------------------------------------- : generateDisabledImage
 
@@ -57,12 +58,14 @@ void IconMenu::Append(int id, const String& resource, const String& text, const
 		item->SetBitmaps(bitmap, bitmap);
 		item->SetDisabledBitmap(disabledImage);
 		wxMenu::Append(item);
-	#else
-
-		// load bitmap
+	#else
+
+		// load bitmap
+
+		Bitmap bitmap = load_resource_image(resource);
 		// add menu
 		wxMenuItem* item = new wxMenuItem(this, id, text, help, style, submenu);
-		// add menu
+		item->SetBitmap(bitmap);
 		wxMenu::Append(item);
 	#endif
 }

src/gui/symbol/point_editor.cpp

@@ -8,6 +8,7 @@
 
 #include <gui/symbol/point_editor.hpp>
 #include <gui/symbol/window.hpp>
+#include <gui/util.hpp>
 #include <gfx/bezier.hpp>
 #include <data/action/symbol_part.hpp>
 #include <util/window_id.hpp>
@@ -23,10 +24,10 @@ SymbolPointEditor::SymbolPointEditor(SymbolControl* control, const SymbolPartP&
 	, selection(SELECTED_NONE)
 	, hovering(SELECTED_NONE)
 	// Load gui stock
-	, pointSelect(_("CUR_POINT"),      wxBITMAP_TYPE_CUR_RESOURCE)
-	, pointAdd   (_("CUR_POINT_ADD"),  wxBITMAP_TYPE_CUR_RESOURCE)
-	, pointCurve (_("CUR_POINT_CURVE"),wxBITMAP_TYPE_CUR_RESOURCE)
-	, pointMove  (_("CUR_POINT_MOVE"), wxBITMAP_TYPE_CUR_RESOURCE)
+	, pointSelect(load_resource_image(_("CUR_POINT")))
+	, pointAdd   (load_resource_image(_("CUR_POINT_ADD")))
+	, pointCurve (load_resource_image(_("CUR_POINT_CURVE")))
+	, pointMove  (load_resource_image(_("CUR_POINT_MOVE")))
 {
 	resetActions();
 //	// fix pen joins
@@ -526,6 +527,6 @@ SelectedHandle SymbolPointEditor::findHandle(const Vector2D& pos) {
 }
 
 bool SymbolPointEditor::inRange(const Vector2D& a, const Vector2D& b, double range) {
-	return abs(a.x - b.x) <= range &&
-	       abs(a.y - b.y) <= range;
+	return fabs(a.x - b.x) <= range &&
+	       fabs(a.y - b.y) <= range;
 }

src/gui/symbol/select_editor.cpp

@@ -20,9 +20,9 @@ DECLARE_TYPEOF_COLLECTION(SymbolPartP);
 SymbolSelectEditor::SymbolSelectEditor(SymbolControl* control, bool rotate)
 	: SymbolEditorBase(control)
 	, rotate(rotate)
-	, cursorRotate(_("CUR_ROTATE"),  wxBITMAP_TYPE_CUR_RESOURCE)
-	, cursorShearX(_("CUR_SHEAR_X"), wxBITMAP_TYPE_CUR_RESOURCE)
-	, cursorShearY(_("CUR_SHEAR_Y"), wxBITMAP_TYPE_CUR_RESOURCE)
+	, cursorRotate(load_resource_image(_("CUR_ROTATE")))
+	, cursorShearX(load_resource_image(_("CUR_SHEAR_X")))
+	, cursorShearY(load_resource_image(_("CUR_SHEAR_Y")))
 {
 	// Load resource images
 	Image rot = load_resource_image(_("HANDLE_ROTATE"));

src/gui/thumbnail_thread.cpp

@@ -17,7 +17,7 @@ DECLARE_TYPEOF_COLLECTION(pair_ThumbnailRequestP_Image);
 String user_settings_dir();
 String image_cache_dir() {
 	String dir = user_settings_dir() + _("/cache");
-	if (!wxDirExists(dir)) wxMkDir(dir);
+	if (!wxDirExists(dir)) wxMkDir(wxConvLocal.cWX2MB(dir), 0777);
 	return dir + _("/");
 }
 

src/gui/util.cpp

@@ -9,13 +9,14 @@
 #include <gui/util.hpp>
 #include <util/error.hpp>
 #include <util/rotation.hpp>
-#include <wx/mstream.h>
 #include <wx/renderer.h>
+#include <wx/stdpaths.h>
 
 #if wxUSE_UXTHEME && defined(__WXMSW__)
 	#include <wx/msw/uxtheme.h>
 	#include <tmschema.h>
 	#include <shlobj.h>
+	#include <wx/mstream.h>
 #endif
 
 // ----------------------------------------------------------------------------- : Window related
@@ -71,7 +72,7 @@ void draw_checker(RotatedDC& dc, const RealRect& rect) {
 // ----------------------------------------------------------------------------- : Image related
 
 Image load_resource_image(const String& name) {
-	#ifdef __WXMSW__
+	#if defined(__WXMSW__)
 		// Load resource
 		// based on wxLoadUserResource
 		// The image can be in an IMAGE resource, in any file format
@@ -87,6 +88,17 @@ Image load_resource_image(const String& name) {
 		int len = ::SizeofResource(wxGetInstance(), hResource);
 		wxMemoryInputStream stream(data, len);
 		return wxImage(stream);
+	#elif defined(__linux__)
+		static String path = wxStandardPaths::Get().GetDataDir() + _("/resource/");
+		String file = path + name.Lower();
+		wxImage resource (file + _(".png"), wxBITMAP_TYPE_PNG);
+		if (!resource.Ok()) resource.LoadFile (file + _(".bmp"), wxBITMAP_TYPE_BMP);
+		if (!resource.Ok()) resource.LoadFile (file + _(".ico"), wxBITMAP_TYPE_ICO);
+		if (!resource.Ok()) resource.LoadFile (file + _(".cur"), wxBITMAP_TYPE_CUR);
+		if (!resource.Ok()) throw InternalError(String::Format(_("Resource not found: %s"), name.c_str()));
+		return resource;
+	#else
+		#error Handling of resource loading needs to be declared.
 	#endif
 }
 

src/gui/value/text.cpp

@@ -7,6 +7,7 @@
 // ----------------------------------------------------------------------------- : Includes
 
 #include <gui/value/text.hpp>
+#include <gui/util.hpp>
 #include <data/action/value.hpp>
 #include <util/tagged_string.hpp>
 #include <util/window_id.hpp>
@@ -258,7 +259,7 @@ wxCursor rotated_ibeam;
 wxCursor TextValueEditor::cursor() const {
 	if (viewer.getRotation().sideways() ^ style().getRotation().sideways()) { // 90 or 270 degrees
 		if (!rotated_ibeam.Ok()) {
-			rotated_ibeam = wxCursor(_("CUR_ROT_IBEAM"));
+			rotated_ibeam = wxCursor(load_resource_image(_("CUR_ROT_IBEAM")));
 		}
 		return rotated_ibeam;
 	} else {

src/gui/welcome_window.cpp

@@ -26,12 +26,12 @@ WelcomeWindow::WelcomeWindow()
 	SetIcon(wxIcon(_("ICON_APP")));
 	
 	// init controls
-	wxButton* new_set   = new HoverButtonExt(this, ID_FILE_NEW,    _("WELCOME_NEW"),  _BUTTON_("new set"),  _HELP_("new set"));
-	wxButton* open_set  = new HoverButtonExt(this, ID_FILE_OPEN,   _("WELCOME_OPEN"), _BUTTON_("open set"), _HELP_("open set"));
+	wxButton* new_set   = new HoverButtonExt(this, ID_FILE_NEW,    load_resource_image(_("WELCOME_NEW")),  _BUTTON_("new set"),  _HELP_("new set"));
+	wxButton* open_set  = new HoverButtonExt(this, ID_FILE_OPEN,   load_resource_image(_("WELCOME_OPEN")), _BUTTON_("open set"), _HELP_("open set"));
 	wxButton* open_last = 0;
 	if (!settings.recent_sets.empty()) {
 		wxFileName n(settings.recent_sets.front());
-		open_last       = new HoverButtonExt(this, ID_FILE_RECENT, _("WELCOME_LAST"), _BUTTON_("last opened set"), _("Open '") + n.GetName() + _("'"));
+		open_last       = new HoverButtonExt(this, ID_FILE_RECENT, load_resource_image(_("WELCOME_LAST")), _BUTTON_("last opened set"), _("Open '") + n.GetName() + _("'"));
 	}
 	
 	wxSizer* s1  = new wxBoxSizer(wxHORIZONTAL);
@@ -105,19 +105,20 @@ END_EVENT_TABLE  ()
 
 // ----------------------------------------------------------------------------- : Hover button with label
 
-HoverButtonExt::HoverButtonExt(Window* parent, int id, const String& icon_name, const String& label, const String& sub_label)
+HoverButtonExt::HoverButtonExt(Window* parent, int id, const wxImage& icon, const String& label, const String& sub_label)
 	: HoverButton(parent, id, _("BTN"))
-	, icon(load_resource_image(icon_name))
+	, icon(icon)
 	, label(label), sub_label(sub_label)
 	, font_large(14, wxSWISS, wxNORMAL, wxNORMAL, false, _("Arial"))
 	, font_small(8,  wxSWISS, wxNORMAL, wxNORMAL, false, _("Arial"))
 {}
 
 void HoverButtonExt::draw(DC& dc) {
+	handle_error(Error(_("HEYA")));
 	// draw button
 	HoverButton::draw(dc);
 	// icon
-	if (icon.Ok()) dc.DrawBitmap(icon, 7, 7);
+	if (icon.Ok()) dc.DrawBitmap(icon, 7, 7); else handle_error(Error(_("Error drawing button bitmaps")));
 	// text
 	dc.SetTextForeground(*wxBLACK);
 	dc.SetFont(font_large);

src/gui/welcome_window.hpp

@@ -51,7 +51,7 @@ class WelcomeWindow : public Frame {
 /// An extended hover button, not only has base images, but also has two labels
 class HoverButtonExt : public HoverButton {
   public:
-	HoverButtonExt(Window* parent, int id, const String& icon_name, const String& label, const String& sub_label);
+	HoverButtonExt(Window* parent, int id, const wxImage& icon_name, const String& label, const String& sub_label);
 	
   private:
 	Bitmap icon;

src/script/functions.cpp

@@ -392,8 +392,8 @@ bool equal(const ScriptValue& a, const ScriptValue& b) {
 		// HACK for ScriptObject<shared_ptr<X> >
 		// assumes different types are layed out the same, and that
 		// should be void*, but then we need getMember for void
-		const ScriptObject<int*>& av = reinterpret_cast<const ScriptObject<int*>&>(a);
-		const ScriptObject<int*>& bv = reinterpret_cast<const ScriptObject<int*>&>(b);
+		const ScriptObject<int*>& av = dynamic_cast<const ScriptObject<int*>&>(a);
+		const ScriptObject<int*>& bv = dynamic_cast<const ScriptObject<int*>&>(b);
 		return av.getValue() == bv.getValue();
 	}
 	return &a == &b;
@@ -565,7 +565,7 @@ ScriptValueP ScriptBuildin_combined_editor::dependencies(Context& ctx, const Dep
 			}
 		}
 	}
-	SCRIPT_RETURN(dependency_dummy);
+	return dependency_dummy;
 }
 
 

src/script/script.cpp

@@ -64,22 +64,22 @@ void Script::addInstruction(InstructionType t) {
 	//	// optimize: push x ; member_v -->  member x
 	//	instructions.back().instr = I_MEMBER;
 	//} else {
-	Instruction i = {t, 0};
+	Instruction i = {t, {0}};
 	instructions.push_back(i);
 	//}
 }
 void Script::addInstruction(InstructionType t, unsigned int d) {
-	Instruction i = {t, d};
+	Instruction i = {t, {d}};
 	instructions.push_back(i);
 }
 void Script::addInstruction(InstructionType t, const ScriptValueP& c) {
 	constants.push_back(c);
-	Instruction i = {t, (unsigned int)constants.size() - 1};
+	Instruction i = {t, {(unsigned int)constants.size() - 1}};
 	instructions.push_back(i);
 }
 void Script::addInstruction(InstructionType t, const String& s) {
 	constants.push_back(toScript(s));
-	Instruction i = {t, (unsigned int)constants.size() - 1};
+	Instruction i = {t, {(unsigned int)constants.size() - 1}};
 	instructions.push_back(i);
 }
 

src/script/scriptable.hpp

@@ -132,7 +132,6 @@ class Scriptable {
 	DECLARE_REFLECTION();
 };
 
-
 // we need some custom io, because the behaviour is different for each of Reader/Writer/GetMember
 
 template <typename T>

src/script/value.hpp

@@ -12,6 +12,7 @@
 #include <util/prec.hpp>
 #include <util/reflect.hpp>
 #include <util/error.hpp>
+#include <util/io/get_member.hpp>
 class Context;
 class Dependency;
 

src/util/io/get_member.cpp

@@ -11,9 +11,9 @@
 #include <script/value.hpp>
 #include <script/script.hpp>
 
-// ----------------------------------------------------------------------------- : GetDefaultMember
+// ---------------------------------------------------------------------------- : GetDefaultMember
 
-template <> void GetDefaultMember::handle(const Char* const&  v) { value = toScript(v); }
+            void GetDefaultMember::handle(const Char*         v) { value = toScript(v); }
 template <> void GetDefaultMember::handle(const String&       v) { value = toScript(v); }
 template <> void GetDefaultMember::handle(const FileName&     v) { value = toScript(v); }
 template <> void GetDefaultMember::handle(const int&          v) { value = toScript(v); }

src/util/io/get_member.hpp

@@ -10,7 +10,9 @@
 // ----------------------------------------------------------------------------- : Includes
 
 #include <util/prec.hpp>
-#include <script/value.hpp>
+
+class Script;
+class ScriptValue;
 
 DECLARE_INTRUSIVE_POINTER_TYPE(ScriptValue);
 DECLARE_INTRUSIVE_POINTER_TYPE(Script);
@@ -39,13 +41,14 @@ class GetDefaultMember {
 	/// Handle an object: we don't match things with a name
 	template <typename T>
 	void handle(const Char* name, const T& object) {}
-	
+
 	/// Handle an object: investigate children, or store it if we know how
+	                                  void handle(const Char *);
 	template <typename T>             void handle(const T&);
 	
 	/// Handle a Defaultable: investigate children
 	template <typename T>             void handle(const Defaultable<T>&);
-	template <typename T>             void handle(const Scriptable<T>&);
+	template <typename T>             void handle(const Scriptable<T>& );
 	template <typename T>             void handle(const vector<T>&     c) { value = toScript(&c); }
 	template <typename K, typename V> void handle(const map<K,V>&      c) { value = toScript(&c); }
 	template <typename K, typename V> void handle(const IndexMap<K,V>& c) { value = toScript(&c); }

src/util/smart_ptr.hpp

@@ -137,7 +137,7 @@ inline shared_ptr<T> new_shared7(const A0& a0, const A1& a1, const A2& a2, const
 	
 	class IntrusivePtrBase {
 	  public:
-		virtual ~IntrusivePtrBase();
+		virtual ~IntrusivePtrBase() {};
 	  protected:
 		/// Delete this object
 		virtual void destroy() {