Changeset 865Tweet

Timestamp:

Aug 27, 2011, 8:29:44 PM (9 years ago)

Author:

sam

Message:

core: move platform-specific code to specific directories.

Location:

trunk

Files:

• deushax/deushax.cpp (modified) (1 diff)
• monsterz/android/jni/Android.mk (modified) (1 diff)
• monsterz/monsterz.cpp (modified) (1 diff)
• src/Makefile.am (modified) (1 diff)
• src/platform (added)
• src/platform/android (added)
• src/platform/android/androidapp.cpp (moved) (moved from trunk/src/androidapp.cpp)
• src/platform/ps3 (added)
• src/platform/ps3/ps3app.cpp (moved) (moved from trunk/src/ps3app.cpp) (1 prop)
• src/platform/ps3/ps3app.h (moved) (moved from trunk/src/ps3app.h) (1 prop)
• src/platform/ps3/ps3input.cpp (moved) (moved from trunk/src/ps3input.cpp) (1 prop)
• src/platform/ps3/ps3input.h (moved) (moved from trunk/src/ps3input.h) (1 prop)
• src/platform/sdl (added)
• src/platform/sdl/sdlapp.cpp (moved) (moved from trunk/src/sdlapp.cpp) (1 diff)
• src/platform/sdl/sdlapp.h (moved) (moved from trunk/src/sdlapp.h)
• src/platform/sdl/sdlinput.cpp (moved) (moved from trunk/src/sdlinput.cpp)
• src/platform/sdl/sdlinput.h (moved) (moved from trunk/src/sdlinput.h)
• test/debug/quad.cpp (modified) (1 diff)

trunk/deushax/deushax.cpp

@@ -18 +18 @@
 
 #include "game.h"
-#include "sdlapp.h"
-#include "sdlinput.h"
+#include "platform/sdl/sdlapp.h"
+#include "platform/sdl/sdlinput.h"
 #include "debugsprite.h"
 

trunk/monsterz/android/jni/Android.mk

@@ -20 +20 @@
 include $(LOCAL_PATH)/$(MONSTERZ_SRC)/Makefile.am
 LOCAL_SRC_FILES := \
-    $(addprefix $(LOL_SRC)/, $(filter-out %.h sdl%, androidapp.cpp $(liblol_a_SOURCES))) \
-    $(addprefix $(MONSTERZ_SRC)/, $(filter-out %.h sdl%, $(monsterz_SOURCES)))
+    $(addprefix $(LOL_SRC)/, $(filter-out %.h, platform/android/androidapp.cpp $(liblol_a_SOURCES))) \
+    $(addprefix $(MONSTERZ_SRC)/, $(filter-out %.h, $(monsterz_SOURCES)))
 
 include $(BUILD_SHARED_LIBRARY)

trunk/monsterz/monsterz.cpp

@@ -25 +25 @@
 
 #if defined __CELLOS_LV2__
-#   include "ps3app.h"
-#   include "ps3input.h"
+#   include "platform/ps3/ps3app.h"
+#   include "platform/ps3/ps3input.h"
 #elif defined HAVE_GLES_2X
 #   include "eglapp.h"
 #else
-#   include "sdlapp.h"
-#   include "sdlinput.h"
+#   include "platform/sdl/sdlapp.h"
+#   include "platform/sdl/sdlinput.h"
 #endif
 #include "interface.h"

trunk/src/Makefile.am

@@ -13 +13 @@
     platform.cpp platform.h sprite.cpp sprite.h \
     \
-    sdlapp.cpp sdlapp.h sdlinput.cpp sdlinput.h \
-    \
     eglapp.cpp eglapp.h \
     \
-    ps3app.cpp ps3app.h ps3input.cpp ps3input.h \
+    platform/sdl/sdlapp.cpp platform/sdl/sdlapp.h \
+    platform/sdl/sdlinput.cpp platform/sdl/sdlinput.h \
+    \
+    platform/ps3/ps3app.cpp platform/ps3/ps3app.h \
+    platform/ps3/ps3input.cpp platform/ps3/ps3input.h \
     \
     shader/shader.cpp shader/shader.h \

trunk/src/platform/sdl/sdlapp.cpp

@@ -19 +19 @@
 #include "core.h"
 #include "lolgl.h"
-#include "sdlapp.h"
+#include "platform/sdl/sdlapp.h"
 
 namespace lol

trunk/test/debug/quad.cpp

@@ -21 +21 @@
 
 #if defined __CELLOS_LV2__
-#   include "ps3app.h"
+#   include "platform/ps3/ps3app.h"
 #elif defined HAVE_GLES_2X
 #   include "eglapp.h"
 #else
-#   include "sdlapp.h"
-#   include "sdlinput.h"
+#   include "platform/sdl/sdlapp.h"
+#   include "platform/sdl/sdlinput.h"
 #endif