Merge pull request #7 from loathingKernel/sync-with-codeplex

Sync with codeplex

28 files changed, 634 insertions, 404 deletions

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
new file mode 100644
index 00000000..62b52365
--- /dev/null
+++ b/plugins/CMakeLists.txt
@@ -0,0 +1,13 @@
+#plugins
+if (BUILD_SIO1)
+add_subdirectory(bladesio1)
+endif()
+add_subdirectory(nullsio1)
+add_subdirectory(dfcdrom)
+add_subdirectory(dfinput)
+add_subdirectory(dfnet)
+add_subdirectory(dfsound)
+add_subdirectory(dfxvideo)
+if (BUILD_OPENGL)
+add_subdirectory(peopsxgl)
+endif()
diff --git a/plugins/bladesio1/CMakeLists.txt b/plugins/bladesio1/CMakeLists.txt
new file mode 100644
index 00000000..7557f5db
--- /dev/null
+++ b/plugins/bladesio1/CMakeLists.txt
@@ -0,0 +1,61 @@
+message(STATUS "* Configuring bladesio1")
+
+include(GlibCompileResourcesSupport)
+
+#deps
+
+find_package(GLib REQUIRED)
+if(NOT GLib_FOUND)
+    message(FATAL_ERROR "GLIB2 library not found")
+endif(NOT GLib_FOUND)
+include_directories(${GLib_INCLUDE_DIRS})
+
+find_package(GTK3 REQUIRED)
+if(NOT GTK3_FOUND)
+    message(FATAL_ERROR "GTK3 library not found")
+endif(NOT GTK3_FOUND)
+include_directories(${GTK3_INCLUDE_DIRS})
+set(GTK_LIBRARIES ${GTK3_LIBRARY} ${GDK3_LIBRARY} ${GDKPixbuf_LIBRARY} ${Pango_LIBRARY} ${Cairo_LIBRARY} ${GObject_LIBRARY} ${GLib_LIBRARY} ${GIO_LIBRARY})
+
+
+#defs
+add_definitions(-DLOCALE_DIR="${CMAKE_INSTALL_FULL_DATAROOTDIR}/locale/" -DPSEMU_DATA_DIR="${CMAKE_INSTALL_FULL_DATAROOTDIR}/psemu" -DDEF_PLUGIN_DIR="${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu")
+
+#sources
+set(PLUGIN_SRCS
+    cfg.c
+    sio1.c
+    fifo.c
+    connection.c
+)
+
+set(GUI_SRCS
+    gui.c
+)
+
+
+#resources
+set(RESOURCE_LIST
+    ${CMAKE_CURRENT_SOURCE_DIR}/sio1.ui
+)
+
+
+compile_gresources(RESOURCE_FILE
+                   XML_OUT
+                   TYPE EMBED_C
+                   PREFIX /org/pcsxr/bladesio1
+                   SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}
+                   RESOURCES ${RESOURCE_LIST})
+
+add_custom_target(bladesio1_resource DEPENDS ${RESOURCE_FILE})
+
+include_directories(${CMAKE_SOURCE_DIR}/libpcsxcore)
+add_library(BladeSio1 MODULE ${PLUGIN_SRCS})
+
+
+add_executable(cfgBladeSio1 ${GUI_SRCS} ${RESOURCE_FILE})
+add_dependencies(cfgBladeSio1 bladesio1_resource)
+target_link_libraries(cfgBladeSio1 ${GTK_LIBRARIES})
+
+install(TARGETS BladeSio1 LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu)
+install(TARGETS cfgBladeSio1 RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu)
diff --git a/plugins/bladesio1/Makefile.am b/plugins/bladesio1/Makefile.am
deleted file mode 100644
index badd57e5..00000000
--- a/plugins/bladesio1/Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
-bindir = @libdir@/games/psemu/
-libdir = @libdir@/games/psemu/
-
-lib_LTLIBRARIES = libBladeSio1.la
-
-libBladeSio1_la_SOURCES = cfg.c sio1.c sio1.h fifo.c fifo.h connection.c connection.h typedefs.h
-libBladeSio1_la_LDFLAGS = -module -avoid-version
-
-AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
-	-DDATADIR=\"${datadir}/psemu/\" \
-	$(GTK3_CFLAGS) \
-	-I$(top_srcdir)/libpcsxcore -I../../include
-
-bin_PROGRAMS = cfgBladeSio1
-cfgBladeSio1_SOURCES = gui.c sio1.h GtkResources.c GtkResources.h
-cfgBladeSio1_LDADD = $(GTK3_LIBS)
-
-# gresource.xml is dynamically generated in CMake. Mirror that here in a static way.
-define gresource_xml =
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/org/pcsxr/bladesio1">
-    <file>sio1.ui</file>
-  </gresource>
-</gresources>
-endef
-
-bladesio1.gresource.xml:
-	$(file >$@,$(gresource_xml))
-bladesio1_gresource: bladesio1.gresource.xml
-	$(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/$<)
-GtkResources.c: bladesio1.gresource.xml $(bladesio1_gresource)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source --c-name bladesio1 $<
-GtkResources.h: bladesio1.gresource.xml $(bladesio1_gresource)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-header --c-name bladesio1 $<
-
-
-#glade_DATA = sio1.ui
-#gladedir = $(datadir)/psemu/
-EXTRA_DIST = $(glade_DATA)
-
-CLEANFILES = bladesio1.gresource.xml GtkResources.c GtkResources.h
-
diff --git a/plugins/bladesio1/cfg.c b/plugins/bladesio1/cfg.c
index f830d7b3..df120b1a 100755
--- a/plugins/bladesio1/cfg.c
+++ b/plugins/bladesio1/cfg.c
@@ -22,7 +22,7 @@
 #include <string.h>
 #include <stdint.h>
 
-#include "psxcommon.h"
+#include "typedefs.h"
 #include "psemu_plugin_defs.h"
 
 #include "sio1.h"
