From 3edb2da58dbb4a4f08be5657b40384d87a2f7018 Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Wed, 16 Oct 2013 01:35:49 -0700
Subject: [PATCH] Make platform directory for ports

---
 CMakeLists.txt                             | 13 ++++++-------
 src/{ => platform}/egl-main.c              |  0
 src/{ => platform}/glsl-main.c             |  0
 src/{ => platform/sdl}/gl-main.c           |  0
 src/{ => platform}/sdl/sdl-audio.c         |  0
 src/{ => platform}/sdl/sdl-audio.h         |  0
 src/{ => platform}/sdl/sdl-events.c        |  0
 src/{ => platform}/sdl/sdl-events.h        |  0
 src/{sdl-main.c => platform/sdl/sw-main.c} |  0
 9 files changed, 6 insertions(+), 7 deletions(-)
 rename src/{ => platform}/egl-main.c (100%)
 rename src/{ => platform}/glsl-main.c (100%)
 rename src/{ => platform/sdl}/gl-main.c (100%)
 rename src/{ => platform}/sdl/sdl-audio.c (100%)
 rename src/{ => platform}/sdl/sdl-audio.h (100%)
 rename src/{ => platform}/sdl/sdl-events.c (100%)
 rename src/{ => platform}/sdl/sdl-events.h (100%)
 rename src/{sdl-main.c => platform/sdl/sw-main.c} (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ebf4d7a10..e23aff055 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,8 +14,8 @@ include_directories(${CMAKE_SOURCE_DIR}/src/debugger)
 include_directories(${CMAKE_SOURCE_DIR}/src/util)
 
 find_package(SDL 1.2 REQUIRED)
-file(GLOB SDL_SRC ${CMAKE_SOURCE_DIR}/src/sdl/sdl-*.c)
-include_directories(${CMAKE_SOURCE_DIR}/src/sdl)
+file(GLOB PLATFORM_SRC ${CMAKE_SOURCE_DIR}/src/platform/sdl/sdl-*.c)
+include_directories(${CMAKE_SOURCE_DIR}/src/platform/sdl)
 
 if(USE_DEBUGGER)
 	file(GLOB DEBUGGER_SRC ${CMAKE_SOURCE_DIR}/src/debugger/*.c)
@@ -27,19 +27,18 @@ else()
 endif()
 
 if(BUILD_RASPI AND BUILD_EGL)
-	set(MAIN_SRC ${CMAKE_SOURCE_DIR}/src/egl-main.c)
+	set(MAIN_SRC ${CMAKE_SOURCE_DIR}/src/platform/sdl/egl-main.c)
 	set(OPENGL_LIBRARY "-lEGL -lGLESv2 -lbcm_host")
 	set(OPENGL_INCLUDE_DIR "")
 	add_definitions(-DBUILD_RASPI)
 elseif(BUILD_BBB OR BUILD_RASPI)
 	add_definitions(-DCOLOR_16_BIT -DCOLOR_5_6_5)
-	set(MAIN_SRC ${CMAKE_SOURCE_DIR}/src/sdl-main.c)
+	set(MAIN_SRC ${CMAKE_SOURCE_DIR}/src/platform/sdl/sw-main.c)
 else()
-	set(MAIN_SRC ${CMAKE_SOURCE_DIR}/src/gl-main.c)
+	set(MAIN_SRC ${CMAKE_SOURCE_DIR}/src/platform/sdl/gl-main.c)
 	find_package(OpenGL REQUIRED)
 	include_directories(${SDL_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
 endif()
-include_directories(${SDL_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
 
-add_executable(${BINARY_NAME} ${ARM_SRC} ${GBA_SRC} ${DEBUGGER_SRC} ${RENDERER_SRC} ${UTIL_SRC} ${SDL_SRC} ${MAIN_SRC})
+add_executable(${BINARY_NAME} ${ARM_SRC} ${GBA_SRC} ${DEBUGGER_SRC} ${RENDERER_SRC} ${UTIL_SRC} ${PLATFORM_SRC} ${MAIN_SRC})
 target_link_libraries(${BINARY_NAME} m pthread ${DEBUGGER_LIB} ${SDL_LIBRARY} ${OPENGL_LIBRARY})
diff --git a/src/egl-main.c b/src/platform/egl-main.c
similarity index 100%
rename from src/egl-main.c
rename to src/platform/egl-main.c
diff --git a/src/glsl-main.c b/src/platform/glsl-main.c
similarity index 100%
rename from src/glsl-main.c
rename to src/platform/glsl-main.c
diff --git a/src/gl-main.c b/src/platform/sdl/gl-main.c
similarity index 100%
rename from src/gl-main.c
rename to src/platform/sdl/gl-main.c
diff --git a/src/sdl/sdl-audio.c b/src/platform/sdl/sdl-audio.c
similarity index 100%
rename from src/sdl/sdl-audio.c
rename to src/platform/sdl/sdl-audio.c
diff --git a/src/sdl/sdl-audio.h b/src/platform/sdl/sdl-audio.h
similarity index 100%
rename from src/sdl/sdl-audio.h
rename to src/platform/sdl/sdl-audio.h
diff --git a/src/sdl/sdl-events.c b/src/platform/sdl/sdl-events.c
similarity index 100%
rename from src/sdl/sdl-events.c
rename to src/platform/sdl/sdl-events.c
diff --git a/src/sdl/sdl-events.h b/src/platform/sdl/sdl-events.h
similarity index 100%
rename from src/sdl/sdl-events.h
rename to src/platform/sdl/sdl-events.h
diff --git a/src/sdl-main.c b/src/platform/sdl/sw-main.c
similarity index 100%
rename from src/sdl-main.c
rename to src/platform/sdl/sw-main.c