Start properly implementing libretro SDK for boolean.h include

header, glsym, and rthreads
2024-12-27 15:29:23 +00:00 · 2014-10-21 05:05:52 +02:00 · 2014-10-21 05:05:52 +02:00 · c62d52de0f
commit c62d52de0f
parent 0209536d4b
136 changed files with 1215 additions and 171 deletions
--- a/Makefile.common
+++ b/Makefile.common
@ -33,6 +33,8 @@ ifeq ($(REENTRANT_TEST), 1)
   OBJ += console/test.o
 endif

+CFLAGS += -I./libretro-sdk/include
+
 # Switches

 # Extra menu drivers if GL supported
@ -292,7 +294,7 @@ ifeq ($(HAVE_FREETYPE), 1)
 endif

 ifeq ($(HAVE_THREADS), 1)
-   OBJ += autosave.o rthreads/rthreads.o gfx/video_thread_wrapper.o audio/audio_thread_wrapper.o
+   OBJ += autosave.o libretro-sdk/rthreads/rthreads.o gfx/video_thread_wrapper.o audio/audio_thread_wrapper.o
   DEFINES += -DHAVE_THREADS
   ifeq ($(findstring Haiku,$(OS)),)
      LIBS += -lpthread
@ -362,7 +364,7 @@ ifeq ($(HAVE_OPENGL), 1)
 			 gfx/fonts/gl_raster_font.o \
 			 gfx/math/matrix.o \
 			 gfx/state_tracker.o \
-			 gfx/glsym/rglgen.o
+			 libretro-sdk/glsym/rglgen.o

   ifeq ($(HAVE_KMS), 1)
      OBJ += gfx/context/drm_egl_ctx.o
@ -415,10 +417,10 @@ ifeq ($(HAVE_OPENGL), 1)
      ifeq ($(HAVE_GLES3), 1)
         DEFINES += -DHAVE_OPENGLES3
      endif
-      OBJ += gfx/glsym/glsym_es2.o
+      OBJ += libretro-sdk/glsym/glsym_es2.o
   else
      DEFINES += -DHAVE_GL_SYNC
-      OBJ += gfx/glsym/glsym_gl.o
+      OBJ += libretro-sdk/glsym/glsym_gl.o
      ifeq ($(OSX), 1)
         LIBS += -framework OpenGL
      else ifneq ($(findstring Win32,$(OS)),)
--- a/Makefile.griffin
+++ b/Makefile.griffin
@ -133,6 +133,8 @@ CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)

 OBJ = griffin/griffin.o  $(PLATOBJS)

+INCLUDE += -I./libretro-sdk/include
+
 ifeq ($(HAVE_LOGGER), 1)
 CFLAGS		+= -DHAVE_LOGGER
 CFLAGS      += -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
--- a/Makefile.ps3
+++ b/Makefile.ps3
@ -34,7 +34,7 @@ EBOOT_PATH		= ps3/pkg/USRDIR/EBOOT.BIN
 CORE_PATH		= ps3/pkg/USRDIR/cores/CORE.SELF

 LDDIRS = -L. -L$(CELL_SDK)/target/ppu/lib/PSGL/RSX/ultra-opt
-INCDIRS = -I. -Ips3 -Icommon -Ideps/rzlib
+INCDIRS = -I. -Ips3 -Icommon -Ideps/rzlib -Ilibretro-sdk/include

 # system platform
 system_platform = unix
--- a/Makefile.psp1
+++ b/Makefile.psp1
@ -19,7 +19,7 @@ ifeq ($(WHOLE_ARCHIVE_LINK), 1)
   WHOLE_END := -Wl,--no-whole-archive
 endif

-INCDIR = $(PSPPATH)/include
+INCDIR = $(PSPPATH)/include libretro-sdk/include
 CFLAGS = $(OPTIMIZE_LV) -G0 -std=gnu99 -ffast-math
 ASFLAGS = $(CFLAGS)

--- a/android/phoenix/jni/Android.mk
+++ b/android/phoenix/jni/Android.mk
@ -3,10 +3,12 @@ include $(CLEAR_VARS)

 LOCAL_MODULE := retroarch-jni
 RARCH_DIR := ../../..
-LOCAL_CFLAGS += -std=gnu99 -Wall -DHAVE_LOGGER -DRARCH_DUMMY_LOG -DHAVE_ZLIB -DHAVE_MMAP -I$(LOCAL_PATH)/$(RARCH_DIR)
+LOCAL_CFLAGS += -std=gnu99 -Wall -DHAVE_LOGGER -DRARCH_DUMMY_LOG -DHAVE_ZLIB -DHAVE_MMAP
 LOCAL_LDLIBS := -llog -lz
 LOCAL_SRC_FILES := apk-extract/apk-extract.c $(RARCH_DIR)/file_extract.c $(RARCH_DIR)/file_path.c $(RARCH_DIR)/string_list.c $(RARCH_DIR)/compat/compat.c