diff --git a/plugins/bladesio1/connection.c b/plugins/bladesio1/connection.c
index 1d4a075d..c922f2f2 100755
--- a/plugins/bladesio1/connection.c
+++ b/plugins/bladesio1/connection.c
@@ -61,7 +61,11 @@ int connectionOpen() {
 
 			serversock = socket(AF_INET, SOCK_STREAM, 0);
 			if(serversock == -1) {
+#if defined _WINDOWS
+				fprintf(stderr, "[SIO1] ERROR: server socket(): %d\n", WSAGetLastError());
+#else
 				fprintf(stderr, "[SIO1] ERROR: server socket()\n");
+#endif
 				return -1;
 			}
 			
@@ -74,12 +78,20 @@ int connectionOpen() {
 			address.sin_port		= settings.port;
 
 			if(bind(serversock,(struct sockaddr*)&address,sizeof(address)) == -1) {
+#if defined _WINDOWS
+				fprintf(stderr, "[SIO1] ERROR: server bind(): %d\n", WSAGetLastError());
+#else
 				fprintf(stderr, "[SIO1] ERROR: server bind()\n");
+#endif
 				return -1;
 			}
 
 			if(listen(serversock, 1) != 0) {
+#if defined _WINDOWS
+				fprintf(stderr, "[SIO1] ERROR: server listen(): %d\n", WSAGetLastError());
+#else
 				fprintf(stderr, "[SIO1] ERROR: server listen()\n");
+#endif
 				return -1;
 			}
 
@@ -99,14 +111,22 @@ int connectionOpen() {
 
 			clientsock = socket(AF_INET, SOCK_STREAM, 0);
 			if(clientsock == -1) {
+#if defined _WINDOWS
+				fprintf(stderr, "[SIO1] ERROR: client socket(): %d\n", WSAGetLastError());
+#else
 				fprintf(stderr, "[SIO1] ERROR: client socket()\n");
+#endif
 				return -1;
 			}
 
 			setsockopt(clientsock, IPPROTO_TCP, TCP_NODELAY, (const char*)&one, sizeof(one));
 
 			if(connect(clientsock,(struct sockaddr*)&address,sizeof(address)) != 0) {
-				fprintf(stderr, "[SIO1] ERROR: client connect(%s)\n", settings.ip);
+#if defined _WINDOWS
+				fprintf(stderr, "[SIO1] ERROR: client connect(%s): %d\n", settings.ip, WSAGetLastError());
+#else
+				fprintf(stderr, "[SIO1] ERROR: client connect(%s)", settings.ip);
+#endif
 				return -1;
 			}
 		}
diff --git a/plugins/bladesio1/gui.c b/plugins/bladesio1/gui.c
index 37ffb83f..9a265899 100644
--- a/plugins/bladesio1/gui.c
+++ b/plugins/bladesio1/gui.c
@@ -32,7 +32,7 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 
-#include "psxcommon.h"
+//#include "psxcommon.h"
 #include "psemu_plugin_defs.h"
 
 #include "cfg.c"
diff --git a/plugins/bladesio1/sio1.c b/plugins/bladesio1/sio1.c
index 453d7fec..feab1bb6 100755
--- a/plugins/bladesio1/sio1.c
+++ b/plugins/bladesio1/sio1.c
@@ -30,7 +30,10 @@
 void AboutDlgProc();
 void ConfDlgProc();
 #else
+#include <unistd.h>
 #include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/wait.h>
 #endif
 
 #include "typedefs.h"
diff --git a/plugins/dfcdrom/CMakeLists.txt b/plugins/dfcdrom/CMakeLists.txt
new file mode 100644
index 00000000..7860e414
--- /dev/null
+++ b/plugins/dfcdrom/CMakeLists.txt
@@ -0,0 +1,72 @@
+message(STATUS "* Configuring dfcdrom")
+
+include(GlibCompileResourcesSupport)
+
+option(USE_LIBCDIO "Use GNU libcdio for CD-ROM support." OFF)
+
+if (USE_LIBCDIO)
+  find_package(Cdio REQUIRED)
+  include_directories(${CDIO_INCLUDE_DIR})
+  add_definitions(-DUSE_LIBCDIO)
+endif()
+
+#deps
+
+find_package(GLib REQUIRED)
+if(NOT GLib_FOUND)
+    message(FATAL_ERROR "GLIB2 library not found")
+endif(NOT GLib_FOUND)
+include_directories(${GLib_INCLUDE_DIRS})
+
+find_package(GTK3 REQUIRED)
+if(NOT GTK3_FOUND)
+    message(FATAL_ERROR "GTK3 library not found")
+endif(NOT GTK3_FOUND)
+include_directories(${GTK3_INCLUDE_DIRS})
+set(GTK_LIBRARIES ${GTK3_LIBRARY} ${GDK3_LIBRARY} ${GDKPixbuf_LIBRARY} ${Pango_LIBRARY} ${Cairo_LIBRARY} ${GObject_LIBRARY} ${GLib_LIBRARY} ${GIO_LIBRARY})
+
+find_package(Threads REQUIRED)
+
+#defs
+add_definitions(-DLOCALE_DIR="${CMAKE_INSTALL_FULL_DATAROOTDIR}/locale/" -DPSEMU_DATA_DIR="${CMAKE_INSTALL_FULL_DATAROOTDIR}/psemu" -DDEF_PLUGIN_DIR="${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu")
+
+#sources
+set(PLUGIN_SRCS
+    cdr.c
+    cdr-libcdio.c
+    cdr-linux.c
+    cdr-null.c
+    cfg.c
+    util.c
+)
+
+set(GUI_SRCS
+    cdrcfg-0.1df/main.c
+)
+
+
+#resources
+set(RESOURCE_LIST
+    ${CMAKE_CURRENT_SOURCE_DIR}/cdrcfg-0.1df/dfcdrom.ui
+)
+
+
+compile_gresources(RESOURCE_FILE
+                   XML_OUT
+                   TYPE EMBED_C
+                   PREFIX /org/pcsxr/dfcdrom
+                   SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/cdrcfg-0.1df
+                   RESOURCES ${RESOURCE_LIST})
+
+add_custom_target(dfcdrom_resource DEPENDS ${RESOURCE_FILE})
+
+include_directories(${CMAKE_SOURCE_DIR}/libpcsxcore)
+add_library(DFCdrom MODULE ${PLUGIN_SRCS})
+target_link_libraries(DFCdrom ${CDIO_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+
+add_executable(cfgDFCdrom ${GUI_SRCS} ${RESOURCE_FILE})
+add_dependencies(cfgDFCdrom dfcdrom_resource)
+target_link_libraries(cfgDFCdrom ${GTK_LIBRARIES})
+
+install(TARGETS DFCdrom LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu)
+install(TARGETS cfgDFCdrom RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu)
diff --git a/plugins/dfcdrom/Makefile.am b/plugins/dfcdrom/Makefile.am
deleted file mode 100644
index 1f87998b..00000000
--- a/plugins/dfcdrom/Makefile.am
+++ /dev/null
@@ -1,58 +0,0 @@
-bindir = @libdir@/games/psemu/
-libdir = @libdir@/games/psemu/
-
-lib_LTLIBRARIES = libDFCdrom.la
-
-libDFCdrom_la_SOURCES = \
-	cdr.c \
-	cdr.h \
-	cfg.c \
-	cdr-linux.c \
-	cdr-null.c \
-	cdr-libcdio.c \
-	util.c
-
-libDFCdrom_la_CFLAGS =
-libDFCdrom_la_LDFLAGS = -module -avoid-version 
-libDFCdrom_la_LIBADD = -lpthread
-
-if USE_LIBCDIO
-libDFCdrom_la_CFLAGS += -DUSE_LIBCDIO=1 $(LIBCDIO_CFLAGS)
-libDFCdrom_la_LIBADD += $(LIBCDIO_LIBS)
-endif
-
-AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
-	-DDATADIR=\"${datadir}/psemu/\" \
-	$(GTK3_CFLAGS) \
-	-I$(top_srcdir)/libpcsxcore -I../../include
-
-bin_PROGRAMS = cfgDFCdrom
-cfgDFCdrom_SOURCES = cdrcfg-0.1df/main.c GtkResources.c GtkResources.h
-cfgDFCdrom_LDADD = $(GTK3_LIBS)
-
-# gresource.xml is dynamically generated in CMake. Mirror that here in a static way.
-define gresource_xml =
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/org/pcsxr/dfcdrom">
-    <file>dfcdrom.ui</file>
-  </gresource>
-</gresources>
-endef
-
-dfcdrom.gresource.xml:
-	$(file >$@,$(gresource_xml))
-dfcdrom_gresource: dfcdrom.gresource.xml
-	$(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/cdrcfg-0.1df --generate-dependencies $(srcdir)/$<)
-GtkResources.c: dfcdrom.gresource.xml $(dfcdrom_gresource)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/cdrcfg-0.1df --generate-source --c-name dfcdrom $<
-GtkResources.h: dfcdrom.gresource.xml $(dfcdrom_gresource)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/cdrcfg-0.1df --generate-header --c-name dfcdrom $<
-
-
-#glade_DATA = cdrcfg-0.1df/dfcdrom.ui
-#gladedir = $(datadir)/psemu/
-EXTRA_DIST = $(glade_DATA)
-
-CLEANFILES = dfcdrom.gresource.xml GtkResources.c GtkResources.h
-
diff --git a/plugins/dfcdrom/cdr.c b/plugins/dfcdrom/cdr.c
index ecd0d9a4..97a2735d 100755
--- a/plugins/dfcdrom/cdr.c
+++ b/plugins/dfcdrom/cdr.c
@@ -20,6 +20,10 @@
  */
 
 #include "cdr.h"
+#if defined(__linux__)
+#include <sys/types.h>
+#include <sys/wait.h>
+#endif 
 
 #ifndef USE_NULL
 static char *LibName = N_("CD-ROM Drive Reader");
diff --git a/plugins/dfinput/CMakeLists.txt b/plugins/dfinput/CMakeLists.txt
new file mode 100644
index 00000000..4899b85c
--- /dev/null
+++ b/plugins/dfinput/CMakeLists.txt
@@ -0,0 +1,82 @@
+message(STATUS "* Configuring dfinput")
+
+include(GlibCompileResourcesSupport)
+
+#deps
+
+find_package(GLib REQUIRED)
+if(NOT GLib_FOUND)
+    message(FATAL_ERROR "GLIB2 library not found")
+endif(NOT GLib_FOUND)
+include_directories(${GLib_INCLUDE_DIRS})
+
+find_package(GTK3 REQUIRED)
+if(NOT GTK3_FOUND)
+    message(FATAL_ERROR "GTK3 library not found")
+endif(NOT GTK3_FOUND)
+include_directories(${GTK3_INCLUDE_DIRS})
+set(GTK_LIBRARIES ${GTK3_LIBRARY} ${GDK3_LIBRARY} ${GDKPixbuf_LIBRARY} ${Pango_LIBRARY} ${Cairo_LIBRARY} ${GObject_LIBRARY} ${GLib_LIBRARY} ${GIO_LIBRARY})
+
+set(USE_SDL2 0)
+find_package(SDL2)
+if(NOT SDL2_FOUND)
+  find_package(SDL)
+    if(NOT SDL_FOUND)
+        message(FATAL_ERROR "SDL or SDL2 library not found")
+    else(NOT SDL_FOUND)
+        message(STATUS "Using SDL")
+        include_directories(${SDL_INCLUDE_DIR})
+    endif(NOT SDL_FOUND)
+else(NOT SDL2_FOUND)
+    set(USE_SDL2 1)
+    message(STATUS "Using SDL2")
+    include_directories(${SDL2_INCLUDE_DIR})
+endif(NOT SDL2_FOUND)
+
+find_package(X11 REQUIRED)
+find_package(Threads REQUIRED)
+
+#defs
+add_definitions(-DLOCALE_DIR="${CMAKE_INSTALL_FULL_DATAROOTDIR}/locale/" -DPSEMU_DATA_DIR="${CMAKE_INSTALL_FULL_DATAROOTDIR}/psemu" -DDEF_PLUGIN_DIR="${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu")
+
+#sources
+set(PLUGIN_SRCS
+    analog.c
+    cfg.c
+    pad.c
+    sdljoy.c
+    util.c
+    xkb.c
+)
+
+set(GUI_SRCS
+    cfg-gtk.c
+)
+
+
+#resources
+set(RESOURCE_LIST
+    ${CMAKE_CURRENT_SOURCE_DIR}/dfinput.ui
+)
+
+
+compile_gresources(RESOURCE_FILE
+                   XML_OUT
+                   TYPE EMBED_C
+                   PREFIX /org/pcsxr/dfinput
+                   SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}
+                   RESOURCES ${RESOURCE_LIST})
+
+add_custom_target(dfinput_resource DEPENDS ${RESOURCE_FILE})
+
+include_directories(${CMAKE_SOURCE_DIR}/libpcsxcore ${X11_X11_INCLUDE_PATH})
+add_library(DFInput MODULE ${PLUGIN_SRCS})
+target_link_libraries(DFInput ${SDL_LIBRARY} ${SDL2_LIBRARY} ${X11_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+
+
+add_executable(cfgDFInput ${GUI_SRCS} ${RESOURCE_FILE})
+add_dependencies(cfgDFInput dfinput_resource)
+target_link_libraries(cfgDFInput ${GTK_LIBRARIES} ${SDL_LIBRARY} ${SDL2_LIBRARY} ${X11_LIBRARIES})
+
+install(TARGETS DFInput LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu)
+install(TARGETS cfgDFInput RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu)
diff --git a/plugins/dfinput/Makefile.am b/plugins/dfinput/Makefile.am
deleted file mode 100644
index 458259c5..00000000
--- a/plugins/dfinput/Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
-bindir = @libdir@/games/psemu/
-libdir = @libdir@/games/psemu/
-
-lib_LTLIBRARIES = libDFInput.la
-
-libDFInput_la_SOURCES = cfg.c pad.c pad.h sdljoy.c xkb.c analog.c util.c util.h
-libDFInput_la_LDFLAGS = -module -avoid-version 
-libDFInput_la_LIBADD = -lpthread -lX11 $(SDL2_LIBS) $(SDL_LIBS)
-
-AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
-	-DDATADIR=\"${datadir}/psemu/\" \
-	$(GTK3_CFLAGS) \
-	-I../../include -I$(top_srcdir)/libpcsxcore $(SDL2_CFLAGS) $(SDL_CFLAGS)
-
-bin_PROGRAMS = cfgDFInput
-cfgDFInput_SOURCES = cfg-gtk.c pad.h GtkResources.c GtkResources.h
-cfgDFInput_LDADD = $(GTK3_LIBS) $(SDL2_LIBS) $(SDL_LIBS) -lX11
-
-# gresource.xml is dynamically generated in CMake. Mirror that here in a static way.
-define gresource_xml =
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/org/pcsxr/dfinput">
-    <file>dfinput.ui</file>
-  </gresource>
-</gresources>
-endef
-
-dfinput.gresource.xml:
-	$(file >$@,$(gresource_xml))
-dfinput_gresource: dfinput.gresource.xml
-	$(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/$<)
-GtkResources.c: dfinput.gresource.xml $(dfinput_gresource)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source --c-name dfinput $<
-GtkResources.h: dfinput.gresource.xml $(dfinput_gresource)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-header --c-name dfinput $<
-
-
-#glade_DATA = dfinput.ui
-#gladedir = $(datadir)/psemu/
-EXTRA_DIST = $(glade_DATA)
-
-CLEANFILES = dfinput.gresource.xml GtkResources.c GtkResources.h
diff --git a/plugins/dfnet/CMakeLists.txt b/plugins/dfnet/CMakeLists.txt
new file mode 100644
index 00000000..b768a5f1
--- /dev/null
+++ b/plugins/dfnet/CMakeLists.txt
@@ -0,0 +1,60 @@
+message(STATUS "* Configuring dfnet")
+
+include(GlibCompileResourcesSupport)
+
+#deps
+
+find_package(GLib REQUIRED)
+if(NOT GLib_FOUND)
+    message(FATAL_ERROR "GLIB2 library not found")
+endif(NOT GLib_FOUND)
+include_directories(${GLib_INCLUDE_DIRS})
+
+find_package(GTK3 REQUIRED)
+if(NOT GTK3_FOUND)
+    message(FATAL_ERROR "GTK3 library not found")
+endif(NOT GTK3_FOUND)
+include_directories(${GTK3_INCLUDE_DIRS})
+set(GTK_LIBRARIES ${GTK3_LIBRARY} ${GDK3_LIBRARY} ${GDKPixbuf_LIBRARY} ${Pango_LIBRARY} ${Cairo_LIBRARY} ${GObject_LIBRARY} ${GLib_LIBRARY} ${GIO_LIBRARY})
+
+
+#defs
+add_definitions(-DLOCALE_DIR="${CMAKE_INSTALL_FULL_DATAROOTDIR}/locale/" -DPSEMU_DATA_DIR="${CMAKE_INSTALL_FULL_DATAROOTDIR}/psemu" -DDEF_PLUGIN_DIR="${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu")
+
+#sources
+set(PLUGIN_SRCS
+    cfg.c
+    dfnet.c
+    unix.c
+)
+
+set(GUI_SRCS
+    gui.c
+)
+
+
+#resources
+set(RESOURCE_LIST
+    ${CMAKE_CURRENT_SOURCE_DIR}/dfnet.ui
+)
+
+
+compile_gresources(RESOURCE_FILE
+                   XML_OUT
+                   TYPE EMBED_C
+                   PREFIX /org/pcsxr/dfnet
+                   SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}
+                   RESOURCES ${RESOURCE_LIST})
+
+add_custom_target(dfnet_resource DEPENDS ${RESOURCE_FILE})
+
+include_directories(${CMAKE_SOURCE_DIR}/libpcsxcore)
+add_library(DFNet MODULE ${PLUGIN_SRCS})
+
+
+add_executable(cfgDFNet ${GUI_SRCS} ${RESOURCE_FILE})
+add_dependencies(cfgDFNet dfnet_resource)
+target_link_libraries(cfgDFNet ${GTK_LIBRARIES})
+
+install(TARGETS DFNet LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu)
+install(TARGETS cfgDFNet RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu)
diff --git a/plugins/dfnet/Makefile.am b/plugins/dfnet/Makefile.am
deleted file mode 100755
index f0a53ea0..00000000
--- a/plugins/dfnet/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-bindir = @libdir@/games/psemu/
-libdir = @libdir@/games/psemu/
-
-lib_LTLIBRARIES = libDFNet.la
-
-libDFNet_la_SOURCES = dfnet.c dfnet.h unix.c cfg.c
-libDFNet_la_LDFLAGS = -module -avoid-version
-
-AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
-	-DDATADIR=\"${datadir}/psemu/\" \
-	$(GTK3_CFLAGS) \
-	-I$(top_srcdir)/libpcsxcore -I../../include
-
-bin_PROGRAMS = cfgDFNet
-cfgDFNet_SOURCES = gui.c GtkResources.c GtkResources.h
-cfgDFNet_LDADD = $(GTK3_LIBS)
-
-# gresource.xml is dynamically generated in CMake. Mirror that here in a static way.
-define gresource_xml =
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/org/pcsxr/dfnet">
-    <file>dfnet.ui</file>
-  </gresource>
-</gresources>
-endef
-
-dfnet.gresource.xml:
-	$(file >$@,$(gresource_xml))
-dfnet_gresource: dfnet.gresource.xml
-	$(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/$<)
-GtkResources.c: dfnet.gresource.xml $(dfnet_gresource)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source --c-name dfnet $<
-GtkResources.h: dfnet.gresource.xml $(dfnet_gresource)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-header --c-name dfnet $<
-
-
-#glade_DATA = dfnet.ui
-#gladedir = $(datadir)/psemu/
-EXTRA_DIST = $(glade_DATA)
-
-CLEANFILES = dfnet.gresource.xml GtkResources.c GtkResources.h
diff --git a/plugins/dfsound/CMakeLists.txt b/plugins/dfsound/CMakeLists.txt
new file mode 100644
index 00000000..865ddc13
--- /dev/null
+++ b/plugins/dfsound/CMakeLists.txt
@@ -0,0 +1,135 @@
+message(STATUS "* Configuring dfsound")
+
+include(GlibCompileResourcesSupport)
+
+set(SND_BACKEND "sdl" CACHE STRING "Sound backend to use.")
+set_property(CACHE SND_BACKEND PROPERTY STRINGS oss alsa pulse sdl openal null)
+
+#deps
+
+find_package(GLib REQUIRED)
+if(NOT GLib_FOUND)
+    message(FATAL_ERROR "GLIB2 library not found")
+endif(NOT GLib_FOUND)
+include_directories(${GLib_INCLUDE_DIRS})
+
+find_package(GTK3 REQUIRED)
+if(NOT GTK3_FOUND)
+    message(FATAL_ERROR "GTK3 library not found")
+endif(NOT GTK3_FOUND)
+include_directories(${GTK3_INCLUDE_DIRS})
+set(GTK_LIBRARIES ${GTK3_LIBRARY} ${GDK3_LIBRARY} ${GDKPixbuf_LIBRARY} ${Pango_LIBRARY} ${Cairo_LIBRARY} ${GObject_LIBRARY} ${GLib_LIBRARY} ${GIO_LIBRARY})
+
+
+if (${SND_BACKEND} STREQUAL "oss")
+  find_package(OSS REQUIRED)
+  include_directories(${OSS_INCLUDE_DIR})
+  add_definitions(-DUSEOSS=1)
+
+elseif (${SND_BACKEND} STREQUAL "alsa")
+  find_package(ALSA REQUIRED)
+  include_directories(${ALSA_INCLUDE_DIRS})
+  add_definitions(-DUSEALSA=1)
+
+elseif (${SND_BACKEND} STREQUAL "pulse")
+  find_package(PulseAudio REQUIRED)
+  include_directories(${PULSEAUDIO_INCLUDE_DIR})
+  add_definitions(-DUSEPULSEAUDIO=1)
+
+elseif (${SND_BACKEND} STREQUAL "sdl")
+  find_package(SDL2)
+  if(NOT SDL2_FOUND)
+    find_package(SDL)
+      if(NOT SDL_FOUND)
+          message(FATAL_ERROR "SDL or SDL2 library not found")
+      else(NOT SDL_FOUND)
+          message(STATUS "Using SDL")
+          include_directories(${SDL_INCLUDE_DIR})
+      endif(NOT SDL_FOUND)
+  else(NOT SDL2_FOUND)
+      set(USE_SDL2 1)
+      message(STATUS "Using SDL2")
+      include_directories(${SDL2_INCLUDE_DIR})
+  endif(NOT SDL2_FOUND)
+  add_definitions(-DUSESDL=1)
+
+elseif (${SND_BACKEND} STREQUAL "openal")
+  find_package(OpenAL REQUIRED)
+  include_directories(${OPENAL_INCLUDE_DIR})
+  add_definitions(-DUSEOPENAL=1)
+elseif (${SND_BACKEND} STREQUAL "null")
+  add_definitions(-DUSENULL=1)
+
+endif()
+
+find_package(Threads REQUIRED)
+
+#defs
+add_definitions(-DLOCALE_DIR="${CMAKE_INSTALL_FULL_DATAROOTDIR}/locale/" -DPSEMU_DATA_DIR="${CMAKE_INSTALL_FULL_DATAROOTDIR}/psemu" -DDEF_PLUGIN_DIR="${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu")
+
+#sources
+set(PLUGIN_SRCS
+    adsr.c
+    cfg.c
+    dma.c
+    externals.c
+    freeze.c
+    registers.c
+    reverb.c
+    spu.c
+    xa.c
+)
+
+set(GUI_SRCS
+    spucfg-0.1df/main.c
+)
+
+
+#resources
+set(RESOURCE_LIST
+    ${CMAKE_CURRENT_SOURCE_DIR}/spucfg-0.1df/dfsound.ui
+)
+
+
+compile_gresources(RESOURCE_FILE
+                   XML_OUT
+                   TYPE EMBED_C
+                   PREFIX /org/pcsxr/dfsound
+                   SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/spucfg-0.1df
+                   RESOURCES ${RESOURCE_LIST})
+
+add_custom_target(dfsound_resource DEPENDS ${RESOURCE_FILE})
+
+include_directories(${CMAKE_SOURCE_DIR}/libpcsxcore)
+
+if (${SND_BACKEND} STREQUAL "oss")
+    add_library(DFSound MODULE ${PLUGIN_SRCS} oss.c)
+
+elseif (${SND_BACKEND} STREQUAL "alsa")
+    add_library(DFSound MODULE ${PLUGIN_SRCS} alsa.c)
+    target_link_libraries(DFSound ${ALSA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+
+elseif (${SND_BACKEND} STREQUAL "pulse")
+    add_library(DFSound MODULE ${PLUGIN_SRCS} pulseaudio.c)
+    target_link_libraries(DFSound ${PULSEAUDIO_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
+
+elseif (${SND_BACKEND} STREQUAL "sdl")
+    add_library(DFSound MODULE ${PLUGIN_SRCS} sdl.c)
+    target_link_libraries(DFSound ${SDL_LIBRARY} ${SDL2_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
+
+elseif (${SND_BACKEND} STREQUAL "openal")
+    add_library(DFSound MODULE ${PLUGIN_SRCS} openal.c)
+    target_link_libraries(DFSound ${OPENAL_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
+
+elseif (${SND_BACKEND} STREQUAL "null")
+    add_library(DFSound MODULE ${PLUGIN_SRCS} nullsnd.c)
+
+endif()
+
+
+add_executable(cfgDFSound ${GUI_SRCS} ${RESOURCE_FILE})
+add_dependencies(cfgDFSound dfsound_resource)
+target_link_libraries(cfgDFSound ${GTK_LIBRARIES})
+
+install(TARGETS DFSound LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu)
+install(TARGETS cfgDFSound RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu)
diff --git a/plugins/dfsound/Makefile.am b/plugins/dfsound/Makefile.am
deleted file mode 100755
index 9f8130a1..00000000
--- a/plugins/dfsound/Makefile.am
+++ /dev/null
@@ -1,79 +0,0 @@
-AM_CPPFLAGS = -I../../include
-
-bindir = @libdir@/games/psemu/
-libdir = @libdir@/games/psemu/
-
-lib_LTLIBRARIES = libDFSound.la
-
-libDFSound_la_SOURCES = adsr.c adsr.h spu.c spu.h cfg.c cfg.h dma.c dma.h gauss_i.h freeze.c reverb.c reverb.h registers.c registers.h externals.c externals.h dsoundoss.h psemuxa.h regs.h xa.c xa.h stdafx.h
-
-libDFSound_la_CPPFLAGS = $(AM_CPPFLAGS)
-libDFSound_la_LDFLAGS = -module -avoid-version 
-libDFSound_la_LIBADD = -lpthread -lm
-
-if SOUND_ALSA
-libDFSound_la_SOURCES += alsa.c
-libDFSound_la_CPPFLAGS += -DUSEALSA=1
-libDFSound_la_LIBADD += $(ALSA_LIBS)
-endif
-
-if SOUND_OSS
-libDFSound_la_SOURCES += oss.c
-libDFSound_la_CPPFLAGS += -DUSEOSS=1
-endif
-
-if SOUND_PULSEAUDIO
-libDFSound_la_SOURCES += pulseaudio.c
-libDFSound_la_CPPFLAGS += -DUSEPULSEAUDIO=1 $(PULSEAUDIO_CFLAGS)
-libDFSound_la_LIBADD += $(PULSEAUDIO_LIBS)
-endif
-
-if SOUND_SDL
-libDFSound_la_SOURCES += sdl.c
-libDFSound_la_CPPFLAGS += -DUSESDL=1 $(SDL2_CFLAGS) $(SDL_CFLAGS)
-libDFSound_la_LIBADD += $(SDL2_LIBS) $(SDL_LIBS)
-endif
-
-if SOUND_OPENAL
-libDFSound_la_SOURCES += openal.c
-libDFSound_la_CPPFLAGS += -DUSEOPENAL=1
-libDFSound_la_LIBADD += $(OPENAL_LIBS)
-endif
-
-if SOUND_NULL
-libDFSound_la_SOURCES += nullsnd.c
-libDFSound_la_CPPFLAGS += -DUSENULL=1
-endif
-
-bin_PROGRAMS = cfgDFSound
-cfgDFSound_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
-	-DDATADIR=\"${datadir}/psemu/\" \
-	$(GTK3_CFLAGS) $(AM_CPPFLAGS)
-cfgDFSound_SOURCES = spucfg-0.1df/main.c GtkResources.c GtkResources.h
-cfgDFSound_LDADD = $(GTK3_LIBS)
-
-# gresource.xml is dynamically generated in CMake. Mirror that here in a static way.
-define gresource_xml =
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/org/pcsxr/dfsound">
-    <file>dfsound.ui</file>
-  </gresource>
-</gresources>
-endef
-
-dfsound.gresource.xml:
-	$(file >$@,$(gresource_xml))
-dfsound_gresource: dfsound.gresource.xml
-	$(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/spucfg-0.1df --generate-dependencies $(srcdir)/$<)
-GtkResources.c: dfsound.gresource.xml $(dfsound_gresource)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/spucfg-0.1df --generate-source --c-name dfsound $<
-GtkResources.h: dfsound.gresource.xml $(dfsound_gresource)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/spucfg-0.1df --generate-header --c-name dfsound $<
-
-#glade_DATA = spucfg-0.1df/dfsound.ui
-#gladedir = $(datadir)/psemu/
-EXTRA_DIST = $(glade_DATA)
-
-CLEANFILES = dfsound.gresource.xml GtkResources.c GtkResources.h
-
diff --git a/plugins/dfsound/cfg.c b/plugins/dfsound/cfg.c
index 0bb2172c..0e1f63fa 100755
--- a/plugins/dfsound/cfg.c
+++ b/plugins/dfsound/cfg.c
@@ -26,6 +26,10 @@
 ////////////////////////////////////////////////////////////////////////
 
 #include <unistd.h>
+#if defined(__linux__)
+#include <sys/types.h>
+#include <sys/wait.h>
+#endif
 
 ////////////////////////////////////////////////////////////////////////
 // START EXTERNAL CFG TOOL
diff --git a/plugins/dfxvideo/CMakeLists.txt b/plugins/dfxvideo/CMakeLists.txt
new file mode 100644
index 00000000..8162d009
--- /dev/null
+++ b/plugins/dfxvideo/CMakeLists.txt
@@ -0,0 +1,69 @@
+message(STATUS "* Configuring dfxvideo")
+
+include(GlibCompileResourcesSupport)
+
+#deps
+
+find_package(GLib REQUIRED)
+if(NOT GLib_FOUND)
+    message(FATAL_ERROR "GLIB2 library not found")
+endif(NOT GLib_FOUND)
+include_directories(${GLib_INCLUDE_DIRS})
+
+find_package(GTK3 REQUIRED)
+if(NOT GTK3_FOUND)
+    message(FATAL_ERROR "GTK3 library not found")
+endif(NOT GTK3_FOUND)
+include_directories(${GTK3_INCLUDE_DIRS})
+set(GTK_LIBRARIES ${GTK3_LIBRARY} ${GDK3_LIBRARY} ${GDKPixbuf_LIBRARY} ${Pango_LIBRARY} ${Cairo_LIBRARY} ${GObject_LIBRARY} ${GLib_LIBRARY} ${GIO_LIBRARY})
+
+
+find_package(X11 REQUIRED)
+
+#defs
+add_definitions(-DLOCALE_DIR="${CMAKE_INSTALL_FULL_DATAROOTDIR}/locale/" -DPSEMU_DATA_DIR="${CMAKE_INSTALL_FULL_DATAROOTDIR}/psemu" -DDEF_PLUGIN_DIR="${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu")
+
+#sources
+set(PLUGIN_SRCS
+    cfg.c
+    draw.c
+    fps.c
+    gpu.c
+    key.c
+    menu.c
+    prim.c
+    soft.c
+    zn.c
+)
+
+set(GUI_SRCS
+    gpucfg-0.1df/main.c
+)
+
+
+#resources
+set(RESOURCE_LIST
+    ${CMAKE_CURRENT_SOURCE_DIR}/gpucfg-0.1df/dfxvideo.ui
+)
+
+
+compile_gresources(RESOURCE_FILE
+                   XML_OUT
+                   TYPE EMBED_C
+                   PREFIX /org/pcsxr/dfxvideo
+                   SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/gpucfg-0.1df
+                   RESOURCES ${RESOURCE_LIST})
+
+add_custom_target(dfxvideo_resource DEPENDS ${RESOURCE_FILE})
+
+include_directories(${CMAKE_SOURCE_DIR}/libpcsxcore ${X11_X11_INCLUDE_PATH} ${X11_Xv_INCLUDE_PATH} ${X11_XShm_INCLUDE_PATH})
+add_library(DFXVideo MODULE ${PLUGIN_SRCS})
+target_link_libraries(DFXVideo ${X11_LIBRARIES} ${X11_Xv_LIB} ${X11_Xext_LIB} -lm)
+
+
+add_executable(cfgDFXVideo ${GUI_SRCS} ${RESOURCE_FILE})
+add_dependencies(cfgDFXVideo dfxvideo_resource)
+target_link_libraries(cfgDFXVideo ${GTK_LIBRARIES})
+
+install(TARGETS DFXVideo LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu)
+install(TARGETS cfgDFXVideo RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu)
diff --git a/plugins/dfxvideo/Makefile.am b/plugins/dfxvideo/Makefile.am
deleted file mode 100755
index 520749b2..00000000
--- a/plugins/dfxvideo/Makefile.am
+++ /dev/null
@@ -1,57 +0,0 @@
-STRIP_FPIC = sh $(top_srcdir)/strip_fPIC.sh
-
-SUFFIXES = .asm
-
-.asm.lo:
-	$(LIBTOOL) --tag=CC --mode=compile \
-	$(STRIP_FPIC) $(NASM) -f elf -d ELF -I${srcdir}/ $<
-
-AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
-	-DDATADIR=\"${datadir}/psemu/\" \
-	$(GTK3_CFLAGS)\
-	-I$(top_srcdir)/libpcsxcore \
-	-I../../include
-
-bindir = @libdir@/games/psemu/
-libdir = @libdir@/games/psemu/
-
-lib_LTLIBRARIES = libDFXVideo.la
-
-libDFXVideo_la_SOURCES = gpu.c gpu.h cfg.c cfg.h draw.c draw.h fps.c fps.h key.c key.h menu.c menu.h prim.c prim.h soft.c soft.h zn.c swap.h externals.h hq2x.h hq3x.h interp.h
-if X86_NASM
-libDFXVideo_la_SOURCES += i386.asm macros.inc
-AM_CPPFLAGS += -DUSE_NASM=1
-endif
-libDFXVideo_la_LDFLAGS = -module -avoid-version
-libDFXVideo_la_LIBADD = -lX11 -lXv -lXext -lm
-
-bin_PROGRAMS = cfgDFXVideo
-cfgDFXVideo_SOURCES = gpucfg-0.1df/main.c GtkResources.c GtkResources.h
-cfgDFXVideo_LDADD = $(GTK3_LIBS) -lXext
-
-# gresource.xml is dynamically generated in CMake. Mirror that here in a static way.
-define gresource_xml =
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/org/pcsxr/dfxvideo">
-    <file>dfxvideo.ui</file>
-  </gresource>
-</gresources>
-endef
-
-dfxvideo.gresource.xml:
-	$(file >$@,$(gresource_xml))
-dfxvideo_gresource: dfxvideo.gresource.xml
-	$(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/gpucfg-0.1df --generate-dependencies $(srcdir)/$<)
-GtkResources.c: dfxvideo.gresource.xml $(dfxvideo_gresource)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/gpucfg-0.1df --generate-source --c-name dfxvideo $<
-GtkResources.h: dfxvideo.gresource.xml $(dfxvideo_gresource)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/gpucfg-0.1df --generate-header --c-name dfxvideo $<
-
-
-#glade_DATA = gpucfg-0.1df/dfxvideo.ui
-#gladedir = $(datadir)/psemu/
-EXTRA_DIST = $(glade_DATA)
-
-CLEANFILES = dfxvideo.gresource.xml GtkResources.c GtkResources.h
-
diff --git a/plugins/dfxvideo/cfg.c b/plugins/dfxvideo/cfg.c
index 1bf879b8..67f79a8a 100755
--- a/plugins/dfxvideo/cfg.c
+++ b/plugins/dfxvideo/cfg.c
@@ -20,6 +20,10 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <stdlib.h>
+#if defined(__linux__)
+#include <sys/types.h>
+#include <sys/wait.h>
+#endif
 
 #undef FALSE
 #undef TRUE
diff --git a/plugins/nullsio1/CMakeLists.txt b/plugins/nullsio1/CMakeLists.txt
new file mode 100644
index 00000000..b7eaf48a
--- /dev/null
+++ b/plugins/nullsio1/CMakeLists.txt
@@ -0,0 +1,21 @@
+message(STATUS "* Configuring nullsio1")
+
+
+#deps
+
+
+#defs
+add_definitions(-DLOCALE_DIR="${CMAKE_INSTALL_FULL_DATAROOTDIR}/locale/" -DPSEMU_DATA_DIR="${CMAKE_INSTALL_FULL_DATAROOTDIR}/psemu" -DDEF_PLUGIN_DIR="${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu")
+
+#sources
+set(PLUGIN_SRCS
+    sio1.c
+)
+
+
+include_directories(${CMAKE_SOURCE_DIR}/libpcsxcore)
+add_library(NullSio1 MODULE ${PLUGIN_SRCS})
+
+
+
+install(TARGETS NullSio1 LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu)
diff --git a/plugins/nullsio1/Makefile.am b/plugins/nullsio1/Makefile.am
deleted file mode 100644
index 9d78b632..00000000
--- a/plugins/nullsio1/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-bindir = @libdir@/games/psemu/
-libdir = @libdir@/games/psemu/
-
-lib_LTLIBRARIES = libNullSio1.la
-
-libNullSio1_la_SOURCES = sio1.c typedefs.h
-libNullSio1_la_LDFLAGS = -module -avoid-version
-
-AM_CPPFLAGS = -DDATADIR=\"${datadir}/psemu/\" \
-	-I$(top_srcdir)/libpcsxcore -I../../include
diff --git a/plugins/peopsxgl/CMakeLists.txt b/plugins/peopsxgl/CMakeLists.txt
new file mode 100644
index 00000000..d622ce6f
--- /dev/null
+++ b/plugins/peopsxgl/CMakeLists.txt
@@ -0,0 +1,76 @@
+message(STATUS "* Configuring peopsxgl")
+
+include(GlibCompileResourcesSupport)
+
+#deps
+
+find_package(GLib REQUIRED)
+if(NOT GLib_FOUND)
+    message(FATAL_ERROR "GLIB2 library not found")
+endif(NOT GLib_FOUND)
+include_directories(${GLib_INCLUDE_DIRS})
+
+find_package(GTK3 REQUIRED)
+if(NOT GTK3_FOUND)
+    message(FATAL_ERROR "GTK3 library not found")
+endif(NOT GTK3_FOUND)
+include_directories(${GTK3_INCLUDE_DIRS})
+set(GTK_LIBRARIES ${GTK3_LIBRARY} ${GDK3_LIBRARY} ${GDKPixbuf_LIBRARY} ${Pango_LIBRARY} ${Cairo_LIBRARY} ${GObject_LIBRARY} ${GLib_LIBRARY} ${GIO_LIBRARY})
+
+find_package(X11 REQUIRED)
+
+find_package(OpenGL REQUIRED)
+if(NOT OPENGL_FOUND)
+    message(FATAL_ERROR "GL library not found")
+endif(NOT OPENGL_FOUND)
+include_directories(${OPENGL_INCLUDE_DIR})
+
+#defs
+add_definitions(-DLOCALE_DIR="${CMAKE_INSTALL_FULL_DATAROOTDIR}/locale/" -DPSEMU_DATA_DIR="${CMAKE_INSTALL_FULL_DATAROOTDIR}/psemu" -DDEF_PLUGIN_DIR="${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu")
+
+#sources
+set(PLUGIN_SRCS
+    cfg.c
+    draw.c
+    fps.c
+    gpu.c
+    gte_accuracy.c
+    key.c
+    menu.c
+    prim.c
+    soft.c
+    texture.c
+    pgxp_gpu.c
+)
+
+set(GUI_SRCS
+    gpucfg/main.c
+)
+
+
+#resources
+set(RESOURCE_LIST
+    ${CMAKE_CURRENT_SOURCE_DIR}/gpucfg/peopsxgl.ui
+)
+
+
+compile_gresources(RESOURCE_FILE
+                   XML_OUT
+                   TYPE EMBED_C
+                   PREFIX /org/pcsxr/peopsxgl
+                   SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/gpucfg
+                   RESOURCES ${RESOURCE_LIST})
+
+add_custom_target(peopsxgl_resource DEPENDS ${RESOURCE_FILE})
+
+include_directories(${CMAKE_SOURCE_DIR}/libpcsxcore ${X11_X11_INCLUDE_PATH} ${X11_xf86vmode_INCLUDE_PATH} ${OPENGL_INCLUDE_DIR})
+add_library(peopsxgl MODULE ${PLUGIN_SRCS})
+target_link_libraries(peopsxgl ${X11_LIBRARIES} ${X11_Xxf86vm_LIB} ${OPENGL_gl_LIBRARY})
+
+
+add_executable(cfgpeopsxgl ${GUI_SRCS} ${RESOURCE_FILE})
+add_dependencies(cfgpeopsxgl dfinput_resource)
+target_link_libraries(cfgpeopsxgl ${GTK_LIBRARIES})
+
+install(TARGETS peopsxgl LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu)
+install(TARGETS cfgpeopsxgl RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu)
diff --git a/plugins/peopsxgl/Makefile.am b/plugins/peopsxgl/Makefile.am
deleted file mode 100755
index 576e140d..00000000
--- a/plugins/peopsxgl/Makefile.am
+++ /dev/null
@@ -1,57 +0,0 @@
-AM_CPPFLAGS = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
-	-DLOCALE_DIR=\"${datadir}/locale/\" \
-	-DDATADIR=\"${datadir}/psemu/\" \
-	$(GTK3_CFLAGS) \
-	-I$(top_srcdir)/libpcsxcore -I../../include
-
-bindir = @libdir@/games/psemu/
-libdir = @libdir@/games/psemu/
-
-lib_LTLIBRARIES = libpeopsxgl.la
-
-libpeopsxgl_la_SOURCES = \
-	cfg.c cfg.h \
-	draw.c draw.h \
-	fps.c fps.h \
-	gl_ext.h \
-	gpu.c gpu.h \
-	key.c key.h \
-	menu.c menu.h \
-	prim.c prim.h \
-	soft.c soft.h \
-	texture.c texture.h \
-	gte_accuracy.c gte_accuracy.h \
-	pgxp_gpu.c pgxp_gpu.h
-libpeopsxgl_la_LDFLAGS = -module -avoid-version
-libpeopsxgl_la_LIBADD = -lX11 -lXxf86vm -lGL -lm
-
-bin_PROGRAMS = cfgpeopsxgl
-cfgpeopsxgl_SOURCES = gpucfg/main.c GtkResources.c GtkResources.h
-cfgpeopsxgl_LDADD = $(GTK3_LIBS)
-
-# gresource.xml is dynamically generated in CMake. Mirror that here in a static way.
-define gresource_xml =
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/org/pcsxr/peopsxgl">
-    <file>peopsxgl.ui</file>
-  </gresource>
-</gresources>
-endef
-
-peopsxgl.gresource.xml:
-	$(file >$@,$(gresource_xml))
-peopsxgl_gresource: peopsxgl.gresource.xml
-	$(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/gpucfg --generate-dependencies $(srcdir)/$<)
-GtkResources.c: peopsxgl.gresource.xml $(peopsxgl_gresource)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/gpucfg --generate-source --c-name peopsxgl $<
-GtkResources.h: peopsxgl.gresource.xml $(peopsxgl_gresource)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/gpucfg --generate-header --c-name peopsxgl $<
-
-
-#glade_DATA = gpucfg/peopsxgl.ui
-#gladedir = $(datadir)/psemu/
-EXTRA_DIST = $(glade_DATA)
-
-CLEANFILES = peopsxgl.gresource.xml GtkResources.c GtkResources.h
-
diff --git a/plugins/peopsxgl/draw.c b/plugins/peopsxgl/draw.c
index c7a778a8..c60d9379 100755
--- a/plugins/peopsxgl/draw.c
+++ b/plugins/peopsxgl/draw.c
@@ -1020,7 +1020,6 @@ BOOL offsetline(unsigned int* addr)
  vertex[1].y=(short)((float)y1+px);
  vertex[2].y=(short)((float)y1+py);
 
-
  if(vertex[0].x==vertex[3].x &&                        // ortho rect? done
     vertex[1].x==vertex[2].x &&
     vertex[0].y==vertex[1].y &&
diff --git a/plugins/peopsxgl/gpu.c b/plugins/peopsxgl/gpu.c
index c19dd2b6..12c453b5 100755
--- a/plugins/peopsxgl/gpu.c
+++ b/plugins/peopsxgl/gpu.c
@@ -35,6 +35,10 @@ static int iOldMode=0;
 
 #endif
 
+#if defined(__linux__)
+#include <sys/wait.h>
+#endif
+
 #define _IN_GPU
 
 #include "externals.h"
@@ -1088,13 +1092,7 @@ long GPUopen(unsigned long * disp,char * CapText,char * CfgFile)
  GLinitialize();                                       // init opengl
 
  if(disp)
-  {
-#if defined (_MACGL)
-   *disp = display;
-#else
-   *disp=(unsigned long *)display;                       // return display ID to main emu
-#endif
-  }
+   *disp = (unsigned long)display;                     // return display ID to main emu
 
  if(display) return 0;
  return -1;
@@ -1317,7 +1315,6 @@ void SetScanLines(void)
 
  //PGXP_SetMatrix(0, PSXDisplay.DisplayMode.x, PSXDisplay.DisplayMode.y, 0, -1, 1);
 
-
  if(bKeepRatio)
   glViewport(rRatioRect.left,
              iResY-(rRatioRect.top+rRatioRect.bottom),
@@ -1895,7 +1892,6 @@ void updateDisplayIfChanged(void)
 
  //  PGXP_SetMatrix(0, PSXDisplay.DisplayModeNew.x, PSXDisplay.DisplayModeNew.y, 0, -1, 1);
 
-
    if(bKeepRatio) SetAspectRatio();
   }
 
diff --git a/plugins/peopsxgl/prim.c b/plugins/peopsxgl/prim.c
index 1af588f0..b03d87d7 100755
--- a/plugins/peopsxgl/prim.c
+++ b/plugins/peopsxgl/prim.c
@@ -155,7 +155,6 @@ static __inline void PRIMdrawTexturedQuad(OGLVertex* vertex1, OGLVertex* vertex2
 		if(PGXP_DrawDebugTriQuad(vertex1, vertex2, vertex4, vertex3, COLOUR_NONE, 1))
 		return;
 	}
-		
 
  glBegin(GL_TRIANGLE_STRIP);
   glTexCoord2fv(&vertex1->sow);
@@ -2553,7 +2552,6 @@ void DrawMultiBlur(void)
  fx=(float)PSXDisplay.DisplayMode.x/(float)(iResX); 
  fy=(float)PSXDisplay.DisplayMode.y/(float)(iResY);
 
-
  for (unsigned int i = 0; i < 4; ++i)
  {
 	 vertex[i].PGXP_flag = 999;
diff --git a/plugins/peopsxgl/stdafx.h b/plugins/peopsxgl/stdafx.h
index b069ba25..ab40002e 100755
--- a/plugins/peopsxgl/stdafx.h
+++ b/plugins/peopsxgl/stdafx.h
@@ -62,6 +62,8 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #include <sys/time.h>
+#include <sys/types.h>
+#include <sys/wait.h>
 #include <GL/gl.h>
 #include <GL/glx.h>
 #include <math.h>