123 files changed, 27 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am
index 621282a9..4038e09b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,10 @@
 SUBDIRS = ${MPGMAD_DIR}\
-		  gme/Game_Music_Emu-0.5.2\
-		  gme/Game_Music_Emu-0.5.2/gme\
 		  dumb\
 		  pixmaps\
 		  icons\
 		  ${PLUGINS_DIRS}
 
 dumbpath=@top_srcdir@/dumb
-gmepath=@top_srcdir@/gme/Game_Music_Emu-0.5.2
 
 bin_PROGRAMS = deadbeef
 
@@ -26,16 +23,16 @@ deadbeef_SOURCES =\
 	optmath.h\
 	vfs.c vfs.h vfs_stdio.c\
 	timeline.c timeline.h\
-	cgme.c cdumb.c\
+	cdumb.c\
 	md5/md5.c md5/md5.h\
 	metacache.c
 
 sdkdir = $(pkgincludedir)
 sdk_HEADERS = deadbeef.h
 
-deadbeef_LDADD = $(LDADD) $(DEPS_LIBS) $(ICONV_LIB) gme/Game_Music_Emu-0.5.2/gme/libgme.a dumb/libdumb.a -lstdc++ -lm
+deadbeef_LDADD = $(LDADD) $(DEPS_LIBS) $(ICONV_LIB) dumb/libdumb.a -lstdc++ -lm
 
-AM_CFLAGS = $(DEPS_CFLAGS) -I$(gmepath) -std=c99
+AM_CFLAGS = $(DEPS_CFLAGS) -std=c99
 AM_CPPFLAGS = $(DEPS_CFLAGS)
 
 docsdir = $(docdir)
