From 9a7d75441314b79efc2906491ad041a633fb9da9 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Mon, 24 Jan 2011 21:31:32 -0800 Subject: [PATCH] Fixed Android build --- Android.mk | 4 ++-- src/core/android/SDL_android.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Android.mk b/Android.mk index 984050699..2c3893c30 100755 --- a/Android.mk +++ b/Android.mk @@ -28,7 +28,7 @@ LOCAL_SRC_FILES := \ $(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 @@ LOCAL_SRC_FILES := \ $(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 diff --git a/src/core/android/SDL_android.cpp b/src/core/android/SDL_android.cpp index 4f5f8f5ae..0351007e3 100644 --- a/src/core/android/SDL_android.cpp +++ b/src/core/android/SDL_android.cpp @@ -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();