+LOCAL_C_INCLUDES := $(RARCH_DIR)/libretro-sdk/include/
+
 include $(BUILD_SHARED_LIBRARY)

 HAVE_NEON := 1
@ -55,12 +57,14 @@ else
   GLES_LIB := -lGLESv2
 endif

+
 LOCAL_CFLAGS += -Wall -pthread -Wno-unused-function -fno-stack-protector -funroll-loops -DNDEBUG -DRARCH_MOBILE -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_DYLIB -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_ZLIB -DINLINE=inline -DLSB_FIRST -DHAVE_THREADS -D__LIBRETRO__ -DHAVE_RSOUND -DHAVE_NETPLAY -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_LAKKA -DHAVE_GLUI -DHAVE_XMB
 LOCAL_CFLAGS += -DHAVE_7ZIP

 LOCAL_CFLAGS += -O2

 LOCAL_LDLIBS	:= -L$(SYSROOT)/usr/lib -landroid -lEGL $(GLES_LIB) $(LOGGER_LDLIBS) -ldl
+LOCAL_C_INCLUDES := $(RARCH_DIR)/libretro-sdk/include/

 LOCAL_CFLAGS += -DHAVE_SL
 LOCAL_LDLIBS += -lOpenSLES -lz
--- a/android/phoenix/jni/apk-extract/apk-extract.c
+++ b/android/phoenix/jni/apk-extract/apk-extract.c
@ -1,10 +1,10 @@
-#include "file_extract.h"
-#include "file.h"
-#include "file_path.h"
+#include "../../../../file_extract.h"
+#include "../../../../file.h"
+#include "../../../../file_path.h"

 #include <stdio.h>
 #include <string.h>
-#include "miscellaneous.h"
+#include "../../../../miscellaneous.h"
 #include "../native/com_retroarch_browser_NativeInterface.h"

 //#define VERBOSE_LOG
--- a/apple/iOS/bluetooth/btdynamic.h
+++ b/apple/iOS/bluetooth/btdynamic.h
@ -17,7 +17,7 @@
 #ifndef __IOS_RARCH_BTDYNAMIC_H__
 #define __IOS_RARCH_BTDYNAMIC_H__

-#include "../../../boolean.h"
+#include <boolean.h>
 #include "btstack/utils.h"
 #include "btstack/btstack.h"

--- a/audio/alsathread.c
+++ b/audio/alsathread.c
@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <alsa/asoundlib.h>
 #include "../general.h"
-#include "../rthreads/rthreads.h"
+#include <rthreads/rthreads.h>
 #include "../fifo_buffer.h"

 #define TRY_ALSA(x) if (x < 0) { \
--- a/audio/audio_thread_wrapper.c
+++ b/audio/audio_thread_wrapper.c
@ -14,7 +14,7 @@
 */

 #include "audio_thread_wrapper.h"
-#include "../rthreads/rthreads.h"
+#include <rthreads/rthreads.h>
 #include "../general.h"
 #include "../performance.h"
 #include "../fifo_buffer.h"
--- a/audio/audio_thread_wrapper.h
+++ b/audio/audio_thread_wrapper.h
@ -17,7 +17,7 @@
 #define RARCH_AUDIO_THREAD_H__

 #include "../driver.h"
-#include "../boolean.h"
+#include <boolean.h>

 // Starts a audio driver in a new thread.
 // Access to audio driver will be mediated through this driver.
--- a/audio/coreaudio.c
+++ b/audio/coreaudio.c
@ -19,7 +19,7 @@
 #include "../general.h"
 #include "../fifo_buffer.h"
 #include <stdlib.h>
-#include "../boolean.h"
+#include <boolean.h>
 #include <pthread.h>

 #ifdef OSX
--- a/audio/dsound.c
+++ b/audio/dsound.c
@ -41,7 +41,7 @@ static DSMIXBINS dsmb;

 #include "../driver.h"
 #include <stdlib.h>
-#include "../boolean.h"
+#include <boolean.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <string.h>
--- a/audio/gx_audio.c
+++ b/audio/gx_audio.c
@ -16,7 +16,7 @@

 #include "../driver.h"
 #include <stdlib.h>
-#include "../boolean.h"
+#include <boolean.h>
 #include "../general.h"
 #include <string.h>

--- a/audio/jack.c
+++ b/audio/jack.c
@ -23,7 +23,7 @@
 #include <jack/ringbuffer.h>
 #include <pthread.h>
 #include <stdint.h>
-#include "../boolean.h"
+#include <boolean.h>
 #include <string.h>
 #include <assert.h>

--- a/audio/opensl.c
+++ b/audio/opensl.c
@ -16,7 +16,7 @@

 #include "../driver.h"
 #include "../general.h"
