First pass at moving platform-specific code to src/os.

Likely there *will* be breakage.

configure

@@ -345,9 +345,6 @@ arm-riscos-aof)
 psp)
 	EXEEXT=".elf"
 	;;
-gp2x)
-	EXEEXT=""
-	;;
 *)
 	EXEEXT=""
 	;;
@@ -796,6 +793,7 @@ echo
 find_sdlconfig
 
 SRC="src"
+SRC_OS="$SRC/os"
 CORE="$SRC/emucore"
 COMMON="$SRC/common"
 TIA="$SRC/emucore/tia"
@@ -831,26 +829,26 @@ LD=$CXX
 case $_host_os in
 		unix)
 			DEFINES="$DEFINES -DBSPF_UNIX"
-			MODULES="$MODULES $SRC/unix"
-			INCLUDES="$INCLUDES -I$SRC/unix"
+			MODULES="$MODULES $SRC_OS/unix"
+			INCLUDES="$INCLUDES -I$SRC_OS/unix"
 			;;
 		darwin)
 			DEFINES="$DEFINES -DBSPF_UNIX -DMACOS_KEYS"
-			MODULES="$MODULES $SRC/unix"
-			INCLUDES="$INCLUDES -I$SRC/unix"
+			MODULES="$MODULES $SRC_OS/unix"
+			INCLUDES="$INCLUDES -I$SRC_OS/unix"
 			if test "$have_clang" == yes; then
 				CXXFLAGS="$CXXFLAGS -Wno-poison-system-directories"
 			fi
 			;;
     retron77)
       DEFINES="$DEFINES -DBSPF_UNIX -DRETRON77"
-      MODULES="$MODULES $SRC/unix $SRC/unix/r77"
-      INCLUDES="$INCLUDES -I$SRC/unix -I$SRC/unix/r77"
+      MODULES="$MODULES $SRC_OS/unix $SRC_OS/unix/r77"
+      INCLUDES="$INCLUDES -I$SRC_OS/unix -I$SRC_OS/unix/r77"
       ;;
 		win32)
 			DEFINES="$DEFINES -DBSPF_WINDOWS"
-			MODULES="$MODULES $SRC/windows"
-			INCLUDES="$INCLUDES -I$SRC/windows"
+			MODULES="$MODULES $SRC_OS/windows"
+			INCLUDES="$INCLUDES -I$SRC_OS/windows"
 			LIBS="$LIBS -lmingw32 -lwinmm"
 			;;
 		*)

src/os/libretro/Makefile

@@ -538,7 +538,7 @@ else
    CXXFLAGS += -D__WIN32__
 endif
 
-CORE_DIR := ..
+CORE_DIR := ../..
 
 ifeq ($(DEBUG), 1)
    ifneq (,$(findstring msvc,$(platform)))
@@ -580,7 +580,7 @@ else ifneq (,$(findstring msvc,$(platform)))
    CODE_DEFINES =
 else
    WARNINGS_DEFINES = -Wall -W -Wno-unused-parameter
-   CODE_DEFINES = 
+   CODE_DEFINES =
 endif
 
 CXXFLAGS += $(CODE_DEFINES) $(WARNINGS_DEFINES) $(fpic)

src/os/libretro/Makefile.common

@@ -1,14 +1,14 @@
 LIBRETRO_COMM_DIR = $(CORE_DIR)/../libretro-common
-INCFLAGS := -I. -I$(CORE_DIR) -I$(CORE_DIR)/libretro -I$(CORE_DIR)/emucore -I$(CORE_DIR)/emucore/tia -I$(CORE_DIR)/common -I$(CORE_DIR)/common/audio -I$(CORE_DIR)/common/tv_filters -I$(CORE_DIR)/common/repository/sqlite -I$(CORE_DIR)/json -I$(CORE_DIR)/httplib -I$(CORE_DIR)/sqlite
+INCFLAGS := -I. -I$(CORE_DIR) -I$(CORE_DIR)/os/libretro -I$(CORE_DIR)/emucore -I$(CORE_DIR)/emucore/tia -I$(CORE_DIR)/common -I$(CORE_DIR)/common/audio -I$(CORE_DIR)/common/tv_filters -I$(CORE_DIR)/common/repository/sqlite -I$(CORE_DIR)/json -I$(CORE_DIR)/httplib -I$(CORE_DIR)/sqlite
 
 ifneq (,$(findstring msvc2003,$(platform)))
 INCFLAGS += -I$(LIBRETRO_COMM_DIR)/include/compat/msvc
 endif
 
 SOURCES_CXX := \
-	$(CORE_DIR)/libretro/libretro.cxx \
-	$(CORE_DIR)/libretro/FSNodeLIBRETRO.cxx \
-	$(CORE_DIR)/libretro/StellaLIBRETRO.cxx \
+	$(CORE_DIR)/os/libretro/libretro.cxx \
+	$(CORE_DIR)/os/libretro/FSNodeLIBRETRO.cxx \
+	$(CORE_DIR)/os/libretro/StellaLIBRETRO.cxx \
 	$(CORE_DIR)/common/AudioQueue.cxx \
 	$(CORE_DIR)/common/AudioSettings.cxx \
 	$(CORE_DIR)/common/Base.cxx \

src/os/libretro/jni/Android.mk

@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
 
 CORE_DIR := $(LOCAL_PATH)/../..
 
-include $(CORE_DIR)/libretro/Makefile.common
+include $(CORE_DIR)/os/libretro/Makefile.common
 
 COREFLAGS := -DANDROID -D__LIB_RETRO__ -DHAVE_STRINGS_H -DSOUND_SUPPORT $(INCFLAGS)
 

src/os/unix/module.mk

@@ -0,0 +1,12 @@
+MODULE := src/os/unix
+
+MODULE_OBJS := \
+	src/os/unix/FSNodePOSIX.o \
+	src/os/unix/OSystemUNIX.o \
+	src/os/unix/SerialPortUNIX.o
+
+MODULE_DIRS += \
+	src/os/unix
+
+# Include common rules
+include $(srcdir)/common.rules

src/os/windows/module.mk

@@ -0,0 +1,14 @@
+MODULE := src/os/windows
+
+MODULE_OBJS := \
+	src/os/windows/FSNodeWINDOWS.o \
+	src/os/windows/OSystemWINDOWS.o \
+	src/os/windows/SerialPortWINDOWS.o \
+	src/os/windows/SettingsWINDOWS.o \
+	src/os/windows/stella_icon.o
+
+MODULE_DIRS += \
+	src/os/windows
+
+# Include common rules
+include $(srcdir)/common.rules

src/unix/module.mk

@@ -1,12 +0,0 @@
-MODULE := src/unix
-
-MODULE_OBJS := \
-	src/unix/FSNodePOSIX.o \
-	src/unix/OSystemUNIX.o \
-	src/unix/SerialPortUNIX.o
-
-MODULE_DIRS += \
-	src/unix
-
-# Include common rules
-include $(srcdir)/common.rules

src/windows/module.mk

@@ -1,14 +0,0 @@
-MODULE := src/windows
-
-MODULE_OBJS := \
-	src/windows/FSNodeWINDOWS.o \
-	src/windows/OSystemWINDOWS.o \
-	src/windows/SerialPortWINDOWS.o \
-	src/windows/SettingsWINDOWS.o \
-	src/windows/stella_icon.o
-
-MODULE_DIRS += \
-	src/windows
-
-# Include common rules 
-include $(srcdir)/common.rules