Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Fixed Android build

  • Loading branch information
slouken committed Jan 25, 2011
1 parent 2ae3eba commit 9a7d75441314b79efc2906491ad041a633fb9da9
Showing with 6 additions and 6 deletions.
  1. +2 −2 Android.mk
  2. +4 −4 src/core/android/SDL_android.cpp
@@ -28,15 +28,15 @@ 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) \
$(wildcard $(LOCAL_PATH)/src/thread/pthread/*.c) \
$(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

@@ -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();

0 comments on commit 9a7d754

Please sign in to comment.