-#include "../rthreads/rthreads.h"
+#include <rthreads/rthreads.h>

 #include <SLES/OpenSLES.h>
 #ifdef ANDROID
--- a/audio/pulse.c
+++ b/audio/pulse.c
@ -17,7 +17,7 @@
 #include "driver.h"
 #include "general.h"
 #include <pulse/pulseaudio.h>
-#include "../boolean.h"
+#include <boolean.h>
 #include <string.h>
 #include <stdint.h>

--- a/audio/resamplers/resampler.h
+++ b/audio/resamplers/resampler.h
@ -25,7 +25,7 @@ extern "C" {
 #include <stddef.h>
 #include <stdint.h>
 #include <math.h>
-#include "../../boolean.h"
+#include <boolean.h>

 #ifndef M_PI
 #define M_PI 3.14159265358979323846264338327
--- a/audio/roar.c
+++ b/audio/roar.c
@ -19,7 +19,7 @@
 #include <roaraudio.h>
 #include <errno.h>
 #include <stdint.h>
-#include "../boolean.h"
+#include <boolean.h>
 #include "general.h"

 typedef struct
--- a/audio/rsound.c
+++ b/audio/rsound.c
@ -18,8 +18,8 @@
 #include <stdlib.h>
 #include "rsound.h"
 #include "../fifo_buffer.h"
-#include "../boolean.h"
-#include "../rthreads/rthreads.h"
+#include <boolean.h>
+#include <rthreads/rthreads.h>

 typedef struct rsd
 {
--- a/audio/rsound.h
+++ b/audio/rsound.h
@ -24,11 +24,7 @@ extern "C" {

 #include <sys/types.h>
 #include <unistd.h>
-#ifdef STANDALONE
-#include "rthreads.h"
-#else
-#include "../rthreads/rthreads.h"
-#endif
+#include <rthreads/rthreads.h>
 #include <sys/time.h>
 #include <time.h>
 #include <stdint.h>
--- a/audio/sdl_audio.c
+++ b/audio/sdl_audio.c
@ -16,14 +16,14 @@

 #include "../driver.h"
 #include <stdlib.h>
-#include "../boolean.h"
+#include <boolean.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <string.h>

 #include "SDL.h"
 #include "SDL_audio.h"
-#include "../rthreads/rthreads.h"
+#include <rthreads/rthreads.h>

 #include "../general.h"
 #include "../fifo_buffer.h"
--- a/audio/utils.c
+++ b/audio/utils.c
@ -14,7 +14,7 @@
 *  If not, see <http://www.gnu.org/licenses/>.
 */

-#include "../boolean.h"
+#include <boolean.h>
 #include "utils.h"

 #include "../performance.h"
--- a/audio/xaudio-c/xaudio-c.cpp
+++ b/audio/xaudio-c/xaudio-c.cpp
@ -21,7 +21,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include "../../msvc/msvc_compat.h"
-#include "../../boolean.h"
+#include <boolean.h>

 #define MAX_BUFFERS 16
 #define MAX_BUFFERS_MASK (MAX_BUFFERS - 1)
--- a/audio/xenon360_audio.c
+++ b/audio/xenon360_audio.c
@ -16,7 +16,7 @@

 #include "../driver.h"
 #include <stdlib.h>
-#include "../boolean.h"
+#include <boolean.h>
 #include "../general.h"

 #include <xenon_sound/sound.h>
--- a/autosave.c
+++ b/autosave.c
@ -16,7 +16,7 @@
 #include "autosave.h"
 #include "rthreads/rthreads.h"
 #include <stdlib.h>
-#include "boolean.h"
+#include <boolean.h>
 #include <string.h>
 #include <stdio.h>
 #include "general.h"
--- a/camera/android.c
+++ b/camera/android.c
@ -15,7 +15,7 @@
 *  If not, see <http://www.gnu.org/licenses/>.
 */

-#include "../gfx/glsym/glsym.h"
+#include <glsym/glsym.h>
 #include "../driver.h"

 typedef struct android_camera
--- a/command.h
+++ b/command.h
@ -21,7 +21,7 @@
 #endif

 #include <stdint.h>
-#include "boolean.h"
+#include <boolean.h>

 #ifdef __cplusplus
 extern "C" {
--- a/compat/compat.c
+++ b/compat/compat.c
@ -21,7 +21,7 @@
 #ifndef HAVE_GETOPT_LONG

 #include <string.h>
-#include "../boolean.h"
+#include <boolean.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <ctype.h>
--- a/compat/rxml/rxml.c
+++ b/compat/rxml/rxml.c
@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include <stdint.h>
-#include "../../boolean.h"
+#include <boolean.h>
 #include "../posix_string.h"

 #ifndef RXML_TEST
--- a/conf/config_file.h
+++ b/conf/config_file.h
@ -22,7 +22,7 @@ extern "C" {
 #endif

 #include <stdint.h>
-#include "../boolean.h"
+#include <boolean.h>
 #include <stdio.h>
 #include <stddef.h>

--- a/config.def.h
+++ b/config.def.h
@ -17,7 +17,7 @@
 #ifndef __CONFIG_DEF_H
 #define __CONFIG_DEF_H

-#include "boolean.h"
+#include <boolean.h>
 #include "libretro.h"
 #include "driver.h"
 #include "gfx/gfx_common.h"
--- a/config.features.h
+++ b/config.features.h
@ -2,7 +2,7 @@
 #define __RARCH_FEATURES_H

 #include <stddef.h>
-#include "boolean.h"
+#include <boolean.h>

 #ifdef HAVE_CONFIG_H
 #include "config.h"
--- a/core_options.h
+++ b/core_options.h
@ -16,7 +16,7 @@
 #ifndef CORE_OPTIONS_H__
 #define CORE_OPTIONS_H__

-#include "boolean.h"
+#include <boolean.h>
 #include "libretro.h"
 #include <stddef.h>

--- a/dir_list.c
+++ b/dir_list.c
@ -39,6 +39,16 @@
 #include <unistd.h>
 #endif

+/* Some platforms do not set this value.
+ * Just assume a value. It's usually 4KiB.
+ * Platforms with a known value (like Win32)
+ * set this value explicitly in platform specific headers.
+ */
+
+#ifndef PATH_MAX
+#define PATH_MAX 4096
+#endif
+
 static int qstrcmp_plain(const void *a_, const void *b_)
 {
   const struct string_list_elem *a = (const struct string_list_elem*)a_; 
--- a/driver.h
+++ b/driver.h
@ -19,7 +19,7 @@
 #define __DRIVER__H

 #include <sys/types.h>
-#include "boolean.h"
+#include <boolean.h>
 #include "libretro_private.h"
 #include <stdlib.h>
 #include <stdint.h>
--- a/dynamic.c
+++ b/dynamic.c
@ -28,7 +28,7 @@
 #include "config.h"
 #endif

-#include "boolean.h"
+#include <boolean.h>
 #include "libretro_private.h"
 #include "dynamic_dummy.h"

--- a/dynamic.h
+++ b/dynamic.h
@ -16,7 +16,7 @@
 #ifndef __DYNAMIC_H
 #define __DYNAMIC_H

-#include "boolean.h"
+#include <boolean.h>
 #include "libretro.h"

 #ifdef HAVE_CONFIG_H
--- a/dynamic_dummy.h
+++ b/dynamic_dummy.h
@ -18,7 +18,7 @@
 #ifndef DYNAMIC_DUMMY_H__
 #define DYNAMIC_DUMMY_H__

-#include "boolean.h"
+#include <boolean.h>
 #include "libretro.h"

 void libretro_dummy_retro_init(void);
--- a/emscripten/RWebAudio.h
+++ b/emscripten/RWebAudio.h
@ -15,7 +15,7 @@

 #include <stdlib.h>
 #include <unistd.h>
-#include "../boolean.h"
+#include <boolean.h>

 unsigned RWebAudioSampleRate(void);
 void *RWebAudioInit(unsigned latency);
--- a/emscripten/RWebCam.h
+++ b/emscripten/RWebCam.h
@ -14,7 +14,7 @@
 */

 #include <stdint.h>
-#include "../boolean.h"
+#include <boolean.h>
 #include "../driver.h"

 void *RWebCamInit(uint64_t caps, unsigned width, unsigned height);
--- a/file.c
+++ b/file.c
@ -17,7 +17,7 @@
 #include "file_path.h"
 #include "general.h"
 #include <stdlib.h>
-#include "boolean.h"
+#include <boolean.h>
 #include "libretro.h"
 #include <string.h>
 #include <time.h>
--- a/file.h
+++ b/file.h
@ -16,7 +16,7 @@
 #ifndef __RARCH_FILE_H
 #define __RARCH_FILE_H

-#include "boolean.h"
+#include <boolean.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stddef.h>
--- a/file_extract.h
+++ b/file_extract.h
@ -16,7 +16,7 @@
 #ifndef FILE_EXTRACT_H__
 #define FILE_EXTRACT_H__

-#include "boolean.h"
+#include <boolean.h>
 #include "file.h"
 #include <stddef.h>
 #include <stdint.h>
--- a/file_list.h
+++ b/file_list.h
@ -21,7 +21,7 @@
 extern "C" {
 #endif

-#include "boolean.h"
+#include <boolean.h>

 struct item_file
 {
--- a/file_path.c
+++ b/file_path.c
@ -16,7 +16,7 @@

 #include "file_path.h"
 #include <stdlib.h>
-#include "boolean.h"
+#include <boolean.h>
 #include <string.h>
 #include <time.h>
 #include <errno.h>
--- a/file_path.h
+++ b/file_path.h
@ -17,7 +17,7 @@
 #ifndef __RARCH_FILE_PATH_H
 #define __RARCH_FILE_PATH_H

-#include "boolean.h"
+#include <boolean.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stddef.h>
--- a/frontend/frontend.h
+++ b/frontend/frontend.h
@ -20,7 +20,7 @@

 #include <stdint.h>
 #include <stddef.h>
-#include "../boolean.h"
+#include <boolean.h>
 #include "frontend_context.h"

 #ifdef __cplusplus
--- a/frontend/frontend_context.h
+++ b/frontend/frontend_context.h
@ -18,7 +18,7 @@
 #define __FRONTEND_CONTEXT_H

 #include <stddef.h>
-#include "../boolean.h"
+#include <boolean.h>

 #ifdef HAVE_CONFIG_H
 #include "../config.h"
--- a/frontend/frontend_salamander.c
+++ b/frontend/frontend_salamander.c
@ -15,7 +15,7 @@
 */

 #include <stdint.h>
-#include "../boolean.h"
+#include <boolean.h>
 #include <stddef.h>
 #include <string.h>

--- a/frontend/menu/menu_common.h
+++ b/frontend/menu/menu_common.h
@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include "../../boolean.h"
+#include <boolean.h>
 #include "../../general.h"
 #include "menu_navigation.h"
 #include "../../core_info.h"
--- a/frontend/menu/menu_driver.h
+++ b/frontend/menu/menu_driver.h
@ -19,7 +19,7 @@

 #include <stddef.h>
 #include <stdint.h>
-#include "../../boolean.h"
+#include <boolean.h>
 #include "menu_list.h"
 #include "../../settings_list.h"

--- a/frontend/platform/platform_android.h
+++ b/frontend/platform/platform_android.h
@ -27,7 +27,7 @@
 #include <android/window.h>
 #include <android/sensor.h>

-#include "../../thread.h"
+#include <rthreads/rthreads.h>

 struct android_app
 {
--- a/frontend/platform/platform_apple.c
+++ b/frontend/platform/platform_apple.c
@ -21,7 +21,7 @@
 #include "../frontend.h"

 #include <stdint.h>
-#include "../../boolean.h"
+#include <boolean.h>
 #include <stddef.h>
 #include <string.h>

--- a/frontend/platform/platform_gx.c
+++ b/frontend/platform/platform_gx.c
@ -15,7 +15,7 @@
 *  If not, see <http://www.gnu.org/licenses/>.
 */

-#include "../../boolean.h"
+#include <boolean.h>
 #include "../../driver.h"
 #include "../../general.h"
 #include "../../libretro_private.h"
--- a/frontend/platform/platform_null.c
+++ b/frontend/platform/platform_null.c
@ -17,7 +17,7 @@
 #include "../frontend_context.h"

 #include <stdint.h>
-#include "../../boolean.h"
+#include <boolean.h>
 #include <stddef.h>
 #include <string.h>

--- a/frontend/platform/platform_ps3.c
+++ b/frontend/platform/platform_ps3.c
@ -22,6 +22,7 @@
 #include "../../conf/config_file.h"
 #include "../../general.h"
 #include "../../file.h"
+#include "../../file_path.h"

 #define EMULATOR_CONTENT_DIR "SSNE10000"

--- a/frontend/platform/platform_psp.c
+++ b/frontend/platform/platform_psp.c
@ -21,12 +21,13 @@
 #include <pspsdk.h>

 #include <stdint.h>
-#include "../../boolean.h"
+#include <boolean.h>
 #include <stddef.h>
 #include <string.h>

 #include "../../gfx/psp/sdk_defines.h"
 #include "../../file.h"
+#include "../../file_path.h"
 #include "../../general.h"

 #if defined(HAVE_KERNEL_PRX) || defined(IS_SALAMANDER)
--- a/frontend/platform/platform_qnx.c
+++ b/frontend/platform/platform_qnx.c
@ -17,7 +17,7 @@
 #include <bps/bps.h>

 #include <stdint.h>
-#include "../../boolean.h"
+#include <boolean.h>
 #include <stddef.h>
 #include <string.h>
 #include "../../dynamic.h"
--- a/general.h
+++ b/general.h
@ -17,7 +17,7 @@
 #ifndef __RARCH_GENERAL_H
 #define __RARCH_GENERAL_H

-#include "boolean.h"
+#include <boolean.h>
 #include <stdint.h>
 #include <limits.h>
 #include <setjmp.h>
--- a/gfx/context/x11_common.h
+++ b/gfx/context/x11_common.h
@ -29,7 +29,7 @@
 #include <X11/extensions/Xinerama.h>
 #endif

-#include "../../boolean.h"
+#include <boolean.h>

 void x11_show_mouse(Display *dpy, Window win, bool state);
 void x11_windowed_fullscreen(Display *dpy, Window win);
--- a/gfx/filter.c
+++ b/gfx/filter.c
@ -32,7 +32,7 @@ struct rarch_soft_plug
 };

 #ifdef HAVE_THREADS
-#include "../rthreads/rthreads.h"
+#include <rthreads/rthreads.h>

 struct filter_thread_data
 {
--- a/gfx/filters/Makefile
+++ b/gfx/filters/Makefile
@ -57,7 +57,7 @@ endif

 CC      := $(compiler)
 CXX     := $(subst CC,++,$(compiler)) -std=gnu++0x
-flags   := -fPIC $(extra_flags)
+flags   := -fPIC $(extra_flags) -I../../libretro-sdk/include
 asflags := -fPIC  $(extra_flags)
 objects :=
 flags   += -std=c99
--- a/gfx/filters/blargg_ntsc_snes.c
+++ b/gfx/filters/blargg_ntsc_snes.c
@ -18,7 +18,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "boolean.h"
+#include <boolean.h>
 #include "snes_ntsc/snes_ntsc.h"
 #include "snes_ntsc/snes_ntsc.c"

--- a/gfx/filters/boolean.h
+++ b/gfx/filters/boolean.h
@ -1,33 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- * 
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __RARCH_BOOLEAN_H
-#define __RARCH_BOOLEAN_H
-
-#ifndef __cplusplus
-
-#if defined(_MSC_VER) && !defined(SN_TARGET_PS3)
-/* Hack applied for MSVC when compiling in C89 mode as it isn't C99 compliant. */
-#define bool unsigned char
-#define true 1
-#define false 0
-#else
-#include <stdbool.h>
-#endif
-
-#endif
-
-#endif
-
--- a/gfx/filters/phosphor2x.c
+++ b/gfx/filters/phosphor2x.c
@ -15,7 +15,7 @@
 */

 #include "softfilter.h"
-#include "boolean.h"
+#include <boolean.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
--- a/gfx/fonts/bitmapfont.c
+++ b/gfx/fonts/bitmapfont.c
@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <math.h>
 #include "../../msvc/msvc_compat.h"
-#include "../../boolean.h"
+#include <boolean.h>

 #define ATLAS_COLS 16
 #define ATLAS_ROWS 16
--- a/gfx/fonts/d3d_font.h
+++ b/gfx/fonts/d3d_font.h
@ -17,7 +17,7 @@
 #define D3D_FONT_H__

 #include <stdint.h>
-#include "../../boolean.h"
+#include <boolean.h>
 #include "../../driver.h"

 #ifdef __cplusplus
--- a/gfx/fonts/fonts.h
+++ b/gfx/fonts/fonts.h
@ -18,7 +18,7 @@
 #define __RARCH_FONTS_H

 #include <stdint.h>
-#include "../../boolean.h"
+#include <boolean.h>

 /* All coordinates and offsets are top-left oriented.
 *
--- a/gfx/fonts/gl_font.h
+++ b/gfx/fonts/gl_font.h
@ -17,7 +17,7 @@
 #define GL_FONT_H__

 #include "../../driver.h"
-#include "../../boolean.h"
+#include <boolean.h>

 struct font_glyph;

--- a/gfx/gfx_common.h
+++ b/gfx/gfx_common.h
@ -23,7 +23,7 @@ extern "C" {
 #include <stddef.h>
 #include <stdint.h>
 #include "../general.h"
-#include "../boolean.h"
+#include <boolean.h>
 #include "../performance.h"

 #ifdef HAVE_CONFIG_H
--- a/gfx/gfx_context.h
+++ b/gfx/gfx_context.h
@ -16,7 +16,7 @@
 #ifndef __GFX_CONTEXT_H
 #define __GFX_CONTEXT_H

-#include "../boolean.h"
+#include <boolean.h>
 #include "../driver.h"

 #ifdef HAVE_CONFIG_H
--- a/gfx/gl_common.h
+++ b/gfx/gl_common.h
@ -35,7 +35,7 @@
 #include <EGL/eglext.h>
 #endif

-#include "glsym/glsym.h"
+#include <glsym/glsym.h>

 #define context_bind_hw_render(gl, enable)               if (gl->shared_context_use && gl->ctx_driver->bind_hw_render) gl->ctx_driver->bind_hw_render(gl, enable)

--- a/gfx/image/image.h
+++ b/gfx/image/image.h
@ -17,7 +17,7 @@
 #define __RARCH_IMAGE_CONTEXT_H

 #include <stdint.h>
-#include "../../boolean.h"
+#include <boolean.h>

 #ifdef _WIN32
 #include "../context/win32_common.h"
--- a/gfx/math/matrix_3x3.h
+++ b/gfx/math/matrix_3x3.h
@ -17,7 +17,7 @@
 #ifndef MATH_MATRIX_3X3_H__
 #define MATH_MATRIX_3X3_H__

-#include "boolean.h"
+#include <boolean.h>

 typedef struct math_matrix_3x3
 {
--- a/gfx/py_state/py_state.c
+++ b/gfx/py_state/py_state.c
@ -14,14 +14,13 @@
 */

 #include <Python.h>
-#include "../../boolean.h"
 #include <stdlib.h>
 #include <ctype.h>
 #include <string.h>

+#include "py_state.h"
 #include "../../dynamic.h"
 #include "../../libretro.h"
-#include "py_state.h"
 #include "../../general.h"
 #include "../../compat/strl.h"
 #include "../../compat/posix_string.h"
--- a/gfx/py_state/py_state.h
+++ b/gfx/py_state/py_state.h
@ -17,7 +17,7 @@
 #define __RARCH_PY_STATE_H

 #include <stdint.h>
-#include "../../boolean.h"
+#include <boolean.h>

 #ifndef PY_STATE_OMIT_DECLARATION
 typedef struct py_state py_state_t;
--- a/gfx/rpng/rpng.h
+++ b/gfx/rpng/rpng.h
@ -18,7 +18,7 @@

 #include <stdint.h>

-#include "../../boolean.h"
+#include <boolean.h>

 #ifdef HAVE_CONFIG_H
 #include "../../config.h"
--- a/gfx/scaler/filter.h
+++ b/gfx/scaler/filter.h
@ -17,7 +17,7 @@
 #ifndef FILTER_H__
 #define FILTER_H__

-#include "../../boolean.h"
+#include <boolean.h>
 #include "scaler.h"

 bool scaler_gen_filter(struct scaler_ctx *ctx);
--- a/gfx/scaler/scaler.h
+++ b/gfx/scaler/scaler.h
@ -18,7 +18,7 @@

 #include <stdint.h>
 #include <stddef.h>
-#include "../../boolean.h"
+#include <boolean.h>
 #include "scaler_common.h"

 #define FILTER_UNITY (1 << 14)
--- a/gfx/shader/shader_context.h
+++ b/gfx/shader/shader_context.h
@ -17,7 +17,7 @@
 #ifndef SHADER_CONTEXT_H__
 #define SHADER_CONTEXT_H__

-#include "../../boolean.h"
+#include <boolean.h>

 #ifdef HAVE_CONFIG_H
 #include "../../config.h"
--- a/gfx/shader/shader_glsl.c
+++ b/gfx/shader/shader_glsl.c
@ -13,7 +13,6 @@
 *  If not, see <http://www.gnu.org/licenses/>.
 */

-#include "../../boolean.h"
 #include <string.h>
 #include "../../general.h"
 #include "shader_glsl.h"
@ -28,8 +27,6 @@
 #include "../../config.h"
 #endif

-#include "../glsym/glsym.h"
-
 #include "../gfx_context.h"
 #include <stdlib.h>

--- a/gfx/shader/shader_glsl.h
+++ b/gfx/shader/shader_glsl.h
@ -17,7 +17,7 @@
 #ifndef __RARCH_GLSL_H
 #define __RARCH_GLSL_H

-#include "../../boolean.h"
+#include <boolean.h>
 #include "shader_context.h"

 void gl_glsl_set_get_proc_address(gfx_ctx_proc_t (*proc)(const char*));
--- a/gfx/shader/shader_null.c
+++ b/gfx/shader/shader_null.c
@ -14,7 +14,7 @@
 *  If not, see <http://www.gnu.org/licenses/>.
 */

-#include "../../boolean.h"
+#include <boolean.h>
 #include <string.h>
 #include "../../general.h"
 #include "../../compat/strl.h"
--- a/gfx/shader/shader_parse.h
+++ b/gfx/shader/shader_parse.h
@ -16,7 +16,7 @@
 #ifndef SHADER_PARSE_H
 #define SHADER_PARSE_H

-#include "../../boolean.h"
+#include <boolean.h>
 #include "../state_tracker.h"
 #include "../../conf/config_file.h"
 #include "../../miscellaneous.h"
--- a/gfx/state_tracker.h
+++ b/gfx/state_tracker.h
@ -21,7 +21,7 @@ extern "C" {
 #endif

 #include <stdint.h>
-#include "../boolean.h"
+#include <boolean.h>

 #ifdef HAVE_CONFIG_H
 #include "../config.h"
--- a/gfx/video_thread_wrapper.h
+++ b/gfx/video_thread_wrapper.h
@ -17,8 +17,8 @@
 #define RARCH_VIDEO_THREAD_H__

 #include "../driver.h"
-#include "../boolean.h"
-#include "../rthreads/rthreads.h"
+#include <boolean.h>
+#include <rthreads/rthreads.h>
 #include "../general.h"

 /* Starts a video driver in a new thread.
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@ -216,11 +216,11 @@ VIDEO DRIVER
 #include "../gfx/gl_common.c"

 #ifndef HAVE_PSGL
-#include "../gfx/glsym/rglgen.c"
+#include "../libretro-sdk/glsym/rglgen.c"
 #ifdef HAVE_OPENGLES2
-#include "../gfx/glsym/glsym_es2.c"
+#include "../libretro-sdk/glsym/glsym_es2.c"
 #else
-#include "../gfx/glsym/glsym_gl.c"
+#include "../libretro-sdk/glsym/glsym_gl.c"
 #endif
 #endif

@ -616,7 +616,7 @@ THREAD
 #if defined(HAVE_THREADS) && defined(XENON)
 #include "../thread/xenon_sdl_threads.c"
 #elif defined(HAVE_THREADS)
-#include "../rthreads/rthreads.c"
+#include "../libretro-sdk/rthreads/rthreads.c"
 #include "../gfx/video_thread_wrapper.c"
 #include "../audio/audio_thread_wrapper.c"
 #include "../autosave.c"
--- a/input/connect/connect_ps3.c
+++ b/input/connect/connect_ps3.c
@ -17,7 +17,7 @@
 #include <string.h>
 #include <stdlib.h>

-#include "../../boolean.h"
+#include <boolean.h>
 #include "joypad_connection.h"

 struct hidpad_ps3_data
--- a/input/connect/connect_ps4.c
+++ b/input/connect/connect_ps4.c
@ -17,7 +17,7 @@
 #include <string.h>
 #include <stdlib.h>

-#include "../../boolean.h"
+#include <boolean.h>
 #include "joypad_connection.h"

 struct hidpad_ps4_data
--- a/input/dinput.c
+++ b/input/dinput.c
@ -22,7 +22,7 @@
 #include <dinput.h>

 #include "../general.h"
-#include "../boolean.h"
+#include <boolean.h>
 #include "input_common.h"
 #include "retroarch_logger.h"
 #include <stdlib.h>
--- a/input/keyboard_line.h
+++ b/input/keyboard_line.h
@ -20,7 +20,7 @@
 extern "C" {
 #endif

-#include "../boolean.h"
+#include <boolean.h>
 #include "../libretro.h"
 #include <stdint.h>

--- a/input/overlay.h
+++ b/input/overlay.h
@ -16,7 +16,7 @@
 #ifndef INPUT_OVERLAY_H__
 #define INPUT_OVERLAY_H__

-#include "../boolean.h"
+#include <boolean.h>
 #include "../libretro.h"
 #include <stdint.h>

--- a/input/ps3_input.c
+++ b/input/ps3_input.c
@ -18,7 +18,7 @@
 #include <stdlib.h>

 #include <sdk_version.h>
-#include "../boolean.h"
+#include <boolean.h>

 #include "../ps3/sdk_defines.h"

--- a/input/rwebinput_input.c
+++ b/input/rwebinput_input.c
@ -17,7 +17,7 @@

 #include "../driver.h"

-#include "../boolean.h"
+#include <boolean.h>
 #include "../general.h"
 #include "keyboard_line.h"

--- a/input/sdl_input.c
+++ b/input/sdl_input.c
@ -17,7 +17,7 @@

 #include "SDL.h"
 #include "../gfx/gfx_context.h"
-#include "../boolean.h"
+#include <boolean.h>
 #include "../general.h"
 #include <stdint.h>
 #include <stdlib.h>
--- a/input/winxinput_joypad.c
+++ b/input/winxinput_joypad.c
@ -23,7 +23,7 @@
 #include "input_common.h"

 #include "../general.h"
-#include "../boolean.h"
+#include <boolean.h>

 #include <stdlib.h>
 #include <stddef.h>
--- a/input/x11_input.c
+++ b/input/x11_input.c
@ -17,7 +17,7 @@

 #include "../driver.h"

-#include "../boolean.h"
+#include <boolean.h>
 #include "../general.h"
 #include <stdint.h>
 #include <stdlib.h>
--- a/libretro-sdk/glsym/README.md
+++ b/libretro-sdk/glsym/README.md
--- a/libretro-sdk/glsym/glgen.py
+++ b/libretro-sdk/glsym/glgen.py
--- a/libretro-sdk/glsym/glsym_es2.c
+++ b/libretro-sdk/glsym/glsym_es2.c
@ -20,7 +20,7 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */

-#include "glsym.h"
+#include <glsym/glsym.h>
 #include <stddef.h>

 #define SYM(x) { "gl" #x, &(gl##x) }
--- a/Show More
+++ b/Show More