diff --git a/fix.bat b/fix.bat
deleted file mode 100644
index 68229fd0f..000000000
--- a/fix.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@echo off
-
-notepad makefile.cfg
diff --git a/fix.sh b/fix.sh
deleted file mode 100755
index e75b4dc19..000000000
--- a/fix.sh
+++ /dev/null
@@ -1,124 +0,0 @@
-#! /bin/bash
-
-readln()
-{
-  echo -n "$1 [$2] "
-  read ans
-  if [ X"$ans" = X"" ] ; then ans="$2" ; fi
-}
-
-######################################################################
-# platform
-
-readln "What platform (linux/macosx/mingw)?" "linux"
-platform=$ans
-
-######################################################################
-# debug info
-
-readln "Do you want debug ASE (y/n)?" "n"
-debug=$ans
-
-######################################################################
-# profile info
-
-readln "Do you want profile ASE (y/n)?" "n"
-profile=$ans
-
-######################################################################
-# memory leaks
-
-readln "Do you want to check memory leaks (y/n)?" "n"
-memleak=$ans
-
-######################################################################
-# prefix
-
-if [ X"$platform" = X"linux" ] ; then
-  readln "Where do you want install ASE by default?" "/usr/local"
-  prefix=$ans
-else
-  prefix=""
-fi
-
-######################################################################
-# show information
-
-case "$platform" in
-  "linux"   ) platform_name="Linux" ;;
-  "macosx"  ) platform_name="Mac OS X" ;;
-  "mingw"   ) platform_name="Windows (Mingw32)" ;;
-  "*"       ) exit ;;
-esac
-
-echo "ASE configured:"
-
-echo "  Platform:		$platform_name"
-
-echo -n "  Debug suppport:	"
-if [ X"$debug" = X"y" ] ; then echo "yes" ; else echo "no" ; fi
-
-echo -n "  Profile suppport:	"
-if [ X"$profile" = X"y" ] ; then echo "yes" ; else echo "no" ; fi
-
-echo -n "  Check memory leaks:	"
-if [ X"$memleak" = X"y" ] ; then echo "yes" ; else echo "no" ; fi
-
-if [ X"$prefix" != X"" ] ; then
-  echo "  Prefix:		$prefix"
-fi
-
-echo ""
-readln "Is it right (y/n)?" "y"
-if [ X"$ans" != X"y" ] ; then exit ; fi
-
-######################################################################
-# generate the makefile
-
-case "$platform" in
-  "linux"   ) makefile_name="makefile.linux" ;;
-  "macosx"  ) makefile_name="makefile.macosx" ;;
-  "mingw"   ) makefile_name="makefile.mingw" ;;
-  "*"       ) exit ;;
-esac
-
-gen_makefile()
-{
-  makefile=$1
-
-  echo -n "creating $makefile..."
-
-  if [ -f $makefile ] ; then
-    mv $makefile $makefile~
-    echo " (backup in $makefile~)"
-  else
-    echo ""
-  fi
-
-  echo "# Makefile for $platform_name generated with fix.sh" > $makefile
-  echo "" >> $makefile
-  if [ X"$2" = X"conf" ] ; then
-      echo "CONFIGURED = 1" >> $makefile
-      echo "" >> $makefile
-  fi
-
-  if [ X"$debug" = X"y" ] ; then echo -n "#" >> $makefile ; fi
-  echo "RELEASE = 1" >> $makefile
-
-  if [ X"$debug" != X"y" ] ; then echo -n "#" >> $makefile ; fi
-  echo "DEBUGMODE = 1" >> $makefile
-
-  if [ X"profile" != X"y" ] ; then echo -n "#" >> $makefile ; fi
-  echo "PROFILE = 1" >> $makefile
-
-  if [ X"memleak" != X"y" ] ; then echo -n "#" >> $makefile ; fi
-  echo "MEMLEAK = 1" >> $makefile
-
-  if [ X"$prefix" = X"" ] ; then echo -n "#" >> $makefile ; fi
-  echo "DEFAULT_PREFIX = \"$prefix\"" >> $makefile
-
-  echo "" >> $makefile
-  echo "include $makefile_name" >> $makefile
-}
-
-gen_makefile makefile conf
diff --git a/makefile.cfg b/makefile.cfg
deleted file mode 100644
index db92ef7c9..000000000
--- a/makefile.cfg
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (C) 2001-2010 by David Capello		-*-Makefile-*-
-# Manual configuration
-# (in Unix like systems you can use ./fix.sh script)
-
-######################################################################
-# Uncomment this line to compile
-
-#CONFIGURED = 1
-
-######################################################################
-# Uncomment this if you want to debug or profile information
-
-#RELEASE = 1
-#DEBUGMODE = 1
-#PROFILE = 1
-#MEMLEAK = 1
-#STATIC_ALLEG_LINK = 1
-#HAVE_RESIZE_PATCH = 1
-
-######################################################################
-# Default Unix directory to look for ASE data (to this path will be
-# added "share/ase/")
-
-#DEFAULT_PREFIX = /usr/local
-
-######################################################################
-# Uncomment if you want to use special features
-
-#USE_MMX_ASM=1
-#USE_SSE_ASM=1
diff --git a/makefile.gcc b/makefile.gcc
deleted file mode 100644
index 69130b2f6..000000000
--- a/makefile.gcc
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright (C) 2001-2010 by David Capello		-*-Makefile-*-
-
-.PHONY = _default
-_default: default
-
-######################################################################
-# Setup CFLAGS and LFLAGS for GCC
-
-CFLAGS += -Wall -I. -Isrc -Ithird_party		\
-	  -I$(LIBFREETYPE_DIR)/include		\
-	  -I$(LIBJPEG_DIR)			\
-	  -I$(LIBPNG_DIR)			\
-	  -I$(ZLIB_DIR)				\
-	  -I$(LOADPNG_DIR)			\
-	  -I$(TINYXML_DIR)			\
-	  -I$(VACA_DIR)/include			\
-	  -Wno-deprecated-declarations		\
-	  -DPNG_NO_MMX_CODE			\
-	  -DVACA_ALLEGRO
-
-LFLAGS += $(THIRD_PARTY_LIBS)
-
-ifdef PROFILE
-  CFLAGS += -pg -O3 -DNDEBUG
-  LFLAGS += -pg -O3 -DNDEBUG
-else
-ifdef DEBUGMODE
-  CFLAGS += -g3 -DDEBUGMODE
-  LFLAGS += -g3
-else
-  CFLAGS += -s -O3 -DNDEBUG
-  LFLAGS += -s -O3 -DNDEBUG
-endif
-endif
-
-ifdef MEMLEAK
-  CFLAGS += -DMEMLEAK
-endif
-
-ifdef DEFAULT_PREFIX
-  CFLAGS += -DDEFAULT_PREFIX="\"$(DEFAULT_PREFIX)\""
-endif
-
-ifdef USE_MMX_ASM
-  CFLAGS += -mmmx
-endif
-
-ifdef USE_SSE_ASM
-  CFLAGS += -msse
-endif
-
-ifdef HAVE_RESIZE_PATCH
-  CFLAGS += -DHAVE_RESIZE_PATCH
-endif
-
-######################################################################
-# Rules to make third party libraries
-
-$(LIBART_LIB): $(LIBART_OBJS)
-	-rm -f $@
-	ar rs $@ $^
-
-$(LIBFREETYPE_LIB): $(LIBFREETYPE_OBJS)
-	-rm -f $@
-	ar rs $@ $^
-
-$(LIBGD_LIB): $(LIBGD_OBJS)
-	-rm -f $@
-	ar rs $@ $^
-
-$(LIBJPEG_LIB): $(LIBJPEG_OBJS)
-	-rm -f $@
-	ar rs $@ $^
-
-$(LIBPNG_LIB): $(LIBPNG_OBJS)
-	-rm -f $@
-	ar rs $@ $^
-
-$(ZLIB_LIB): $(ZLIB_OBJS)
-	-rm -f $@
-	ar rs $@ $^
-
-$(LOADPNG_LIB): $(LOADPNG_OBJS)
-	-rm -f $@
-	ar rs $@ $^
-
-$(TINYXML_LIB): $(TINYXML_OBJS)
-	-rm -f $@
-	ar rs $@ $^
-
-$(VACA_LIB): $(VACA_OBJS)
-	-rm -f $@
-	ar rs $@ $^
-
-######################################################################
-# Rules to build objects and the application
-
-VPATH = src					\
-	src/app					\
-	src/commands				\
-	src/commands/fx				\
-	src/console				\
-	src/core				\
-	src/dialogs				\
-	src/effect				\
-	src/file				\
-	src/file/fli				\
-	src/file/gif				\
-	src/intl				\
-	src/jinete				\
-	src/jinete/themes			\
-	src/modules				\
-	src/raster				\
-	src/raster/x86				\
-	src/settings				\
-	src/tools				\
-	src/util				\
-	src/widgets				\
-	src/widgets/editor			\
-	$(LIBART_DIR)				\
-	$(LIBFREETYPE_DIR)/src/base		\
-	$(LIBFREETYPE_DIR)/src/autohint		\
-	$(LIBFREETYPE_DIR)/src/cache		\
-	$(LIBFREETYPE_DIR)/src/cff		\
-	$(LIBFREETYPE_DIR)/src/cid		\
-	$(LIBFREETYPE_DIR)/src/pcf		\
-	$(LIBFREETYPE_DIR)/src/psaux		\
-	$(LIBFREETYPE_DIR)/src/pshinter		\
-	$(LIBFREETYPE_DIR)/src/psnames		\
-	$(LIBFREETYPE_DIR)/src/raster		\
-	$(LIBFREETYPE_DIR)/src/sfnt		\
-	$(LIBFREETYPE_DIR)/src/smooth		\
-	$(LIBFREETYPE_DIR)/src/truetype		\
-	$(LIBFREETYPE_DIR)/src/type1		\
-	$(LIBFREETYPE_DIR)/src/winfonts		\
-	$(LIBGD_DIR)				\
-	$(LIBJPEG_DIR)				\
-	$(LIBPNG_DIR)				\
-	$(ZLIB_DIR)				\
-	$(LOADPNG_DIR)				\
-	$(TINYXML_DIR)				\
-	$(VACA_DIR)/src
-
-ASE_DEPS = $(ASE_OBJS) $(THIRD_PARTY_LIBS)
-
-######################################################################
-# Rules to build the object files
-
-$(OBJ_DIR)/%$(OBJ): %.cpp
-	$(CPP) $(CFLAGS) -o $@ -c $<
-
-$(OBJ_DIR)/%$(OBJ): %.s
-	$(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
-
-$(OBJ_DIR)/art.%$(OBJ): %.c
-	$(CC) $(CFLAGS) -o $@ -c $<
-
-$(OBJ_DIR)/freetype.%$(OBJ): %.c
-	$(CC) $(CFLAGS) -o $@ -c $<
-
-$(OBJ_DIR)/gd.%$(OBJ): %.c
-	$(CC) $(CFLAGS) -DNONDLL -DHAVE_CONFIG_H -o $@ -c $<
-
-$(OBJ_DIR)/jpeg.%$(OBJ): %.c
-	$(CC) $(CFLAGS) -o $@ -c $<
-
-$(OBJ_DIR)/png.%$(OBJ): %.c
-	$(CC) $(CFLAGS) -I$(LIBPNG_DIR) -o $@ -c $<
-
-$(OBJ_DIR)/zlib.%$(OBJ): %.c
-	$(CC) $(CFLAGS) -o $@ -c $<
-
-$(OBJ_DIR)/loadpng.%$(OBJ): %.c
-	$(CC) $(CFLAGS) -o $@ -c $<
-
-$(OBJ_DIR)/tinyxml.%$(OBJ): %.cpp
-	$(CPP) $(CFLAGS) -o $@ -c $<
-
-$(OBJ_DIR)/vaca.%$(OBJ): %.cpp
-	$(CPP) $(CFLAGS) -o $@ -c $<
-
-######################################################################
-# Application
-
-ifndef WITHICON
-$(ASE): $(ASE_DEPS)
-	$(CPP) -o $@ $(ASE_OBJS) $(LFLAGS) $(LFLAGS_LAST)
-else
-$(OBJ_DIR)/%.res: src/%.rc
-	$(WINDRES) -O coff -o $@ -i $<
-
-$(ASE): $(ASE_DEPS) $(OBJ_DIR)/resources_win32.res
-	$(CPP) -o $@ $(ASE_OBJS) $(OBJ_DIR)/resources_win32.res $(LFLAGS) $(LFLAGS_LAST)
-endif
-
-######################################################################
-# Rules to make tests
-
-src/tests/%$(EXE): src/tests/%.cpp $(COMMON_OBJS)
-	$(CPP) $(CFLAGS) -o $@ $^ $(LFLAGS) $(LFLAGS_LAST)
-
-src/tests/raster/%$(EXE): src/tests/raster/%.cpp $(COMMON_OBJS)
-	$(CPP) $(CFLAGS) -o $@ $^ $(LFLAGS) $(LFLAGS_LAST)
-
-src/tests/jinete/%$(EXE): src/tests/jinete/%.cpp $(COMMON_OBJS)
-	$(CPP) $(CFLAGS) -o $@ $^ $(LFLAGS) $(LFLAGS_LAST)
-
-tests: $(TESTS)
-
-runtests: $(AUTOTESTS)
-	@-$(foreach TEST, $(AUTOTESTS), \
-		echo Running ./$(TEST) ... ; \
-		if ./$(TEST) ; then \
-			echo " - OK" ; \
-		else \
-			echo " - *FAIL*" ; \
-		fi ; \
-	   )
diff --git a/makefile.linux b/makefile.linux
deleted file mode 100644
index 8b02fafba..000000000
--- a/makefile.linux
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright (C) 2001-2010 by David Capello		-*-Makefile-*-
-
-ifndef CONFIGURED
-include makefile.cfg
-endif
-
-.PHONY = cfgtest
-
-ifndef CONFIGURED
-cfgtest:
-	@echo You must configure ASE: edit \"makefile.cfg\" or run \"fix.sh\" script
-endif
-
-######################################################################
-# Flags for GCC in GNU/Linux system
-
-ifdef DEBUGMODE
-CFLAGS = `allegro-config --cflags debug`
-LFLAGS = `allegro-config --libs debug`
-else
-CFLAGS = `allegro-config --cflags`
-LFLAGS = `allegro-config --libs`
-endif
-
-######################################################################
-# GCC stuff
-
-CC = gcc
-CPP = g++
-OBJ = .o
-EXE =
-LIB_EXT = .a
-OBJ_DIR = obj/unix
-SUBMAKEFILE = makefile.linux
-
-include makefile.lst
-include makefile.gcc
-
-######################################################################
-# General rules
-
-.PHONY = default all clean distclean install uninstall
-
-default: all
-
-all: $(ASE)
-
-clean:
-	-rm -f $(ALL_OBJS) $(THIRD_PARTY_LIBS)
-
-distclean: clean
-	-rm -f $(ASE)
-
-install:
-	cp aseprite $(DESTDIR)$(DEFAULT_PREFIX)/bin
-	cp -r data $(DESTDIR)$(DEFAULT_PREFIX)/share/ase
-	cp -r docs $(DESTDIR)$(DEFAULT_PREFIX)/share/ase
-	cp README.html $(DESTDIR)$(DEFAULT_PREFIX)/share/ase
-
-uninstall:
-	-rm  -vf $(DESTDIR)$(DEFAULT_PREFIX)/bin/aseprite
-	-rm -rvf $(DESTDIR)$(DEFAULT_PREFIX)/share/ase
-
--include makefile.dep
diff --git a/makefile.lst b/makefile.lst
deleted file mode 100644
index 90493253a..000000000
--- a/makefile.lst
+++ /dev/null
@@ -1,565 +0,0 @@
-# Copyright (C) 2001-2010 by David Capello		-*-Makefile-*-
-
-######################################################################
-# ASE
-
-ASE = aseprite$(EXE)
-
-COMMON_SOURCES =					\
-	src/app.cpp					\
-	src/ase_exception.cpp				\
-	src/check_args.cpp				\
-	src/console.cpp					\
-	src/context.cpp					\
-	src/gfxmode.cpp					\
-	src/launcher.cpp				\
-	src/mem_utils.cpp				\
-	src/recent_files.cpp				\
-	src/resource_finder.cpp				\
-	src/ui_context.cpp				\
-	src/undoable.cpp				\
-	src/xml_widgets.cpp				\
-	src/app/color.cpp				\
-	src/app/color_utils.cpp				\
-	src/commands/cmd_about.cpp			\
-	src/commands/cmd_advanced_mode.cpp		\
-	src/commands/cmd_background_from_layer.cpp	\
-	src/commands/cmd_canvas_size.cpp		\
-	src/commands/cmd_cel_properties.cpp		\
-	src/commands/cmd_change_color.cpp		\
-	src/commands/cmd_change_image_type.cpp		\
-	src/commands/cmd_change_pen.cpp			\
-	src/commands/cmd_check_updates.cpp		\
-	src/commands/cmd_clear.cpp			\
-	src/commands/cmd_close_file.cpp			\
-	src/commands/cmd_configure_screen.cpp		\
-	src/commands/cmd_configure_tools.cpp		\
-	src/commands/cmd_copy.cpp			\
-	src/commands/cmd_copy_cel.cpp			\
-	src/commands/cmd_crop.cpp			\
-	src/commands/cmd_cut.cpp			\
-	src/commands/cmd_deselect_mask.cpp		\
-	src/commands/cmd_donate.cpp			\
-	src/commands/cmd_duplicate_layer.cpp		\
-	src/commands/cmd_duplicate_sprite.cpp		\
-	src/commands/cmd_exit.cpp			\
-	src/commands/cmd_eyedropper.cpp			\
-	src/commands/cmd_film_editor.cpp		\
-	src/commands/cmd_flatten_layers.cpp		\
-	src/commands/cmd_flip.cpp			\
-	src/commands/cmd_frame_properties.cpp		\
-	src/commands/cmd_goto_frame.cpp			\
-	src/commands/cmd_goto_layer.cpp			\
-	src/commands/cmd_grid.cpp			\
-	src/commands/cmd_invert_mask.cpp		\
-	src/commands/cmd_layer_from_background.cpp	\
-	src/commands/cmd_layer_properties.cpp		\
-	src/commands/cmd_load_mask.cpp			\
-	src/commands/cmd_mask_all.cpp			\
-	src/commands/cmd_mask_by_color.cpp		\
-	src/commands/cmd_merge_down_layer.cpp		\
-	src/commands/cmd_move_cel.cpp			\
-	src/commands/cmd_new_file.cpp			\
-	src/commands/cmd_new_frame.cpp			\
-	src/commands/cmd_new_layer.cpp			\
-	src/commands/cmd_new_layer_set.cpp		\
-	src/commands/cmd_open_file.cpp			\
-	src/commands/cmd_options.cpp			\
-	src/commands/cmd_palette_editor.cpp		\
-	src/commands/cmd_paste.cpp			\
-	src/commands/cmd_play_animation.cpp		\
-	src/commands/cmd_preview.cpp			\
-	src/commands/cmd_quick_reference.cpp		\
-	src/commands/cmd_redo.cpp			\
-	src/commands/cmd_refresh.cpp			\
-	src/commands/cmd_remove_cel.cpp			\
-	src/commands/cmd_remove_frame.cpp		\
-	src/commands/cmd_remove_layer.cpp		\
-	src/commands/cmd_reselect_mask.cpp		\
-	src/commands/cmd_rotate_canvas.cpp		\
-	src/commands/cmd_save_file.cpp			\
-	src/commands/cmd_save_mask.cpp			\
-	src/commands/cmd_screen_shot.cpp		\
-	src/commands/cmd_select_file.cpp		\
-	src/commands/cmd_sprite_editor.cpp		\
-	src/commands/cmd_sprite_properties.cpp		\
-	src/commands/cmd_sprite_size.cpp		\
-	src/commands/cmd_switch_colors.cpp		\
-	src/commands/cmd_undo.cpp			\
-	src/commands/command.cpp			\
-	src/commands/commands.cpp			\
-	src/commands/fx/cmd_color_curve.cpp		\
-	src/commands/fx/cmd_convolution_matrix.cpp	\
-	src/commands/fx/cmd_despeckle.cpp		\
-	src/commands/fx/cmd_invert_color.cpp		\
-	src/commands/fx/cmd_replace_color.cpp		\
-	src/commands/fx/effectbg.cpp			\
-	src/core/cfg.cpp				\
-	src/core/config.cpp				\
-	src/core/core.cpp				\
-	src/core/drop_files.cpp				\
-	src/core/file_system.cpp			\
-	src/core/job.cpp				\
-	src/core/modules.cpp				\
-	src/dialogs/aniedit.cpp				\
-	src/dialogs/drawtext.cpp			\
-	src/dialogs/filesel.cpp				\
-	src/dialogs/maskcol.cpp				\
-	src/dialogs/playfli.cpp				\
-	src/dialogs/repo.cpp				\
-	src/dialogs/vectmap.cpp				\
-	src/effect/colcurve.cpp				\
-	src/effect/convmatr.cpp				\
-	src/effect/effect.cpp				\
-	src/effect/images_ref.cpp			\
-	src/effect/invrtcol.cpp				\
-	src/effect/median.cpp				\
-	src/effect/replcol.cpp				\
-	src/file/ase_format.cpp				\
-	src/file/bmp_format.cpp				\
-	src/file/file.cpp				\
-	src/file/fli/fli.cpp				\
-	src/file/fli_format.cpp				\
-	src/file/format_options.cpp			\
-	src/file/gif/format.cpp				\
-	src/file/gif/lzw.cpp				\
-	src/file/gif_format.cpp				\
-	src/file/ico_format.cpp				\
-	src/file/jpeg_format.cpp			\
-	src/file/pcx_format.cpp				\
-	src/file/png_format.cpp				\
-	src/file/tga_format.cpp				\
-	src/intl/intl.cpp				\
-	src/intl/msgids.cpp				\
-	src/jinete/jaccel.cpp				\
-	src/jinete/jalert.cpp				\
-	src/jinete/jbox.cpp				\
-	src/jinete/jbutton.cpp				\
-	src/jinete/jclipboard.cpp			\
-	src/jinete/jcombobox.cpp			\
-	src/jinete/jcustom_label.cpp			\
-	src/jinete/jdraw.cpp				\
-	src/jinete/jentry.cpp				\
-	src/jinete/jexception.cpp			\
-	src/jinete/jfont.cpp				\
-	src/jinete/jfontbmp.cpp				\
-	src/jinete/jgrid.cpp				\
-	src/jinete/jhook.cpp				\
-	src/jinete/jimage.cpp				\
-	src/jinete/jinete.cpp				\
-	src/jinete/jintern.cpp				\
-	src/jinete/jlabel.cpp				\
-	src/jinete/jlink_label.cpp			\
-	src/jinete/jlist.cpp				\
-	src/jinete/jlistbox.cpp				\
-	src/jinete/jmanager.cpp				\
-	src/jinete/jmem.cpp				\
-	src/jinete/jmenu.cpp				\
-	src/jinete/jmessage.cpp				\
-	src/jinete/jpanel.cpp				\
-	src/jinete/jpopup_window.cpp			\
-	src/jinete/jquickmenu.cpp			\
-	src/jinete/jrect.cpp				\
-	src/jinete/jregion.cpp				\
-	src/jinete/jsep.cpp				\
-	src/jinete/jslider.cpp				\
-	src/jinete/jstream.cpp				\
-	src/jinete/jstring.cpp				\
-	src/jinete/jsystem.cpp				\
-	src/jinete/jtextbox.cpp				\
-	src/jinete/jtheme.cpp				\
-	src/jinete/jthread.cpp				\
-	src/jinete/jtooltips.cpp			\
-	src/jinete/jview.cpp				\
-	src/jinete/jwidget.cpp				\
-	src/jinete/jwindow.cpp				\
-	src/jinete/themes/jstandard_theme.cpp		\
-	src/modules/editors.cpp				\
-	src/modules/gfx.cpp				\
-	src/modules/gui.cpp				\
-	src/modules/palettes.cpp			\
-	src/modules/rootmenu.cpp			\
-	src/modules/skinneable_theme.cpp		\
-	src/raster/algo.cpp				\
-	src/raster/algofill.cpp				\
-	src/raster/algo_polygon.cpp			\
-	src/raster/blend.cpp				\
-	src/raster/cel.cpp				\
-	src/raster/dirty.cpp				\
-	src/raster/gfxobj.cpp				\
-	src/raster/image.cpp				\
-	src/raster/layer.cpp				\
-	src/raster/mask.cpp				\
-	src/raster/palette.cpp				\
-	src/raster/path.cpp				\
-	src/raster/pen.cpp				\
-	src/raster/quant.cpp				\
-	src/raster/rgbmap.cpp				\
-	src/raster/rotate.cpp				\
-	src/raster/sprite.cpp				\
-	src/raster/stock.cpp				\
-	src/raster/undo.cpp				\
-	src/settings/ui_settings_impl.cpp		\
-	src/tools/tool.cpp				\
-	src/tools/toolbox.cpp				\
-	src/util/autocrop.cpp				\
-	src/util/boundary.cpp				\
-	src/util/celmove.cpp				\
-	src/util/clipboard.cpp				\
-	src/util/col_file.cpp				\
-	src/util/filetoks.cpp				\
-	src/util/hash.cpp				\
-	src/util/misc.cpp				\
-	src/util/msk_file.cpp				\
-	src/util/pic_file.cpp				\
-	src/util/quantize.cpp				\
-	src/util/recscr.cpp				\
-	src/util/render.cpp				\
-	src/util/thmbnail.cpp				\
-	src/widgets/color_bar.cpp			\
-	src/widgets/color_button.cpp			\
-	src/widgets/color_selector.cpp			\
-	src/widgets/colview.cpp				\
-	src/widgets/curvedit.cpp			\
-	src/widgets/editor/click.cpp			\
-	src/widgets/editor/cursor.cpp			\
-	src/widgets/editor/editor.cpp			\
-	src/widgets/editor/keys.cpp			\
-	src/widgets/editor/pixels_movement.cpp		\
-	src/widgets/fileview.cpp			\
-	src/widgets/groupbut.cpp			\
-	src/widgets/menuitem.cpp			\
-	src/widgets/paledit.cpp				\
-	src/widgets/preview.cpp				\
-	src/widgets/statebar.cpp			\
-	src/widgets/tabs.cpp				\
-	src/widgets/target.cpp				\
-	src/widgets/toolbar.cpp
-
-COMMON_OBJS = $(addprefix $(OBJ_DIR)/,				\
-	        $(addsuffix $(OBJ),				\
-	          $(notdir $(basename $(COMMON_SOURCES)))))
-
-ASE_SOURCES = \
-	src/main.cpp						\
-	$(COMMON_SOURCES)
-
-ASE_OBJS = $(addprefix $(OBJ_DIR)/,				\
-	     $(addsuffix $(OBJ),				\
-	       $(notdir $(basename $(ASE_SOURCES)))))
-
-######################################################################
-# Libart
-
-LIBART_LIB = $(OBJ_DIR)/libart$(LIB_EXT)
-LIBART_DIR = third_party/libart_lgpl
-LIBART_SOURCES =				\
-	$(LIBART_DIR)/art_affine.c		\
-	$(LIBART_DIR)/art_alphagamma.c		\
-	$(LIBART_DIR)/art_bpath.c		\
-	$(LIBART_DIR)/art_gray_svp.c		\
-	$(LIBART_DIR)/art_misc.c		\
-	$(LIBART_DIR)/art_pixbuf.c		\
-	$(LIBART_DIR)/art_rect.c		\
-	$(LIBART_DIR)/art_rect_svp.c		\
-	$(LIBART_DIR)/art_rect_uta.c		\
-	$(LIBART_DIR)/art_render.c		\
-	$(LIBART_DIR)/art_render_gradient.c	\
-	$(LIBART_DIR)/art_render_svp.c		\
-	$(LIBART_DIR)/art_rgba.c		\
-	$(LIBART_DIR)/art_rgb_affine.c		\
-	$(LIBART_DIR)/art_rgb_affine_private.c	\
-	$(LIBART_DIR)/art_rgb_bitmap_affine.c	\
-	$(LIBART_DIR)/art_rgb.c			\
-	$(LIBART_DIR)/art_rgb_pixbuf_affine.c	\
-	$(LIBART_DIR)/art_rgb_rgba_affine.c	\
-	$(LIBART_DIR)/art_rgb_svp.c		\
-	$(LIBART_DIR)/art_svp.c			\
-	$(LIBART_DIR)/art_svp_ops.c		\
-	$(LIBART_DIR)/art_svp_point.c		\
-	$(LIBART_DIR)/art_svp_render_aa.c	\
-	$(LIBART_DIR)/art_svp_vpath.c		\
-	$(LIBART_DIR)/art_svp_vpath_stroke.c	\
-	$(LIBART_DIR)/art_svp_wind.c		\
-	$(LIBART_DIR)/art_uta.c			\
-	$(LIBART_DIR)/art_uta_ops.c		\
-	$(LIBART_DIR)/art_uta_rect.c		\
-	$(LIBART_DIR)/art_uta_svp.c		\
-	$(LIBART_DIR)/art_uta_vpath.c		\
-	$(LIBART_DIR)/art_vpath_bpath.c		\
-	$(LIBART_DIR)/art_vpath.c		\
-	$(LIBART_DIR)/art_vpath_dash.c		\
-	$(LIBART_DIR)/art_vpath_svp.c		\
-	$(LIBART_DIR)/libart-features.c
-
-LIBART_OBJS = $(addprefix $(OBJ_DIR)/art.,					\
-			  $(addsuffix $(OBJ),					\
-				      $(notdir $(basename $(LIBART_SOURCES)))))
-
-######################################################################
-# Freetype
-
-LIBFREETYPE_LIB = $(OBJ_DIR)/libfreetype$(LIB_EXT)
-LIBFREETYPE_DIR = third_party/freetype
-LIBFREETYPE_SOURCES =					\
-	$(LIBFREETYPE_DIR)/src/base/ftsystem.c		\
-	$(LIBFREETYPE_DIR)/src/base/ftdebug.c		\
-	$(LIBFREETYPE_DIR)/src/base/ftinit.c		\
-	$(LIBFREETYPE_DIR)/src/base/ftbase.c		\
-	$(LIBFREETYPE_DIR)/src/base/ftglyph.c		\
-	$(LIBFREETYPE_DIR)/src/base/ftmm.c		\
-	$(LIBFREETYPE_DIR)/src/base/ftbbox.c		\
-	$(LIBFREETYPE_DIR)/src/autohint/autohint.c	\
-	$(LIBFREETYPE_DIR)/src/cache/ftcache.c		\
-	$(LIBFREETYPE_DIR)/src/cff/cff.c		\
-	$(LIBFREETYPE_DIR)/src/cid/type1cid.c		\
-	$(LIBFREETYPE_DIR)/src/pcf/pcf.c		\
-	$(LIBFREETYPE_DIR)/src/psaux/psaux.c		\
-	$(LIBFREETYPE_DIR)/src/pshinter/pshinter.c	\
-	$(LIBFREETYPE_DIR)/src/psnames/psmodule.c	\
-	$(LIBFREETYPE_DIR)/src/raster/raster.c		\
-	$(LIBFREETYPE_DIR)/src/sfnt/sfnt.c		\
-	$(LIBFREETYPE_DIR)/src/smooth/smooth.c		\
-	$(LIBFREETYPE_DIR)/src/truetype/truetype.c	\
-	$(LIBFREETYPE_DIR)/src/type1/type1.c		\
-	$(LIBFREETYPE_DIR)/src/winfonts/winfnt.c
-
-LIBFREETYPE_OBJS = $(addprefix $(OBJ_DIR)/freetype.,					\
-			  $(addsuffix $(OBJ),						\
-				      $(notdir $(basename $(LIBFREETYPE_SOURCES)))))
-
-######################################################################
-# GD Library
-
-LIBGD_LIB = $(OBJ_DIR)/libgd$(LIB_EXT)
-LIBGD_DIR = third_party/gd
-LIBGD_SOURCES =					\
-	$(LIBGD_DIR)/gd				\
-	$(LIBGD_DIR)/gdfx			\
-	$(LIBGD_DIR)/gd_security		\
-	$(LIBGD_DIR)/gd_gd			\
-	$(LIBGD_DIR)/gd_gd2			\
-	$(LIBGD_DIR)/gd_io			\
-	$(LIBGD_DIR)/gd_io_dp			\
-	$(LIBGD_DIR)/gd_gif_in			\
-	$(LIBGD_DIR)/gd_gif_out			\
-	$(LIBGD_DIR)/gd_io_file			\
-	$(LIBGD_DIR)/gd_io_ss			\
-	$(LIBGD_DIR)/gd_jpeg			\
-	$(LIBGD_DIR)/gd_png			\
-	$(LIBGD_DIR)/gd_ss			\
-	$(LIBGD_DIR)/gd_topal			\
-	$(LIBGD_DIR)/gd_wbmp			\
-	$(LIBGD_DIR)/gdcache			\
-	$(LIBGD_DIR)/gdfontg			\
-	$(LIBGD_DIR)/gdfontl			\
-	$(LIBGD_DIR)/gdfontmb			\
-	$(LIBGD_DIR)/gdfonts			\
-	$(LIBGD_DIR)/gdfontt			\
-	$(LIBGD_DIR)/gdft			\
-	$(LIBGD_DIR)/gdhelpers			\
-	$(LIBGD_DIR)/gdkanji			\
-	$(LIBGD_DIR)/gdtables			\
-	$(LIBGD_DIR)/gdxpm			\
-	$(LIBGD_DIR)/wbmp
-
-LIBGD_OBJS = $(addprefix $(OBJ_DIR)/gd.,			\
-	       $(addsuffix $(OBJ),				\
-		 $(notdir $(basename $(LIBGD_SOURCES)))))
-
-######################################################################
-# JPEG
-
-LIBJPEG_LIB = $(OBJ_DIR)/libjpeg$(LIB_EXT)
-LIBJPEG_DIR = third_party/jpeg
-LIBJPEG_SOURCES =				\
-	$(LIBJPEG_DIR)/jcapimin.c		\
-	$(LIBJPEG_DIR)/jcapistd.c		\
-	$(LIBJPEG_DIR)/jccoefct.c		\
-	$(LIBJPEG_DIR)/jccolor.c		\
-	$(LIBJPEG_DIR)/jcdctmgr.c		\
-	$(LIBJPEG_DIR)/jchuff.c			\
-	$(LIBJPEG_DIR)/jcinit.c			\
-	$(LIBJPEG_DIR)/jcmainct.c		\
-	$(LIBJPEG_DIR)/jcmarker.c		\
-	$(LIBJPEG_DIR)/jcmaster.c		\
-	$(LIBJPEG_DIR)/jcomapi.c		\
-	$(LIBJPEG_DIR)/jcparam.c		\
-	$(LIBJPEG_DIR)/jcphuff.c		\
-	$(LIBJPEG_DIR)/jcprepct.c		\
-	$(LIBJPEG_DIR)/jcsample.c		\
-	$(LIBJPEG_DIR)/jctrans.c		\
-	$(LIBJPEG_DIR)/jdapimin.c		\
-	$(LIBJPEG_DIR)/jdapistd.c		\
-	$(LIBJPEG_DIR)/jdatadst.c		\
-	$(LIBJPEG_DIR)/jdatasrc.c		\
-	$(LIBJPEG_DIR)/jdcoefct.c		\
-	$(LIBJPEG_DIR)/jdcolor.c		\
-	$(LIBJPEG_DIR)/jddctmgr.c		\
-	$(LIBJPEG_DIR)/jdhuff.c			\
-	$(LIBJPEG_DIR)/jdinput.c		\
-	$(LIBJPEG_DIR)/jdmainct.c		\
-	$(LIBJPEG_DIR)/jdmarker.c		\
-	$(LIBJPEG_DIR)/jdmaster.c		\
-	$(LIBJPEG_DIR)/jdmerge.c		\
-	$(LIBJPEG_DIR)/jdphuff.c		\
-	$(LIBJPEG_DIR)/jdpostct.c		\
-	$(LIBJPEG_DIR)/jdsample.c		\
-	$(LIBJPEG_DIR)/jdtrans.c		\
-	$(LIBJPEG_DIR)/jerror.c			\
-	$(LIBJPEG_DIR)/jfdctflt.c		\
-	$(LIBJPEG_DIR)/jfdctfst.c		\
-	$(LIBJPEG_DIR)/jfdctint.c		\
-	$(LIBJPEG_DIR)/jidctflt.c		\
-	$(LIBJPEG_DIR)/jidctfst.c		\
-	$(LIBJPEG_DIR)/jidctint.c		\
-	$(LIBJPEG_DIR)/jidctred.c		\
-	$(LIBJPEG_DIR)/jmemansi.c		\
-	$(LIBJPEG_DIR)/jmemmgr.c		\
-	$(LIBJPEG_DIR)/jquant1.c		\
-	$(LIBJPEG_DIR)/jquant2.c		\
-	$(LIBJPEG_DIR)/jutils.c
-
-LIBJPEG_OBJS = $(addprefix $(OBJ_DIR)/jpeg.,			\
-		$(addsuffix $(OBJ),				\
-		  $(notdir $(basename $(LIBJPEG_SOURCES)))))
-
-######################################################################
-# LibPNG
-
-LIBPNG_LIB = $(OBJ_DIR)/libpng$(LIB_EXT)
-LIBPNG_DIR = third_party/libpng
-LIBPNG_SOURCES =				\
-	$(LIBPNG_DIR)/png.c			\
-	$(LIBPNG_DIR)/pngerror.c		\
-	$(LIBPNG_DIR)/pngget.c			\
-	$(LIBPNG_DIR)/pngmem.c			\
-	$(LIBPNG_DIR)/pngpread.c		\
-	$(LIBPNG_DIR)/pngread.c			\
-	$(LIBPNG_DIR)/pngrio.c			\
-	$(LIBPNG_DIR)/pngrtran.c		\
-	$(LIBPNG_DIR)/pngrutil.c		\
-	$(LIBPNG_DIR)/pngset.c			\
-	$(LIBPNG_DIR)/pngtrans.c		\
-	$(LIBPNG_DIR)/pngwio.c			\
-	$(LIBPNG_DIR)/pngwrite.c		\
-	$(LIBPNG_DIR)/pngwtran.c		\
-	$(LIBPNG_DIR)/pngwutil.c
-
-LIBPNG_OBJS = $(addprefix $(OBJ_DIR)/png.,			\
-		$(addsuffix $(OBJ),				\
-		  $(notdir $(basename $(LIBPNG_SOURCES)))))
-
-######################################################################
-# ZLib
-
-ZLIB_LIB = $(OBJ_DIR)/libzlib$(LIB_EXT)
-ZLIB_DIR = third_party/zlib
-ZLIB_SOURCES =					\
-	$(ZLIB_DIR)/adler32.c			\
-	$(ZLIB_DIR)/compress.c			\
-	$(ZLIB_DIR)/crc32.c			\
-	$(ZLIB_DIR)/deflate.c			\
-	$(ZLIB_DIR)/gzio.c			\
-	$(ZLIB_DIR)/infback.c			\
-	$(ZLIB_DIR)/inffast.c			\
-	$(ZLIB_DIR)/inflate.c			\
-	$(ZLIB_DIR)/inftrees.c			\
-	$(ZLIB_DIR)/trees.c			\
-	$(ZLIB_DIR)/uncompr.c			\
-	$(ZLIB_DIR)/zutil.c
-
-ZLIB_OBJS = $(addprefix $(OBJ_DIR)/zlib.,		\
-	      $(addsuffix $(OBJ),			\
-		$(notdir $(basename $(ZLIB_SOURCES)))))
-
-######################################################################
-# loadpng
-
-LOADPNG_LIB = $(OBJ_DIR)/libloadpng$(LIB_EXT)
-LOADPNG_DIR = third_party/loadpng
-LOADPNG_SOURCES =					\
-	$(LOADPNG_DIR)/loadpng.c			\
-	$(LOADPNG_DIR)/savepng.c			\
-	$(LOADPNG_DIR)/regpng.c
-
-LOADPNG_OBJS = $(addprefix $(OBJ_DIR)/loadpng.,		\
-		 $(addsuffix $(OBJ),			\
-		   $(notdir $(basename $(LOADPNG_SOURCES)))))
-
-######################################################################
-# tinyxml
-
-TINYXML_LIB = $(OBJ_DIR)/libtinyxml$(LIB_EXT)
-TINYXML_DIR = third_party/tinyxml
-TINYXML_SOURCES =					\
-	$(TINYXML_DIR)/tinystr.cpp			\
-	$(TINYXML_DIR)/tinyxml.cpp			\
-	$(TINYXML_DIR)/tinyxmlerror.cpp			\
-	$(TINYXML_DIR)/tinyxmlparser.cpp
-
-TINYXML_OBJS = $(addprefix $(OBJ_DIR)/tinyxml.,		\
-		 $(addsuffix $(OBJ),			\
-		   $(notdir $(basename $(TINYXML_SOURCES)))))
-
-######################################################################
-# Vaca
-
-VACA_LIB = $(OBJ_DIR)/libvaca$(LIB_EXT)
-VACA_DIR = third_party/vaca
-VACA_SOURCES =					\
-	$(VACA_DIR)/src/Application.cpp		\
-	$(VACA_DIR)/src/Component.cpp		\
-	$(VACA_DIR)/src/Debug.cpp		\
-	$(VACA_DIR)/src/Event.cpp		\
-	$(VACA_DIR)/src/Exception.cpp		\
-	$(VACA_DIR)/src/Mutex.cpp		\
-	$(VACA_DIR)/src/Point.cpp		\
-	$(VACA_DIR)/src/PreferredSizeEvent.cpp	\
-	$(VACA_DIR)/src/Property.cpp		\
-	$(VACA_DIR)/src/Rect.cpp		\
-	$(VACA_DIR)/src/Referenceable.cpp	\
-	$(VACA_DIR)/src/Size.cpp		\
-	$(VACA_DIR)/src/String.cpp		\
-	$(VACA_DIR)/src/Vaca.cpp
-
-VACA_OBJS = $(addprefix $(OBJ_DIR)/vaca.,		\
-		 $(addsuffix $(OBJ),			\
-		   $(notdir $(basename $(VACA_SOURCES)))))
-
-######################################################################
-# All objects and libraries
-
-ALL_OBJS =					\
-	$(ASE_OBJS)				\
-	$(LIBFREETYPE_OBJS)			\
-	$(LIBART_OBJS)				\
-	$(LIBJPEG_OBJS)				\
-	$(LIBPNG_OBJS)				\
-	$(ZLIB_OBJS)				\
-	$(LOADPNG_OBJS)				\
-	$(TINYXML_OBJS)				\
-	$(VACA_OBJS)
-
-THIRD_PARTY_LIBS =				\
-	$(LIBART_LIB)				\
-	$(LIBFREETYPE_LIB)			\
-	$(LIBJPEG_LIB)				\
-	$(LIBPNG_LIB)				\
-	$(ZLIB_LIB)				\
-	$(LOADPNG_LIB)				\
-	$(TINYXML_LIB)				\
-	$(VACA_LIB)
-
-######################################################################
-# Tests
-
-TESTS = $(addsuffix $(EXE),						\
-		$(basename						\
-			$(wildcard src/tests/*.cpp)			\
-			$(wildcard src/tests/raster/*.cpp)		\
-			$(wildcard src/tests/jinete/*.cpp)))
-
-AUTOTESTS = $(addsuffix $(EXE),						\
-		$(basename						\
-			$(wildcard src/tests/*.cpp)))
diff --git a/makefile.macosx b/makefile.macosx
deleted file mode 100644
index 1325a216b..000000000
--- a/makefile.macosx
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright (C) 2001-2010 by David Capello		-*-Makefile-*-
-
-ifndef CONFIGURED
-include makefile.cfg
-endif
-
-.PHONY = cfgtest
-
-ifndef CONFIGURED
-cfgtest:
-	@echo You must configure ASE: edit \"makefile.cfg\" or run \"fix.sh\" script
-endif
-
-######################################################################
-# Flags for GCC in GNU/Linux system
-
-ifdef DEBUGMODE
-CFLAGS = -arch i386 `allegro-config --cflags debug`
-LFLAGS = -arch i386 `allegro-config --libs debug`
-else
-CFLAGS = -arch i386 `allegro-config --cflags`
-LFLAGS = -arch i386 `allegro-config --libs`
-endif
-
-######################################################################
-# GCC stuff
-
-CC = gcc
-CPP = g++
-OBJ = .o
-EXE =
-LIB_EXT = .a
-OBJ_DIR = obj/unix
-SUBMAKEFILE = makefile.macosx
-
-include makefile.lst
-include makefile.gcc
-
-######################################################################
-# General rules
-
-.PHONY = default all clean distclean install uninstall
-
-default: all
-
-all: $(ASE)
-
-clean:
-	-rm -f $(ALL_OBJS) $(THIRD_PARTY_LIBS)
-
-distclean: clean
-	-rm -f $(ASE)
-
-install:
-	cp aseprite $(DEFAULT_PREFIX)/bin
-	cp -r data $(DEFAULT_PREFIX)/share/ase
-	cp -r docs $(DEFAULT_PREFIX)/share/ase
-	cp README.html $(DEFAULT_PREFIX)/share/ase
-
-uninstall:
-	-rm  -vf $(DEFAULT_PREFIX)/bin/aseprite
-	-rm -rvf $(DEFAULT_PREFIX)/share/ase
-
--include makefile.dep
diff --git a/makefile.mingw b/makefile.mingw
deleted file mode 100644
index e007e59e4..000000000
--- a/makefile.mingw
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright (C) 2001-2010 by David Capello		-*-Makefile-*-
-
-ifndef CONFIGURED
-include makefile.cfg
-endif
-
-.PHONY = cfgtest
-
-ifndef CONFIGURED
-cfgtest:
-	@echo You must configure ASE: edit \"makefile.cfg\" or run \"fix.sh\" script
-endif
-
-######################################################################
-# Flags for MinGW
-
-# CFLAGS = -D_WIN32_WINNT=0x0500
-CFLAGS = 
-LFLAGS = -mwindows
-ifdef DEBUGMODE
-  LFLAGS_LAST = -lalld -lpsapi
-else
-  ifdef STATIC_ALLEG_LINK
-    CFLAGS += -DALLEGRO_STATICLINK
-    LFLAGS_LAST = -lalleg -ldinput8 -lddraw -ldxguid -ldsound
-  else
-    LFLAGS_LAST = -lalleg44.dll
-  endif
-endif
-
-LFLAGS_LAST += -lUser32 -lShell32 -lComCtl32 -lComDlg32 -lGdi32	    	\
-	       -lMsimg32 -lWinMM -lAdvAPI32 -lOle32 -lShLwApi -lVfw32   \
-               -lwininet
-
-WITHICON = 1
-
-######################################################################
-# GCC stuff
-
-CC = gcc
-CPP = g++
-OBJ = .o
-EXE = .exe
-LIB_EXT = .a
-OBJ_DIR = obj/mingw32
-SUBMAKEFILE = makefile.mingw
-
-ifndef CROSSCOMPILE
-  DLLWRAP = dllwrap
-  WINDRES = windres
-else
-  DLLWRAP = $(XPREFIX)dllwrap
-  WINDRES = $(XPREFIX)windres
-endif
-
-include makefile.lst
-include makefile.gcc
-
-######################################################################
-# General rules
-
-.PHONY = default all clean distclean
-
-default: all
-
-all: $(ASE)
-
-clean:
-	-rm -f $(ALL_OBJS) $(THIRD_PARTY_LIBS) $(OBJ_DIR)/resources_win32.res
-
-distclean: clean
-	-rm -f $(ASE)
-
--include makefile.dep
diff --git a/makefile.vc b/makefile.vc
deleted file mode 100644
index 92b7c4d5d..000000000
--- a/makefile.vc
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright (C) 2001-2010 by David Capello		-*-Makefile-*-
-
-ifndef CONFIGURED
-include makefile.cfg
-endif
-
-.PHONY = cfgtest
-
-ifndef CONFIGURED
-cfgtest:
-	@echo You must configure ASE: edit \"makefile.cfg\" or run \"fix.sh\" script
-endif
-
-######################################################################
-# MSVC specific
-
-CC = cl
-RC = rc
-OBJ = .obj
-EXE = .exe
-LIB_EXT = .lib
-OBJ_DIR = obj/msvc
-
-include makefile.lst
-
-CFLAGS = -nologo						\
-         -I. -Isrc -Ithird_party -W3 -Gd -EHa			\
-	 -I$(LIBFREETYPE_DIR)/include				\
-	 -I$(LIBJPEG_DIR)					\
-	 -I$(LIBPNG_DIR)					\
-	 -I$(ZLIB_DIR)						\
-	 -I$(LOADPNG_DIR)					\
-	 -I$(TINYXML_DIR)					\
-	 -I$(VACA_DIR)/include					\
-	 -DPNG_NO_MMX_CODE					\
-	 -DVACA_ALLEGRO
-
-LFLAGS = -NOLOGO -SUBSYSTEM:WINDOWS -MACHINE:X86
-
-LIBS = User32.lib Shell32.lib ComCtl32.lib ComDlg32.lib Gdi32.lib	    \
-       Msimg32.lib WinMM.lib AdvAPI32.lib Ole32.lib ShLwApi.lib Vfw32.Lib   \
-       wininet.lib
-
-ifdef DEBUGMODE
-  ifdef STATIC_ALLEG_LINK
-    CFLAGS += -Zi -Od -MTd -DDEBUGMODE -DALLEGRO_STATICLINK
-    LFLAGS += -DEBUG
-    LIBS += alleg-debug.lib psapi.lib
-  else
-    CFLAGS += -Zi -Od -MDd -DDEBUGMODE
-    LFLAGS += -DEBUG
-    LIBS += alleg44-debug.lib psapi.lib
-  endif
-else
-  ifdef RELEASE
-    # Release without debug info
-    CFLAGS += -O2 -DNDEBUG
-    LFLAGS += -RELEASE
-
-    ifdef STATIC_ALLEG_LINK
-      CFLAGS += -MT -DALLEGRO_STATICLINK
-      LIBS += alleg.lib 
-    else
-      CFLAGS += -MD
-      LIBS += alleg44.lib
-    endif
-  else
-    # Release with debug info
-    CFLAGS += -Zi -O2 -MD -DNDEBUG
-    LFLAGS += -DEBUG
-    LIBS += alleg44.lib psapi.lib
-  endif
-endif
-
-# Using static version of Allegro? Include DirectX libs
-ifdef STATIC_ALLEG_LINK
-  LIBS += dinput8.lib ddraw.lib dxguid.lib dsound.lib
-endif
-
-ifdef MEMLEAK
-  CFLAGS += -DMEMLEAK
-  LIBS += dbghelp.lib
-endif
-
-ifdef HAVE_RESIZE_PATCH
-  CFLAGS += -DHAVE_RESIZE_PATCH
-endif
-
-######################################################################
-# General rules
-
-.PHONY = default all clean distclean
-
-default: all
-
-all: $(ASE)
-
-clean:
-	-rm -f $(ALL_OBJS) $(THIRD_PARTY_LIBS) $(OBJ_DIR)/resources_win32.res
-
-distclean: clean
-	-rm -f $(ASE)
-
--include makefile.dep
-
-######################################################################
-# Rules to make third party libraries
-
-$(LIBART_LIB): $(LIBART_OBJS)
-	-rm -f $@
-	lib -NOLOGO -OUT:$@ $^
-
-$(LIBFREETYPE_LIB): $(LIBFREETYPE_OBJS)
-	-rm -f $@
-	lib -NOLOGO -OUT:$@ $^
-
-$(LIBGD_LIB): $(LIBGD_OBJS)
-	-rm -f $@
-	lib -NOLOGO -OUT:$@ $^
-
-$(LIBJPEG_LIB): $(LIBJPEG_OBJS)
-	-rm -f $@
-	lib -NOLOGO -OUT:$@ $^
-
-$(LIBPNG_LIB): $(LIBPNG_OBJS)
-	-rm -f $@
-	lib -NOLOGO -OUT:$@ $^
-
-$(ZLIB_LIB): $(ZLIB_OBJS)
-	-rm -f $@
-	lib -NOLOGO -OUT:$@ $^
-
-$(LOADPNG_LIB): $(LOADPNG_OBJS)
-	-rm -f $@
-	lib -NOLOGO -OUT:$@ $^
-
-$(TINYXML_LIB): $(TINYXML_OBJS)
-	-rm -f $@
-	lib -NOLOGO -OUT:$@ $^
-
-$(VACA_LIB): $(VACA_OBJS)
-	-rm -f $@
-	lib -NOLOGO -OUT:$@ $^
-
-######################################################################
-# Rules to build objects and the application
-
-VPATH = src					\
-	src/app					\
-	src/commands				\
-	src/commands/fx				\
-	src/console				\
-	src/core				\
-	src/dialogs				\
-	src/effect				\
-	src/file				\
-	src/file/fli				\
-	src/file/gif				\
-	src/intl				\
-	src/jinete				\
-	src/jinete/themes			\
-	src/modules				\
-	src/raster				\
-	src/raster/x86				\
-	src/settings				\
-	src/tools				\
-	src/util				\
-	src/widgets				\
-	src/widgets/editor			\
-	$(LIBART_DIR)				\
-	$(LIBFREETYPE_DIR)/src/base		\
-	$(LIBFREETYPE_DIR)/src/autohint		\
-	$(LIBFREETYPE_DIR)/src/cache		\
-	$(LIBFREETYPE_DIR)/src/cff		\
-	$(LIBFREETYPE_DIR)/src/cid		\
-	$(LIBFREETYPE_DIR)/src/pcf		\
-	$(LIBFREETYPE_DIR)/src/psaux		\
-	$(LIBFREETYPE_DIR)/src/pshinter		\
-	$(LIBFREETYPE_DIR)/src/psnames		\
-	$(LIBFREETYPE_DIR)/src/raster		\
-	$(LIBFREETYPE_DIR)/src/sfnt		\
-	$(LIBFREETYPE_DIR)/src/smooth		\
-	$(LIBFREETYPE_DIR)/src/truetype		\
-	$(LIBFREETYPE_DIR)/src/type1		\
-	$(LIBFREETYPE_DIR)/src/winfonts		\
-	$(LIBGD_DIR)				\
-	$(LIBJPEG_DIR)				\
-	$(LIBPNG_DIR)				\
-	$(ZLIB_DIR)				\
-	$(LOADPNG_DIR)				\
-	$(TINYXML_DIR)				\
-	$(VACA_DIR)/src
-
-ASE_DEPS = $(ASE_OBJS) $(THIRD_PARTY_LIBS)
-
-######################################################################
-# Rules to build the object files
-
-$(OBJ_DIR)/%$(OBJ): %.cpp
-	$(CC) $(CFLAGS) -Fo$@ -c $<
-
-$(OBJ_DIR)/art.%$(OBJ): %.c
-	$(CC) $(CFLAGS) -Fo$@ -c $<
-
-$(OBJ_DIR)/freetype.%$(OBJ): %.c
-	$(CC) $(CFLAGS) -Fo$@ -c $<
-
-$(OBJ_DIR)/gd.%$(OBJ): %.c
-	$(CC) $(CFLAGS) -DNONDLL -DHAVE_CONFIG_H -Fo$(OBJ_DIR) -c $<
-
-$(OBJ_DIR)/jpeg.%$(OBJ): %.c
-	$(CC) $(CFLAGS) -Fo$@ -c $<
-
-$(OBJ_DIR)/png.%$(OBJ): %.c
-	$(CC) $(CFLAGS) -I$(LIBPNG_DIR) -Fo$@ -c $<
-
-$(OBJ_DIR)/zlib.%$(OBJ): %.c
-	$(CC) $(CFLAGS) -Fo$@ -c $<
-
-$(OBJ_DIR)/loadpng.%$(OBJ): %.c
-	$(CC) $(CFLAGS) -Fo$@ -c $<
-
-$(OBJ_DIR)/tinyxml.%$(OBJ): %.cpp
-	$(CC) $(CFLAGS) -Fo$@ -c $<
-
-$(OBJ_DIR)/vaca.%$(OBJ): %.cpp
-	$(CC) $(CFLAGS) -Fo$@ -c $<
-
-######################################################################
-# Application
-
-$(OBJ_DIR)/resources_win32.res: src/resources_win32.rc
-	$(RC) $<
-	mv src/resources_win32.res $@
-
-ifdef STATIC_ALLEG_LINK
-
-$(ASE): $(ASE_DEPS) $(OBJ_DIR)/resources_win32.res
-	link $(LFLAGS) $^ $(LIBS) -OUT:$@
-
-else
-
-$(ASE): $(ASE_DEPS) $(OBJ_DIR)/resources_win32.res
-	link $(LFLAGS) $^ $(LIBS) -OUT:$@
-	mt -nologo -manifest $@.manifest -outputresource:$@;#2
-	rm $@.manifest
-
-endif
-
-######################################################################
-# Rules to make tests
-
-src/tests/%$(EXE): src/tests/%.cpp $(COMMON_OBJS) $(THIRD_PARTY_LIBS)
-	$(CC) $(CFLAGS) -Foobj/msvc/test.obj -c $<
-	link $(LFLAGS) obj/msvc/test.obj $(COMMON_OBJS) $(THIRD_PARTY_LIBS) $(LIBS) -OUT:$@
-
-tests: $(TESTS)
-
-runtests: $(AUTOTESTS)
-	@-$(foreach TEST, $(AUTOTESTS), \
-		echo Running ./$(TEST) ... ; \
-		if ./$(TEST) ; then \
-			echo " - OK" ; \
-		else \
-			echo " - *FAIL*" ; \
-		fi ; \
-	   )
diff --git a/misc/dist.sh b/misc/dist.sh
index 23099b399..9550b0f5d 100644
--- a/misc/dist.sh
+++ b/misc/dist.sh
@@ -79,15 +79,6 @@ ase_files="config.h				\
 	   NEWS.txt				\
 	   README.html				\
 	   TODO.txt				\
-	   fix.bat				\
-	   fix.sh				\
-	   makefile.cfg				\
-	   makefile.gcc				\
-	   makefile.linux			\
-	   makefile.lst				\
-	   makefile.macosx			\
-	   makefile.mingw			\
-	   makefile.vc				\
 	   data/convmatr.def			\
 	   data/*.xml				\
 	   data/fonts/*.pcx			\