miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed compilation

Browse Source
This commit is contained in:
pelya
2010-07-07 14:03:14 +03:00
parent bfbde14974
commit 8895adf61e
7 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
alienblaster/project/jni/freetype/Android.mk
View File

@@ -6,17 +6,13 @@ LOCAL_MODULE := freetype
APP_SUBDIRS := $(patsubst $(LOCAL_PATH)/%, %, $(shell find $(LOCAL_PATH)/src -type d)) APP_SUBDIRS := $(patsubst $(LOCAL_PATH)/%, %, $(shell find $(LOCAL_PATH)/src -type d))
# Add more subdirs here, like src/subdir1 src/subdir2
LOCAL_CFLAGS := $(foreach D, $(APP_SUBDIRS), -I$(LOCAL_PATH)/$(D)) \ LOCAL_CFLAGS := $(foreach D, $(APP_SUBDIRS), -I$(LOCAL_PATH)/$(D)) \
-I$(LOCAL_PATH)/include -DFT2_BUILD_LIBRARY -I$(LOCAL_PATH)/include -DFT2_BUILD_LIBRARY
#Change C++ file extension as appropriate
LOCAL_CPP_EXTENSION := .cpp LOCAL_CPP_EXTENSION := .cpp
LOCAL_SRC_FILES := $(foreach F, $(APP_SUBDIRS), $(addprefix $(F)/,$(notdir $(wildcard $(LOCAL_PATH)/$(F)/*.cpp)))) LOCAL_SRC_FILES := $(foreach F, $(APP_SUBDIRS), $(addprefix $(F)/,$(notdir $(wildcard $(LOCAL_PATH)/$(F)/*.cpp))))
# Uncomment to also add C sources
LOCAL_SRC_FILES += $(foreach F, $(APP_SUBDIRS), $(addprefix $(F)/,$(notdir $(wildcard $(LOCAL_PATH)/$(F)/*.c)))) LOCAL_SRC_FILES += $(foreach F, $(APP_SUBDIRS), $(addprefix $(F)/,$(notdir $(wildcard $(LOCAL_PATH)/$(F)/*.c))))
LOCAL_SHARED_LIBRARIES := LOCAL_SHARED_LIBRARIES :=

6
alienblaster/project/jni/sdl/src/video/android/SDL_androidinput.c
View File

@@ -64,11 +64,11 @@ JAVA_EXPORT_NAME(DemoGLSurfaceView_nativeMouse) ( JNIEnv* env, jobject thiz, j
{ {
if( action == MOUSE_DOWN || action == MOUSE_UP ) if( action == MOUSE_DOWN || action == MOUSE_UP )
{ {
SDL_SendMouseMotion(0, x, y); SDL_SendMouseMotion(NULL, 0, x, y);
SDL_SendMouseButton( (action == MOUSE_DOWN) ? SDL_PRESSED : SDL_RELEASED, 1 ); SDL_SendMouseButton(NULL, (action == MOUSE_DOWN) ? SDL_PRESSED : SDL_RELEASED, 1 );
} }
if( action == MOUSE_MOVE ) if( action == MOUSE_MOVE )
SDL_SendMouseMotion(0, x, y); SDL_SendMouseMotion(NULL, 0, x, y);
} }
static SDL_scancode TranslateKey(int scancode) static SDL_scancode TranslateKey(int scancode)

1
alienblaster/project/jni/sdl_image/Android.mk
View File

@@ -9,7 +9,6 @@ LOCAL_CFLAGS := -I$(LOCAL_PATH) -I$(LOCAL_PATH)/../jpeg -I$(LOCAL_PATH)/../png -
LOCAL_CPP_EXTENSION := .cpp LOCAL_CPP_EXTENSION := .cpp
# Note this simple makefile var substitution, you can find even simpler examples in different Android projects
LOCAL_SRC_FILES := $(notdir $(wildcard $(LOCAL_PATH)/*.c)) LOCAL_SRC_FILES := $(notdir $(wildcard $(LOCAL_PATH)/*.c))
LOCAL_STATIC_LIBRARIES := png jpeg LOCAL_STATIC_LIBRARIES := png jpeg

2
alienblaster/project/jni/sdl_main/Android.mk
View File

@@ -17,6 +17,6 @@ LOCAL_CPP_EXTENSION := .cpp
LOCAL_SRC_FILES := sdl_main.c LOCAL_SRC_FILES := sdl_main.c
LOCAL_SHARED_LIBRARIES := sdl application LOCAL_SHARED_LIBRARIES := sdl application
LOCAL_LDLIBS := -llog # -Wl,-rpath=$(SDL_SHARED_LIBRARIES_PATH) # -l:$(SDL_SHARED_LIBRARIES_PATH)/libsdl.so -l:$(SDL_SHARED_LIBRARIES_PATH)/libapplication.so LOCAL_LDLIBS := -llog
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

1
alienblaster/project/jni/sdl_mixer/Android.mk
View File

@@ -9,7 +9,6 @@ LOCAL_CFLAGS := -I$(LOCAL_PATH) -I$(LOCAL_PATH)/.. -I$(LOCAL_PATH)/../sdl/includ
LOCAL_CPP_EXTENSION := .cpp LOCAL_CPP_EXTENSION := .cpp
# Note this simple makefile var substitution, you can find even simpler examples in different Android projects
LOCAL_SRC_FILES := $(notdir $(wildcard $(LOCAL_PATH)/*.c)) LOCAL_SRC_FILES := $(notdir $(wildcard $(LOCAL_PATH)/*.c))
LOCAL_SHARED_LIBRARIES := sdl tremor LOCAL_SHARED_LIBRARIES := sdl tremor

1
alienblaster/project/jni/sdl_ttf/Android.mk
View File

@@ -8,7 +8,6 @@ LOCAL_CFLAGS := -I$(LOCAL_PATH) -I$(LOCAL_PATH)/../sdl/include -I$(LOCAL_PATH)/.
LOCAL_CPP_EXTENSION := .cpp LOCAL_CPP_EXTENSION := .cpp
# Note this simple makefile var substitution, you can find even simpler examples in different Android projects
LOCAL_SRC_FILES := SDL_ttf.c LOCAL_SRC_FILES := SDL_ttf.c
LOCAL_SHARED_LIBRARIES := sdl LOCAL_SHARED_LIBRARIES := sdl

1
alienblaster/project/jni/tremor/Android.mk
View File

@@ -8,7 +8,6 @@ LOCAL_CFLAGS := -I$(LOCAL_PATH) -DHAVE_ALLOCA_H
LOCAL_CPP_EXTENSION := .cpp LOCAL_CPP_EXTENSION := .cpp
# Note this simple makefile var substitution, you can find even simpler examples in different Android projects
LOCAL_SRC_FILES := $(notdir $(wildcard $(LOCAL_PATH)/*.c)) LOCAL_SRC_FILES := $(notdir $(wildcard $(LOCAL_PATH)/*.c))
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)