Mercurial > sdl-ios-xcode

changeset 5094:ed1d54f1290a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed Android build
author Sam Lantinga <slouken@libsdl.org>
date Mon, 24 Jan 2011 21:31:32 -0800
parents 2164a79b5ca9
children 817064595222
files Android.mk src/core/android/SDL_android.cpp
diffstat 2 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/Android.mk	Mon Jan 24 21:22:00 2011 -0800
+++ b/Android.mk	Mon Jan 24 21:31:32 2011 -0800
@@ -28,7 +28,7 @@
 	$(wildcard $(LOCAL_PATH)/src/haptic/dummy/*.c) \
 	$(wildcard $(LOCAL_PATH)/src/joystick/*.c) \
 	$(wildcard $(LOCAL_PATH)/src/joystick/android/*.c) \
-	$(wildcard $(LOCAL_PATH)/src/loadso/dlopen/*.c)) \
+	$(wildcard $(LOCAL_PATH)/src/loadso/dlopen/*.c) \
 	$(wildcard $(LOCAL_PATH)/src/power/*.c) \
 	$(wildcard $(LOCAL_PATH)/src/stdlib/*.c) \
 	$(wildcard $(LOCAL_PATH)/src/thread/*.c) \
@@ -36,7 +36,7 @@
 	$(wildcard $(LOCAL_PATH)/src/timer/*.c) \
 	$(wildcard $(LOCAL_PATH)/src/timer/unix/*.c) \
 	$(wildcard $(LOCAL_PATH)/src/video/*.c) \
-	$(wildcard $(LOCAL_PATH)/src/video/android/*.c)
+	$(wildcard $(LOCAL_PATH)/src/video/android/*.c))
 
 LOCAL_LDLIBS := -ldl -lGLESv1_CM -llog
 
--- a/src/core/android/SDL_android.cpp	Mon Jan 24 21:22:00 2011 -0800
+++ b/src/core/android/SDL_android.cpp	Mon Jan 24 21:31:32 2011 -0800
@@ -24,10 +24,10 @@
 #include "SDL_android.h"
 
 extern "C" {
-#include "events/SDL_events_c.h"
-#include "video/android/SDL_androidkeyboard.h"
-#include "video/android/SDL_androidtouch.h"
-#include "video/android/SDL_androidvideo.h"
+#include "../../events/SDL_events_c.h"
+#include "../../video/android/SDL_androidkeyboard.h"
+#include "../../video/android/SDL_androidtouch.h"
+#include "../../video/android/SDL_androidvideo.h"
 
 /* Impelemented in audio/android/SDL_androidaudio.c */
 extern void Android_RunAudioThread();