Move compat functionality to compat/.

Makefile

@@ -2,8 +2,8 @@ include config.mk
 
 TARGET = ssnes tools/ssnes-joyconfig
 
-OBJ = ssnes.o file.o driver.o settings.o dynamic.o message.o rewind.o movie.o gfx/gfx_common.o ups.o bps.o strl.o getopt.o screenshot.o audio/utils.o
-JOYCONFIG_OBJ = tools/ssnes-joyconfig.o conf/config_file.o strl.o
+OBJ = ssnes.o file.o driver.o settings.o dynamic.o message.o rewind.o movie.o gfx/gfx_common.o ups.o bps.o compat/strl.o compat/getopt.o screenshot.o audio/utils.o
+JOYCONFIG_OBJ = tools/ssnes-joyconfig.o conf/config_file.o compat/strl.o
 HEADERS = $(wildcard */*.h) $(wildcard *.h)
 
 LIBS = -lm

Makefile.win

@@ -1,7 +1,7 @@
 TARGET = ssnes.exe
 JTARGET = ssnes-joyconfig.exe
-OBJ = ssnes.o file.o driver.o conf/config_file.o settings.o dynamic.o message.o rewind.o movie.o gfx/gfx_common.o bps.o ups.o strl.o screenshot.o getopt.o audio/utils.o posix_string.o
-JOBJ = conf/config_file.o tools/ssnes-joyconfig.o strl.o posix_string.o
+OBJ = ssnes.o file.o driver.o conf/config_file.o settings.o dynamic.o message.o rewind.o movie.o gfx/gfx_common.o bps.o ups.o compat/strl.o screenshot.o compat/getopt.o audio/utils.o compat/posix_string.o
+JOBJ = conf/config_file.o tools/ssnes-joyconfig.o compat/strl.o compat/posix_string.o
 
 CC = gcc
 CXX = g++

cheats.c

@@ -19,7 +19,7 @@
 #include "sha256.h"
 #include "dynamic.h"
 #include "general.h"
-#include "strl.h"
+#include "compat/strl.h"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

conf/config_file.c

@@ -22,8 +22,8 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <errno.h>
-#include "../strl.h"
-#include "../posix_string.h"
+#include "../compat/strl.h"
+#include "../compat/posix_string.h"
 #include "../msvc/msvc_compat.h"
 
 #if !defined(_WIN32) && !defined(__CELLOS_LV2__) && !defined(_XBOX)

console/console_ext.c

@@ -18,7 +18,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "../boolean.h"
-#include "../strl.h"
+#include "../compat/strl.h"
 #include "../libsnes.hpp"
 #include "../general.h"
 #include <string.h>

console/main_wrap.c

@@ -17,7 +17,7 @@
 
 #include "main_wrap.h"
 #include "../general.h"
-#include "../strl.h"
+#include "../compat/strl.h"
 #include <stdlib.h>
 #include <stddef.h>
 #include <string.h>

driver.c

@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
-#include "posix_string.h"
+#include "compat/posix_string.h"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

dynamic.c

@@ -17,7 +17,7 @@
 
 #include "dynamic.h"
 #include "general.h"
-#include "strl.h"
+#include "compat/strl.h"
 #include <string.h>
 
 #ifdef SSNES_CONSOLE

file.c

@@ -26,7 +26,7 @@
 #include "movie.h"
 #include "ups.h"
 #include "bps.h"
-#include "strl.h"
+#include "compat/strl.h"
 
 #ifdef HAVE_XML
 #include "sha256.h"

general.h

@@ -33,7 +33,7 @@
 #include "dynamic.h"
 #include "cheats.h"
 #include "audio/ext/ssnes_dsp.h"
-#include "strl.h"
+#include "compat/strl.h"
 
 #ifdef __CELLOS_LV2__
 #include <sys/timer.h>

gfx/gl.c

@@ -32,7 +32,7 @@
 #include "gl_common.h"
 #include "gfx_common.h"
 #include "sdlwrap.h"
-#include "../strl.h"
+#include "../compat/strl.h"
 
 #define NO_SDL_GLEXT
 #include "SDL.h"

gfx/py_state/py_state.c

@@ -25,8 +25,8 @@
 #include "../../libsnes.hpp"
 #include "py_state.h"
 #include "../../general.h"
-#include "../../strl.h"
-#include "../../posix_string.h"
+#include "../../compat/strl.h"
+#include "../../compat/posix_string.h"
 #include "../../file.h"
 
 #define PY_READ_FUNC_DECL(RAMTYPE) py_read_##RAMTYPE

gfx/shader_glsl.c

@@ -19,8 +19,8 @@
 #include <string.h>
 #include "../general.h"
 #include "shader_glsl.h"
-#include "../strl.h"
-#include "../posix_string.h"
+#include "../compat/strl.h"
+#include "../compat/posix_string.h"
 #include "snes_state.h"
 #include "../dynamic.h"
 

gfx/snes_state.c

@@ -17,7 +17,7 @@
 
 #include "snes_state.h"
 #include <stdlib.h>
-#include "../strl.h"
+#include "../compat/strl.h"
 #include "../general.h"
 #include "../libsnes.hpp"
 

input/input_luts.c

@@ -25,7 +25,7 @@
 #include <stddef.h>
 #include <string.h>
 #include "input_luts.h"
-#include "../strl.h"
+#include "../compat/strl.h"
 
 uint64_t ssnes_default_keybind_lut[SSNES_FIRST_META_KEY];
 

message.c

@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "boolean.h"
-#include "posix_string.h"
+#include "compat/posix_string.h"
 
 struct queue_elem
 {

screenshot.c

@@ -16,7 +16,7 @@
  */
 
 #include "screenshot.h"
-#include "strl.h"
+#include "compat/strl.h"
 #include <stdio.h>
 #include <time.h>
 #include "boolean.h"

settings.c

@@ -19,10 +19,10 @@
 #include "conf/config_file.h"
 #include "conf/config_file_macros.h"
 #include "input/keysym.h"
-#include "strl.h"
+#include "compat/strl.h"
 #include "config.def.h"
 #include "file.h"
-#include "posix_string.h"
+#include "compat/posix_string.h"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

ssnes.c

@@ -30,10 +30,10 @@
 #include "record/ffemu.h"
 #include "rewind.h"
 #include "movie.h"
-#include "strl.h"
+#include "compat/strl.h"
 #include "screenshot.h"
 #include "cheats.h"
-#include "getopt_ssnes.h"
+#include "compat/getopt_ssnes.h"
 
 #if defined(_WIN32) && !defined(_XBOX)
 #define WIN32_LEAN_AND_MEAN

tools/ssnes-joyconfig.c

@@ -30,7 +30,7 @@
 #include "../boolean.h"
 #include "general.h"
 #include <assert.h>
-#include "../posix_string.h"
+#include "../compat/posix_string.h"
 
 static int g_player = 1;
 static int g_joypad = 0;