diff --git a/configure.ac b/configure.ac
index 84025ff1..86f91d4a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,6 +72,7 @@ AC_ARG_ENABLE(flac,     [  --disable-flac          build FLAC player plugin (def
 AC_ARG_ENABLE(sndfile,  [  --disable-sndfile       build libsndfile plugin for PCM wave files (default: enabled)], [enable_sndfile=$enableval], [enable_sndfile=yes])
 AC_ARG_ENABLE(wavpack,  [  --disable-wavpack       build wavpack plugin (default: enabled)], [enable_wavpack=$enableval], [enable_wavpack=yes])
 AC_ARG_ENABLE(cdda,     [  --disable-cdda          build CD-Audio plugin (default: enabled)], [enable_cdda=$enableval], [enable_cdda=yes])
+AC_ARG_ENABLE(gme,      [  --disable-gme           build Game Music Emu plugin for NFS, AY, etc (default: enabled)], [enable_cdda=$enableval], [enable_gme=yes])
 
 AC_ARG_ENABLE(libnotify, [  --enable-libnotify      include support for OSD notifications into GTKUI plugin (default: no)], [enable_libnotify=$enableval], [enable_libnotify=no])
 
@@ -358,6 +359,11 @@ if test "x$enable_vtx" != "xno" ; then
     PLUGINS_DIRS="$PLUGINS_DIRS plugins/vtx"
 fi
 
+if test "x$enable_gme" != "xno" ; then
+    HAVE_GME=yes
+    PLUGINS_DIRS="$PLUGINS_DIRS plugins/gme"
+fi
+
 AC_SUBST(PLUGINS_DIRS)
 
 echo
@@ -384,7 +390,7 @@ AC_DEFUN([PRINT_PLUGIN_INFO],
 )
 
 PRINT_PLUGIN_INFO([stdio],[Standard IO plugin],[true])
-PRINT_PLUGIN_INFO([gme],[chiptune music player based on GME],[true])
+PRINT_PLUGIN_INFO([gme],[chiptune music player based on GME],[test "x$HAVE_GME" = "xyes"])
 PRINT_PLUGIN_INFO([dumb],[module player based on DUMB library],[true])
 PRINT_PLUGIN_INFO([nullout],[NULL output],[test "x$HAVE_NULLOUT" = "xyes"])
 PRINT_PLUGIN_INFO([alsa],[ALSA output],[test "x$HAVE_ALSA" = "xyes"])
@@ -418,8 +424,9 @@ AC_OUTPUT([
 Makefile
 pixmaps/Makefile
 icons/Makefile
-gme/Game_Music_Emu-0.5.2/Makefile
-gme/Game_Music_Emu-0.5.2/gme/Makefile
+plugins/gme/Makefile
+plugins/gme/Game_Music_Emu-0.5.2/Makefile
+plugins/gme/Game_Music_Emu-0.5.2/gme/Makefile
 plugins/sid/sidplay-libs/Makefile
 dumb/Makefile
 plugins/alsa/Makefile
diff --git a/moduleconf.h b/moduleconf.h
index 6f9ca732..b422a281 100644
--- a/moduleconf.h
+++ b/moduleconf.h
@@ -1,3 +1,2 @@
-PLUG(gme)
 PLUG(dumb)
 PLUG(stdio)
diff --git a/gme/Game_Music_Emu-0.5.2/Makefile.am b/plugins/gme/Game_Music_Emu-0.5.2/Makefile.am
index 49e0b8b8..49e0b8b8 100644
--- a/gme/Game_Music_Emu-0.5.2/Makefile.am
+++ b/plugins/gme/Game_Music_Emu-0.5.2/Makefile.am
diff --git a/gme/Game_Music_Emu-0.5.2/changes.txt b/plugins/gme/Game_Music_Emu-0.5.2/changes.txt
index 0405b590..0405b590 100644
--- a/gme/Game_Music_Emu-0.5.2/changes.txt
+++ b/plugins/gme/Game_Music_Emu-0.5.2/changes.txt
diff --git a/gme/Game_Music_Emu-0.5.2/demo/Wave_Writer.cpp b/plugins/gme/Game_Music_Emu-0.5.2/demo/Wave_Writer.cpp
index ec40959d..ec40959d 100644
--- a/gme/Game_Music_Emu-0.5.2/demo/Wave_Writer.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/demo/Wave_Writer.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/demo/Wave_Writer.h b/plugins/gme/Game_Music_Emu-0.5.2/demo/Wave_Writer.h
index da08cc2a..da08cc2a 100644
--- a/gme/Game_Music_Emu-0.5.2/demo/Wave_Writer.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/demo/Wave_Writer.h
diff --git a/gme/Game_Music_Emu-0.5.2/demo/basics.c b/plugins/gme/Game_Music_Emu-0.5.2/demo/basics.c
index 55178251..55178251 100644
--- a/gme/Game_Music_Emu-0.5.2/demo/basics.c
+++ b/plugins/gme/Game_Music_Emu-0.5.2/demo/basics.c
diff --git a/gme/Game_Music_Emu-0.5.2/demo/cpp_basics.cpp b/plugins/gme/Game_Music_Emu-0.5.2/demo/cpp_basics.cpp
index 53fab418..53fab418 100644
--- a/gme/Game_Music_Emu-0.5.2/demo/cpp_basics.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/demo/cpp_basics.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/demo/features.c b/plugins/gme/Game_Music_Emu-0.5.2/demo/features.c
index 96a9a8a9..96a9a8a9 100644
--- a/gme/Game_Music_Emu-0.5.2/demo/features.c
+++ b/plugins/gme/Game_Music_Emu-0.5.2/demo/features.c
diff --git a/gme/Game_Music_Emu-0.5.2/design.txt b/plugins/gme/Game_Music_Emu-0.5.2/design.txt
index 8c8c65b1..8c8c65b1 100644
--- a/gme/Game_Music_Emu-0.5.2/design.txt
+++ b/plugins/gme/Game_Music_Emu-0.5.2/design.txt
diff --git a/gme/Game_Music_Emu-0.5.2/gme.txt b/plugins/gme/Game_Music_Emu-0.5.2/gme.txt
index 2c963d8e..2c963d8e 100644
--- a/gme/Game_Music_Emu-0.5.2/gme.txt
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme.txt
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Ay_Apu.cpp b/plugins/gme/Game_Music_Emu-0.5.2/gme/Ay_Apu.cpp
index 9dc5bb28..9dc5bb28 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Ay_Apu.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Ay_Apu.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Ay_Apu.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/Ay_Apu.h
index 31956939..31956939 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Ay_Apu.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Ay_Apu.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Ay_Cpu.cpp b/plugins/gme/Game_Music_Emu-0.5.2/gme/Ay_Cpu.cpp
index 6ff7156b..6ff7156b 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Ay_Cpu.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Ay_Cpu.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Ay_Cpu.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/Ay_Cpu.h
index 07241d5e..07241d5e 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Ay_Cpu.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Ay_Cpu.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Ay_Emu.cpp b/plugins/gme/Game_Music_Emu-0.5.2/gme/Ay_Emu.cpp
index bdc82e9e..bdc82e9e 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Ay_Emu.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Ay_Emu.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Ay_Emu.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/Ay_Emu.h
index ba8445d3..ba8445d3 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Ay_Emu.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Ay_Emu.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Blip_Buffer.cpp b/plugins/gme/Game_Music_Emu-0.5.2/gme/Blip_Buffer.cpp
index 07e9d658..07e9d658 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Blip_Buffer.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Blip_Buffer.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Blip_Buffer.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/Blip_Buffer.h
index 73341b8c..73341b8c 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Blip_Buffer.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Blip_Buffer.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Classic_Emu.cpp b/plugins/gme/Game_Music_Emu-0.5.2/gme/Classic_Emu.cpp
index 063444fe..063444fe 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Classic_Emu.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Classic_Emu.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Classic_Emu.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/Classic_Emu.h
index 8cd822ca..8cd822ca 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Classic_Emu.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Classic_Emu.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Data_Reader.cpp b/plugins/gme/Game_Music_Emu-0.5.2/gme/Data_Reader.cpp
index 5bbfbf55..5bbfbf55 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Data_Reader.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Data_Reader.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Data_Reader.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/Data_Reader.h
index 00b53b9e..00b53b9e 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Data_Reader.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Data_Reader.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Dual_Resampler.cpp b/plugins/gme/Game_Music_Emu-0.5.2/gme/Dual_Resampler.cpp
index 8644517c..8644517c 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Dual_Resampler.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Dual_Resampler.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Dual_Resampler.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/Dual_Resampler.h
index 61beb8a0..61beb8a0 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Dual_Resampler.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Dual_Resampler.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Effects_Buffer.cpp b/plugins/gme/Game_Music_Emu-0.5.2/gme/Effects_Buffer.cpp
index 730f8e94..730f8e94 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Effects_Buffer.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Effects_Buffer.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Effects_Buffer.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/Effects_Buffer.h
index eb0aa67a..eb0aa67a 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Effects_Buffer.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Effects_Buffer.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Fir_Resampler.cpp b/plugins/gme/Game_Music_Emu-0.5.2/gme/Fir_Resampler.cpp
index 4e0a4631..4e0a4631 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Fir_Resampler.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Fir_Resampler.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Fir_Resampler.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/Fir_Resampler.h
index 339dfce3..339dfce3 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Fir_Resampler.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Fir_Resampler.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Gb_Apu.cpp b/plugins/gme/Game_Music_Emu-0.5.2/gme/Gb_Apu.cpp
index 932ebb83..932ebb83 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Gb_Apu.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Gb_Apu.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Gb_Apu.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/Gb_Apu.h
index e74ebc55..e74ebc55 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Gb_Apu.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Gb_Apu.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Gb_Cpu.cpp b/plugins/gme/Game_Music_Emu-0.5.2/gme/Gb_Cpu.cpp
index b1f22bd9..b1f22bd9 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Gb_Cpu.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Gb_Cpu.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Gb_Cpu.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/Gb_Cpu.h
index 953fbaf5..953fbaf5 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Gb_Cpu.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Gb_Cpu.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Gb_Oscs.cpp b/plugins/gme/Game_Music_Emu-0.5.2/gme/Gb_Oscs.cpp
index 735653fa..735653fa 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Gb_Oscs.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Gb_Oscs.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Gb_Oscs.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/Gb_Oscs.h
index d7f88ea1..d7f88ea1 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Gb_Oscs.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Gb_Oscs.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Gbs_Emu.cpp b/plugins/gme/Game_Music_Emu-0.5.2/gme/Gbs_Emu.cpp
index 30a147e5..30a147e5 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Gbs_Emu.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Gbs_Emu.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Gbs_Emu.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/Gbs_Emu.h
index 93fe691e..93fe691e 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Gbs_Emu.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Gbs_Emu.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Gme_File.cpp b/plugins/gme/Game_Music_Emu-0.5.2/gme/Gme_File.cpp
index 6821c3a5..6821c3a5 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Gme_File.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Gme_File.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Gme_File.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/Gme_File.h
index a535633b..a535633b 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Gme_File.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Gme_File.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Gym_Emu.cpp b/plugins/gme/Game_Music_Emu-0.5.2/gme/Gym_Emu.cpp
index 499a9ca2..499a9ca2 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Gym_Emu.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Gym_Emu.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Gym_Emu.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/Gym_Emu.h
index 05419ea2..05419ea2 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Gym_Emu.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Gym_Emu.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Hes_Apu.cpp b/plugins/gme/Game_Music_Emu-0.5.2/gme/Hes_Apu.cpp
index 22389121..22389121 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Hes_Apu.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Hes_Apu.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Hes_Apu.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/Hes_Apu.h
index ca0c932f..ca0c932f 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Hes_Apu.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Hes_Apu.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Hes_Cpu.cpp b/plugins/gme/Game_Music_Emu-0.5.2/gme/Hes_Cpu.cpp
index 2615a0bb..2615a0bb 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Hes_Cpu.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Hes_Cpu.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Hes_Cpu.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/Hes_Cpu.h
index 437d0908..437d0908 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Hes_Cpu.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Hes_Cpu.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Hes_Emu.cpp b/plugins/gme/Game_Music_Emu-0.5.2/gme/Hes_Emu.cpp
index fafb2666..fafb2666 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Hes_Emu.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Hes_Emu.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Hes_Emu.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/Hes_Emu.h
index 9951eb6a..9951eb6a 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Hes_Emu.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Hes_Emu.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Kss_Cpu.cpp b/plugins/gme/Game_Music_Emu-0.5.2/gme/Kss_Cpu.cpp
index 37c4a724..37c4a724 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Kss_Cpu.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Kss_Cpu.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Kss_Cpu.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/Kss_Cpu.h
index 6297d100..6297d100 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Kss_Cpu.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Kss_Cpu.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Kss_Emu.cpp b/plugins/gme/Game_Music_Emu-0.5.2/gme/Kss_Emu.cpp
index 1b26ef0b..1b26ef0b 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Kss_Emu.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Kss_Emu.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Kss_Emu.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/Kss_Emu.h
index 4d8463ab..4d8463ab 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Kss_Emu.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Kss_Emu.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Kss_Scc_Apu.cpp b/plugins/gme/Game_Music_Emu-0.5.2/gme/Kss_Scc_Apu.cpp
index 1660ac3d..1660ac3d 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Kss_Scc_Apu.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Kss_Scc_Apu.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Kss_Scc_Apu.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/Kss_Scc_Apu.h
index 03a6a108..03a6a108 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Kss_Scc_Apu.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Kss_Scc_Apu.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/M3u_Playlist.cpp b/plugins/gme/Game_Music_Emu-0.5.2/gme/M3u_Playlist.cpp
index 0a1475db..0a1475db 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/M3u_Playlist.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/M3u_Playlist.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/gme/M3u_Playlist.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/M3u_Playlist.h
index eda0dc89..eda0dc89 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/M3u_Playlist.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/M3u_Playlist.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Makefile.am b/plugins/gme/Game_Music_Emu-0.5.2/gme/Makefile.am
index 75d377cd..d728deea 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Makefile.am
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Makefile.am
@@ -62,3 +62,5 @@ Vgm_Emu.h\
 Vgm_Emu_Impl.h\
 Ym2413_Emu.h\
 Ym2612_Emu.h
+
+AM_CPPFLAGS = $(CXXFLAGS) -fPIC
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Multi_Buffer.cpp b/plugins/gme/Game_Music_Emu-0.5.2/gme/Multi_Buffer.cpp
index ecd8f8ad..ecd8f8ad 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Multi_Buffer.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Multi_Buffer.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Multi_Buffer.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/Multi_Buffer.h
index a39cca1a..a39cca1a 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Multi_Buffer.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Multi_Buffer.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Music_Emu.cpp b/plugins/gme/Game_Music_Emu-0.5.2/gme/Music_Emu.cpp
index 31c7233c..31c7233c 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Music_Emu.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Music_Emu.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Music_Emu.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/Music_Emu.h
index 573403ce..573403ce 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Music_Emu.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Music_Emu.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Nes_Apu.cpp b/plugins/gme/Game_Music_Emu-0.5.2/gme/Nes_Apu.cpp
index 8daf5d0e..8daf5d0e 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Nes_Apu.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Nes_Apu.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Nes_Apu.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/Nes_Apu.h
index dbd8484c..dbd8484c 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Nes_Apu.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Nes_Apu.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Nes_Cpu.cpp b/plugins/gme/Game_Music_Emu-0.5.2/gme/Nes_Cpu.cpp
index 480b4aa4..480b4aa4 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Nes_Cpu.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Nes_Cpu.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Nes_Cpu.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/Nes_Cpu.h
index d303b57c..d303b57c 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Nes_Cpu.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Nes_Cpu.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Nes_Fme7_Apu.cpp b/plugins/gme/Game_Music_Emu-0.5.2/gme/Nes_Fme7_Apu.cpp
index c058f6b1..c058f6b1 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Nes_Fme7_Apu.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Nes_Fme7_Apu.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Nes_Fme7_Apu.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/Nes_Fme7_Apu.h
index eb60af03..eb60af03 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Nes_Fme7_Apu.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Nes_Fme7_Apu.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Nes_Namco_Apu.cpp b/plugins/gme/Game_Music_Emu-0.5.2/gme/Nes_Namco_Apu.cpp
index f3235b38..f3235b38 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Nes_Namco_Apu.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Nes_Namco_Apu.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Nes_Namco_Apu.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/Nes_Namco_Apu.h
index db5fea4b..db5fea4b 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Nes_Namco_Apu.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Nes_Namco_Apu.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Nes_Oscs.cpp b/plugins/gme/Game_Music_Emu-0.5.2/gme/Nes_Oscs.cpp
index 1ad3f59c..1ad3f59c 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Nes_Oscs.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Nes_Oscs.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Nes_Oscs.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/Nes_Oscs.h
index b675bfb4..b675bfb4 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Nes_Oscs.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Nes_Oscs.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Nes_Vrc6_Apu.cpp b/plugins/gme/Game_Music_Emu-0.5.2/gme/Nes_Vrc6_Apu.cpp
index d178407c..d178407c 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Nes_Vrc6_Apu.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Nes_Vrc6_Apu.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Nes_Vrc6_Apu.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/Nes_Vrc6_Apu.h
index 18722233..18722233 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Nes_Vrc6_Apu.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Nes_Vrc6_Apu.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Nsf_Emu.cpp b/plugins/gme/Game_Music_Emu-0.5.2/gme/Nsf_Emu.cpp
index 678bddb2..678bddb2 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Nsf_Emu.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Nsf_Emu.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Nsf_Emu.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/Nsf_Emu.h
index e06b9172..e06b9172 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Nsf_Emu.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Nsf_Emu.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Nsfe_Emu.cpp b/plugins/gme/Game_Music_Emu-0.5.2/gme/Nsfe_Emu.cpp
index 0a785e60..0a785e60 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Nsfe_Emu.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Nsfe_Emu.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Nsfe_Emu.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/Nsfe_Emu.h
index 561c3be0..561c3be0 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Nsfe_Emu.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Nsfe_Emu.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Sap_Apu.cpp b/plugins/gme/Game_Music_Emu-0.5.2/gme/Sap_Apu.cpp
index 23fa9072..23fa9072 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Sap_Apu.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Sap_Apu.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Sap_Apu.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/Sap_Apu.h
index c71ce31e..c71ce31e 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Sap_Apu.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Sap_Apu.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Sap_Cpu.cpp b/plugins/gme/Game_Music_Emu-0.5.2/gme/Sap_Cpu.cpp
index 10dc6061..10dc6061 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Sap_Cpu.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Sap_Cpu.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Sap_Cpu.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/Sap_Cpu.h
index 712f63cd..712f63cd 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Sap_Cpu.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Sap_Cpu.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Sap_Emu.cpp b/plugins/gme/Game_Music_Emu-0.5.2/gme/Sap_Emu.cpp
index 8314fd6e..8314fd6e 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Sap_Emu.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Sap_Emu.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Sap_Emu.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/Sap_Emu.h
index 4878faa6..4878faa6 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Sap_Emu.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Sap_Emu.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Sms_Apu.cpp b/plugins/gme/Game_Music_Emu-0.5.2/gme/Sms_Apu.cpp
index b41fdec4..b41fdec4 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Sms_Apu.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Sms_Apu.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Sms_Apu.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/Sms_Apu.h
index 3c11a9c3..3c11a9c3 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Sms_Apu.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Sms_Apu.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Sms_Oscs.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/Sms_Oscs.h
index 2a896fef..2a896fef 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Sms_Oscs.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Sms_Oscs.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Snes_Spc.cpp b/plugins/gme/Game_Music_Emu-0.5.2/gme/Snes_Spc.cpp
index e909ea18..e909ea18 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Snes_Spc.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Snes_Spc.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Snes_Spc.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/Snes_Spc.h
index b558fb71..b558fb71 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Snes_Spc.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Snes_Spc.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Spc_Cpu.cpp b/plugins/gme/Game_Music_Emu-0.5.2/gme/Spc_Cpu.cpp
index fb9983b8..fb9983b8 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Spc_Cpu.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Spc_Cpu.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Spc_Cpu.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/Spc_Cpu.h
index 2252663b..2252663b 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Spc_Cpu.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Spc_Cpu.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Spc_Dsp.cpp b/plugins/gme/Game_Music_Emu-0.5.2/gme/Spc_Dsp.cpp
index 3d934f63..3d934f63 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Spc_Dsp.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Spc_Dsp.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Spc_Dsp.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/Spc_Dsp.h
index 36492275..36492275 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Spc_Dsp.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Spc_Dsp.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Spc_Emu.cpp b/plugins/gme/Game_Music_Emu-0.5.2/gme/Spc_Emu.cpp
index 22be9e2a..22be9e2a 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Spc_Emu.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Spc_Emu.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Spc_Emu.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/Spc_Emu.h
index 44b54c30..44b54c30 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Spc_Emu.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Spc_Emu.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Vgm_Emu.cpp b/plugins/gme/Game_Music_Emu-0.5.2/gme/Vgm_Emu.cpp
index 0fef6bd9..0fef6bd9 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Vgm_Emu.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Vgm_Emu.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Vgm_Emu.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/Vgm_Emu.h
index bcb784d5..bcb784d5 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Vgm_Emu.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Vgm_Emu.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Vgm_Emu_Impl.cpp b/plugins/gme/Game_Music_Emu-0.5.2/gme/Vgm_Emu_Impl.cpp
index a2d7c93e..a2d7c93e 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Vgm_Emu_Impl.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Vgm_Emu_Impl.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Vgm_Emu_Impl.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/Vgm_Emu_Impl.h
index 4d387d09..4d387d09 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Vgm_Emu_Impl.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Vgm_Emu_Impl.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Ym2413_Emu.cpp b/plugins/gme/Game_Music_Emu-0.5.2/gme/Ym2413_Emu.cpp
index ede67304..ede67304 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Ym2413_Emu.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Ym2413_Emu.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Ym2413_Emu.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/Ym2413_Emu.h
index 98a2a48e..98a2a48e 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Ym2413_Emu.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Ym2413_Emu.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Ym2612_Emu.cpp b/plugins/gme/Game_Music_Emu-0.5.2/gme/Ym2612_Emu.cpp
index 41ebb093..41ebb093 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Ym2612_Emu.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Ym2612_Emu.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/gme/Ym2612_Emu.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/Ym2612_Emu.h
index 383ac72d..383ac72d 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/Ym2612_Emu.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/Ym2612_Emu.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/blargg_common.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/blargg_common.h
index 9ab0bd7d..9ab0bd7d 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/blargg_common.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/blargg_common.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/blargg_config.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/blargg_config.h
index 9e9c751d..9e9c751d 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/blargg_config.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/blargg_config.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/blargg_endian.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/blargg_endian.h
index 67165565..67165565 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/blargg_endian.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/blargg_endian.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/blargg_source.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/blargg_source.h
index 945bf349..945bf349 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/blargg_source.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/blargg_source.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/gb_cpu_io.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/gb_cpu_io.h
index ada99ead..ada99ead 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/gb_cpu_io.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/gb_cpu_io.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/gme.cpp b/plugins/gme/Game_Music_Emu-0.5.2/gme/gme.cpp
index d6cebfa8..d6cebfa8 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/gme.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/gme.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/gme/gme.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/gme.h
index 469c901c..469c901c 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/gme.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/gme.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/hes_cpu_io.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/hes_cpu_io.h
index b3d71dad..b3d71dad 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/hes_cpu_io.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/hes_cpu_io.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/nes_cpu_io.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/nes_cpu_io.h
index 4bae3793..4bae3793 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/nes_cpu_io.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/nes_cpu_io.h
diff --git a/gme/Game_Music_Emu-0.5.2/gme/sap_cpu_io.h b/plugins/gme/Game_Music_Emu-0.5.2/gme/sap_cpu_io.h
index 8c2f6dd0..8c2f6dd0 100644
--- a/gme/Game_Music_Emu-0.5.2/gme/sap_cpu_io.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/gme/sap_cpu_io.h
diff --git a/gme/Game_Music_Emu-0.5.2/license.txt b/plugins/gme/Game_Music_Emu-0.5.2/license.txt
index 5faba9d4..5faba9d4 100644
--- a/gme/Game_Music_Emu-0.5.2/license.txt
+++ b/plugins/gme/Game_Music_Emu-0.5.2/license.txt
diff --git a/gme/Game_Music_Emu-0.5.2/player/Audio_Scope.cpp b/plugins/gme/Game_Music_Emu-0.5.2/player/Audio_Scope.cpp
index 74cb2c32..74cb2c32 100644
--- a/gme/Game_Music_Emu-0.5.2/player/Audio_Scope.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/player/Audio_Scope.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/player/Audio_Scope.h b/plugins/gme/Game_Music_Emu-0.5.2/player/Audio_Scope.h
index 75334676..75334676 100644
--- a/gme/Game_Music_Emu-0.5.2/player/Audio_Scope.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/player/Audio_Scope.h
diff --git a/gme/Game_Music_Emu-0.5.2/player/Music_Player.cpp b/plugins/gme/Game_Music_Emu-0.5.2/player/Music_Player.cpp
index a39819f1..a39819f1 100644
--- a/gme/Game_Music_Emu-0.5.2/player/Music_Player.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/player/Music_Player.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/player/Music_Player.h b/plugins/gme/Game_Music_Emu-0.5.2/player/Music_Player.h
index 7a573c45..7a573c45 100644
--- a/gme/Game_Music_Emu-0.5.2/player/Music_Player.h
+++ b/plugins/gme/Game_Music_Emu-0.5.2/player/Music_Player.h
diff --git a/gme/Game_Music_Emu-0.5.2/player/player.cpp b/plugins/gme/Game_Music_Emu-0.5.2/player/player.cpp
index a0685997..a0685997 100644
--- a/gme/Game_Music_Emu-0.5.2/player/player.cpp
+++ b/plugins/gme/Game_Music_Emu-0.5.2/player/player.cpp
diff --git a/gme/Game_Music_Emu-0.5.2/readme.txt b/plugins/gme/Game_Music_Emu-0.5.2/readme.txt
index e3470bfa..e3470bfa 100644
--- a/gme/Game_Music_Emu-0.5.2/readme.txt
+++ b/plugins/gme/Game_Music_Emu-0.5.2/readme.txt
diff --git a/gme/Game_Music_Emu-0.5.2/test.m3u b/plugins/gme/Game_Music_Emu-0.5.2/test.m3u
index fd46bfe1..fd46bfe1 100644
--- a/gme/Game_Music_Emu-0.5.2/test.m3u
+++ b/plugins/gme/Game_Music_Emu-0.5.2/test.m3u
diff --git a/gme/Game_Music_Emu-0.5.2/test.nsf b/plugins/gme/Game_Music_Emu-0.5.2/test.nsf
index da5fcedd..da5fcedd 100644
--- a/gme/Game_Music_Emu-0.5.2/test.nsf
+++ b/plugins/gme/Game_Music_Emu-0.5.2/test.nsf
diff --git a/plugins/gme/Makefile.am b/plugins/gme/Makefile.am
new file mode 100644
index 00000000..90c9209e
--- /dev/null
+++ b/plugins/gme/Makefile.am
@@ -0,0 +1,12 @@
+gmepath=@top_srcdir@/plugins/gme/Game_Music_Emu-0.5.2
+SUBDIRS = Game_Music_Emu-0.5.2 Game_Music_Emu-0.5.2/gme
+
+gmedir = $(libdir)/$(PACKAGE)
+
+pkglib_LTLIBRARIES = gme.la
+
+gme_la_SOURCES = cgme.c
+gme_la_LDFLAGS = -module
+
+gme_la_LIBADD = $(LDADD) $(gmepath)/gme/libgme.a
+AM_CFLAGS = $(CFLAGS) -I$(gmepath) -std=c99 -fPIC
diff --git a/cgme.c b/plugins/gme/cgme.c
index 2bed740c..2bed740c 100644
--- a/cgme.c
+++ b/plugins/gme/cgme.c