Fixed Android build
authorSam Lantinga <slouken@libsdl.org>
Mon, 24 Jan 2011 21:31:32 -0800
changeset 5092ed1d54f1290a
parent 5091 2164a79b5ca9
child 5093 817064595222
Fixed Android build
Android.mk
src/core/android/SDL_android.cpp
     1.1 --- a/Android.mk	Mon Jan 24 21:22:00 2011 -0800
     1.2 +++ b/Android.mk	Mon Jan 24 21:31:32 2011 -0800
     1.3 @@ -28,7 +28,7 @@
     1.4  	$(wildcard $(LOCAL_PATH)/src/haptic/dummy/*.c) \
     1.5  	$(wildcard $(LOCAL_PATH)/src/joystick/*.c) \
     1.6  	$(wildcard $(LOCAL_PATH)/src/joystick/android/*.c) \
     1.7 -	$(wildcard $(LOCAL_PATH)/src/loadso/dlopen/*.c)) \
     1.8 +	$(wildcard $(LOCAL_PATH)/src/loadso/dlopen/*.c) \
     1.9  	$(wildcard $(LOCAL_PATH)/src/power/*.c) \
    1.10  	$(wildcard $(LOCAL_PATH)/src/stdlib/*.c) \
    1.11  	$(wildcard $(LOCAL_PATH)/src/thread/*.c) \
    1.12 @@ -36,7 +36,7 @@
    1.13  	$(wildcard $(LOCAL_PATH)/src/timer/*.c) \
    1.14  	$(wildcard $(LOCAL_PATH)/src/timer/unix/*.c) \
    1.15  	$(wildcard $(LOCAL_PATH)/src/video/*.c) \
    1.16 -	$(wildcard $(LOCAL_PATH)/src/video/android/*.c)
    1.17 +	$(wildcard $(LOCAL_PATH)/src/video/android/*.c))
    1.18  
    1.19  LOCAL_LDLIBS := -ldl -lGLESv1_CM -llog
    1.20  
     2.1 --- a/src/core/android/SDL_android.cpp	Mon Jan 24 21:22:00 2011 -0800
     2.2 +++ b/src/core/android/SDL_android.cpp	Mon Jan 24 21:31:32 2011 -0800
     2.3 @@ -24,10 +24,10 @@
     2.4  #include "SDL_android.h"
     2.5  
     2.6  extern "C" {
     2.7 -#include "events/SDL_events_c.h"
     2.8 -#include "video/android/SDL_androidkeyboard.h"
     2.9 -#include "video/android/SDL_androidtouch.h"
    2.10 -#include "video/android/SDL_androidvideo.h"
    2.11 +#include "../../events/SDL_events_c.h"
    2.12 +#include "../../video/android/SDL_androidkeyboard.h"
    2.13 +#include "../../video/android/SDL_androidtouch.h"
    2.14 +#include "../../video/android/SDL_androidvideo.h"
    2.15  
    2.16  /* Impelemented in audio/android/SDL_androidaudio.c */
    2.17  extern void Android_RunAudioThread();