Commit ada07462 authored by Sam Lantinga's avatar Sam Lantinga

Fixed Android build

parent f98d8042
...@@ -28,7 +28,7 @@ LOCAL_SRC_FILES := \ ...@@ -28,7 +28,7 @@ LOCAL_SRC_FILES := \
$(wildcard $(LOCAL_PATH)/src/haptic/dummy/*.c) \ $(wildcard $(LOCAL_PATH)/src/haptic/dummy/*.c) \
$(wildcard $(LOCAL_PATH)/src/joystick/*.c) \ $(wildcard $(LOCAL_PATH)/src/joystick/*.c) \
$(wildcard $(LOCAL_PATH)/src/joystick/android/*.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/power/*.c) \
$(wildcard $(LOCAL_PATH)/src/stdlib/*.c) \ $(wildcard $(LOCAL_PATH)/src/stdlib/*.c) \
$(wildcard $(LOCAL_PATH)/src/thread/*.c) \ $(wildcard $(LOCAL_PATH)/src/thread/*.c) \
...@@ -36,7 +36,7 @@ LOCAL_SRC_FILES := \ ...@@ -36,7 +36,7 @@ LOCAL_SRC_FILES := \
$(wildcard $(LOCAL_PATH)/src/timer/*.c) \ $(wildcard $(LOCAL_PATH)/src/timer/*.c) \
$(wildcard $(LOCAL_PATH)/src/timer/unix/*.c) \ $(wildcard $(LOCAL_PATH)/src/timer/unix/*.c) \
$(wildcard $(LOCAL_PATH)/src/video/*.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 LOCAL_LDLIBS := -ldl -lGLESv1_CM -llog
......
...@@ -24,10 +24,10 @@ ...@@ -24,10 +24,10 @@
#include "SDL_android.h" #include "SDL_android.h"
extern "C" { extern "C" {
#include "events/SDL_events_c.h" #include "../../events/SDL_events_c.h"
#include "video/android/SDL_androidkeyboard.h" #include "../../video/android/SDL_androidkeyboard.h"
#include "video/android/SDL_androidtouch.h" #include "../../video/android/SDL_androidtouch.h"
#include "video/android/SDL_androidvideo.h" #include "../../video/android/SDL_androidvideo.h"
/* Impelemented in audio/android/SDL_androidaudio.c */ /* Impelemented in audio/android/SDL_androidaudio.c */
extern void Android_RunAudioThread(); extern void Android_RunAudioThread();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment