Merge pull request #1 from lefta/fix-linux-build

Fix linux build

.gitignore

@@ -30,6 +30,9 @@ Makefile.in
 /desmume/src/frontend/posix/gtk/Makefile
 /desmume/src/frontend/posix/gtk/desmume
 /desmume/src/frontend/posix/gtk/doc/Makefile
+/desmume/src/frontend/posix/gtk-glade/Makefile
+/desmume/src/frontend/posix/gtk-glade/desmume-glade
+/desmume/src/frontend/posix/gtk-glade/doc/Makefile
 /desmume/src/frontend/posix/install-sh
 
 # Xcode

desmume/src/frontend/posix/Makefile.am

@@ -104,7 +104,7 @@ libdesmume_a_SOURCES = \
 	../../cheatSystem.cpp ../../cheatSystem.h \
 	../../texcache.cpp ../../texcache.h ../../rasterize.cpp ../../rasterize.h \
 	../../metaspu/metaspu.cpp ../../metaspu/metaspu.h \
-	../../filter/2xsai.cpp ../../filter/bilinear.cpp ../../filter/epx.cpp ../../filter/filter.h \
+	../../filter/2xsai.cpp ../../filter/bilinear.cpp ../../filter/deposterize.cpp ../../filter/epx.cpp ../../filter/filter.h \
 	../../filter/hq2x.cpp ../../filter/hq2x.h \
 	../../filter/hq3x.cpp ../../filter/hq3x.dat \
 	../../filter/hq4x.cpp ../../filter/hq4x.dat \
@@ -120,7 +120,23 @@ libdesmume_a_SOURCES = \
 	../../libretro-common/file/retro_stat.c \
 	../../libretro-common/rthreads/async_job.c \
 	../../libretro-common/rthreads/rsemaphore.c \
-	../../libretro-common/rthreads/rthreads.c
+	../../libretro-common/rthreads/rthreads.c \
+	../../libretro-common/encodings/encoding_utf.c
+
+if SUPPORT_SSE2
+libdesmume_a_SOURCES += \
+	../../utils/colorspacehandler/colorspacehandler_SSE2.cpp ../../utils/colorspacehandler/colorspacehandler_SSE2.h
+endif
+
+if SUPPORT_AVX2
+libdesmume_a_SOURCES += \
+	../../utils/colorspacehandler/colorspacehandler_AVX2.cpp ../../utils/colorspacehandler/colorspacehandler_AVX2.h
+endif
+
+if SUPPORT_ALTIVEC
+libdesmume_a_SOURCES += \
+	../../utils/colorspacehandler/colorspacehandler_AltiVec.cpp ../../utils/colorspacehandler/colorspacehandler_AltiVec.h
+endif
 
 if HAVE_JIT
 libdesmume_a_SOURCES += \

desmume/src/frontend/posix/configure.ac

@@ -379,6 +379,8 @@ AC_CONFIG_FILES([Makefile
                  cli/doc/Makefile
                  gtk/Makefile
                  gtk/doc/Makefile
+                 gtk-glade/Makefile
+                 gtk-glade/doc/Makefile
 ])
 AC_OUTPUT
 

desmume/src/frontend/posix/gtk-glade/Makefile.am

@@ -1,5 +1,5 @@
 SUBDIRS = doc
-include $(top_srcdir)/src/desmume.mk
+include ../desmume.mk
 
 AM_CPPFLAGS += $(SDL_CFLAGS) $(GTKGLEXT_CFLAGS) $(LIBGLADE_CFLAGS) \
 		$(GTHREAD_CFLAGS) $(ALSA_CFLAGS) $(LIBAGG_CFLAGS) \
@@ -27,8 +27,8 @@ desmume_glade_SOURCES =  \
 	dTools/callbacks_dtools.h \
 	dTools/dTools_display.h \
 	gdk_3Demu.cpp gdk_3Demu.h \
-	../sndsdl.h ../sndsdl.cpp ../ctrlssdl.h ../ctrlssdl.cpp \
+	../shared/sndsdl.h ../shared/sndsdl.cpp ../shared/ctrlssdl.h ../shared/ctrlssdl.cpp \
-	../driver.h ../driver.cpp
+	../../../driver.h ../../../driver.cpp
 
 desmume_glade_LDADD = ../libdesmume.a \
 			$(SDL_LIBS) $(GTKGLEXT_LIBS) $(LIBGLADE_LIBS) \

desmume/src/frontend/posix/gtk-glade/globals.h

@@ -88,8 +88,8 @@ typedef union _callback_arg{
 #include "../armcpu.h"
 #include "../NDSSystem.h"
 #include "../GPU.h"
-#include "../sndsdl.h"
+#include "../shared/sndsdl.h"
-#include "../ctrlssdl.h"
+#include "../shared/ctrlssdl.h"
 #include "../types.h"
 #include "../saves.h"
 #include "../render3D.h"

desmume/src/frontend/posix/gtk-glade/main.cpp

@@ -29,7 +29,7 @@
 #include "rasterize.h"
 #include "desmume.h"
 #include "firmware.h"
-#include "desmume_config.h"
+#include "../shared/desmume_config.h"
 
 #ifdef GDB_STUB
 #include "../armcpu.h"

desmume/src/utils/fsnitro.cpp

@@ -17,6 +17,11 @@
 
 #include <stdio.h>
 #include <string>
+#include <cstring>
+
+#ifndef HOST_WINDOWS
+#include <unistd.h>
+#endif
 
 #include "types.h"
 #include "fsnitro.h"