LOVE/love-android
1
0
Fork 0
mirror of https://github.com/love2d/love-android.git synced 2026-08-12 00:20:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

It compiles and exectes (but crashes on startup)

Browse Source
This commit is contained in:
Martin Felis
2013-12-05 22:03:28 +01:00
parent 2644d1ee18
commit bf4cdc5743
24 changed files with 177 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.classpath
+2 -2
View File
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
.project
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>SDLActivity</name>
<name>love_android_sdl2</name>
<comment></comment>
<projects>
</projects>
jni/devil-1.7.8/Android.mk
+4 -3
View File
@@ -22,9 +22,10 @@ LOCAL_C_INCLUDES := \
LOCAL_SRC_FILES := \
$(filter-out \
,$(subst $(LOCAL_PATH)/,,\
$(wildcard ${LOCAL_PATH}/src-IL/src/*.c) ))
$(wildcard ${LOCAL_PATH}/src-IL/src/*.cpp) \
$(wildcard ${LOCAL_PATH}/src-IL/src/*.c) ))
$(info libdevil: include dirs $(LOCAL_C_INCLUDES))
$(info libdevil: src files $(LOCAL_SRC_FILES))
# $(info libdevil: include dirs $(LOCAL_C_INCLUDES))
# $(info libdevil: src files $(LOCAL_SRC_FILES))
include $(BUILD_STATIC_LIBRARY)
jni/freetype2-android/Android.mk
+11 -9
View File
@@ -16,16 +16,18 @@ LOCAL_C_INCLUDES := \
LOCAL_SRC_FILES := \
$(filter-out \
,$(subst $(LOCAL_PATH)/,,\
${LOCAL_PATH}/src/autofit/autofit.c \
$(wildcard ${LOCAL_PATH}/src/base/*.c) \
$(wildcard ${LOCAL_PATH}/src/pshinter/*.c) \
$(wildcard ${LOCAL_PATH}/src/psnames/*.c) \
$(wildcard ${LOCAL_PATH}/src/raster/*.c) \
$(wildcard ${LOCAL_PATH}/src/sfnt/*.c) \
$(wildcard ${LOCAL_PATH}/src/smooth/*.c) \
$(wildcard ${LOCAL_PATH}/src/truetype/*.c) ))
${LOCAL_PATH}/src/autofit/autofit.c \
${LOCAL_PATH}/src/cff/cff.c \
${LOCAL_PATH}/src/pshinter/pshinter.c \
${LOCAL_PATH}/src/psnames/psnames.c \
${LOCAL_PATH}/src/raster/raster.c \
${LOCAL_PATH}/src/sfnt/sfnt.c \
${LOCAL_PATH}/src/smooth/smooth.c \
${LOCAL_PATH}/src/truetype/truetype.c \
))
$(info libfreetype: include dirs $(LOCAL_C_INCLUDES))
$(info libfreetype: src files $(LOCAL_SRC_FILES))
# $(info libfreetype: include dirs $(LOCAL_C_INCLUDES))
# $(info libfreetype: src files $(LOCAL_SRC_FILES))
include $(BUILD_STATIC_LIBRARY)
jni/jasper-1.900.1/Android.mk
+3 -2
View File
@@ -15,6 +15,7 @@ LOCAL_C_INCLUDES := \
LOCAL_SRC_FILES := \
$(filter-out \
src/libjasper/jpg/jpg_dummy.c \
,$(subst $(LOCAL_PATH)/,,\
$(wildcard ${LOCAL_PATH}/src/libjasper/*.c) \
$(wildcard ${LOCAL_PATH}/src/libjasper/jpc/*.c) \
@@ -27,7 +28,7 @@ LOCAL_SRC_FILES := \
$(wildcard ${LOCAL_PATH}/src/libjasper/mif/*.c) \
$(wildcard ${LOCAL_PATH}/src/libjasper/base/*.c) ))
$(info libjasper: include dirs $(LOCAL_C_INCLUDES))
$(info libjasper: src files $(LOCAL_SRC_FILES))
# $(info libjasper: include dirs $(LOCAL_C_INCLUDES))
# $(info libjasper: src files $(LOCAL_SRC_FILES))
include $(BUILD_STATIC_LIBRARY)
jni/jpeg-8c/Android.mk
+2 -2
View File
@@ -19,7 +19,7 @@ LOCAL_SRC_FILES := \
, $(subst $(LOCAL_PATH)/,,\
$(wildcard ${LOCAL_PATH}/*.c) ))
$(info libjpeg: include dirs $(LOCAL_C_INCLUDES))
$(info libjpeg: src files $(LOCAL_SRC_FILES))
# $(info libjpeg: include dirs $(LOCAL_C_INCLUDES))
# $(info libjpeg: src files $(LOCAL_SRC_FILES))
include $(BUILD_STATIC_LIBRARY)
jni/lcms2-2.2/Android.mk
+2 -2
View File
@@ -17,7 +17,7 @@ LOCAL_SRC_FILES := \
,$(subst $(LOCAL_PATH)/,,\
$(wildcard ${LOCAL_PATH}/src/*.c) ))
$(info liblcms: include dirs $(LOCAL_C_INCLUDES))
$(info liblcms: src files $(LOCAL_SRC_FILES))
# $(info liblcms: include dirs $(LOCAL_C_INCLUDES))
# $(info liblcms: src files $(LOCAL_SRC_FILES))
include $(BUILD_STATIC_LIBRARY)
jni/libmng-1.0.10/Android.mk
+2 -2
View File
@@ -18,7 +18,7 @@ LOCAL_SRC_FILES := \
, $(subst $(LOCAL_PATH)/,,\
$(wildcard ${LOCAL_PATH}/*.c) ))
$(info libmng: include dirs $(LOCAL_C_INCLUDES))
$(info libmng: src files $(LOCAL_SRC_FILES))
# $(info libmng: include dirs $(LOCAL_C_INCLUDES))
# $(info libmng: src files $(LOCAL_SRC_FILES))
include $(BUILD_STATIC_LIBRARY)
jni/libmodplug-0.8.8.4/Android.mk
+2 -2
View File
@@ -16,7 +16,7 @@ LOCAL_SRC_FILES := \
, $(subst $(LOCAL_PATH)/,,\
$(wildcard ${LOCAL_PATH}/src/*.cpp) ))
$(info libmodplug: include dirs $(LOCAL_C_INCLUDES))
$(info libmodplug: src files $(LOCAL_SRC_FILES))
# $(info libmodplug: include dirs $(LOCAL_C_INCLUDES))
# $(info libmodplug: src files $(LOCAL_SRC_FILES))
include $(BUILD_STATIC_LIBRARY)
jni/libogg-1.3.0/Android.mk
+1 -1
View File
@@ -15,7 +15,7 @@ LOCAL_SRC_FILES := \
${LOCAL_PATH}/src/framing.c \
${LOCAL_PATH}/src/bitwise.c )
$(info local includes $(LOCAL_C_INCLUDES))
# $(info local includes $(LOCAL_C_INCLUDES))
include $(BUILD_STATIC_LIBRARY)
jni/libpng-1.5.6/Android.mk
+2 -2
View File
@@ -17,7 +17,7 @@ LOCAL_SRC_FILES := \
,$(subst $(LOCAL_PATH)/,,\
$(wildcard ${LOCAL_PATH}/*.c) ))
$(info libpng: include dirs $(LOCAL_C_INCLUDES))
$(info libpng: src files $(LOCAL_SRC_FILES))
# $(info libpng: include dirs $(LOCAL_C_INCLUDES))
# $(info libpng: src files $(LOCAL_SRC_FILES))
include $(BUILD_STATIC_LIBRARY)
jni/libvorbis-1.3.2/Android.mk
+2 -2
View File
@@ -15,7 +15,7 @@ LOCAL_SRC_FILES := \
$(filter-out lib/psytune.c lib/vorbisenc.c, $(subst $(LOCAL_PATH)/,,\
$(wildcard ${LOCAL_PATH}/lib/*.c) ))
$(info libvorbis: include dirs $(LOCAL_C_INCLUDES))
$(info libvorbis: src files $(LOCAL_SRC_FILES))
# $(info libvorbis: include dirs $(LOCAL_C_INCLUDES))
# $(info libvorbis: src files $(LOCAL_SRC_FILES))
include $(BUILD_STATIC_LIBRARY)
jni/love/Android.mk
+107
View File
@@ -0,0 +1,107 @@
LOCAL_PATH:= $(call my-dir)
# libogg
include $(CLEAR_VARS)
LOCAL_MODULE := liblove
LOCAL_CFLAGS := -fexceptions -g -Dlinux -Dunix \
-DHAVE_GCC_DESTRUCTOR=1 -DOPT_GENERIC -DREAL_IS_FLOAT
LOCAL_CPPFLAGS := ${LOCAL_CFLAGS}
LOCAL_C_INCLUDES := \
${LOCAL_PATH}/src \
${LOCAL_PATH}/src/modules \
${LOCAL_PATH}/src/libraries/ \
${LOCAL_PATH}/src/libraries/enet/libenet/include \
${LOCAL_PATH}/../SDL2-2.0.1/include \
${LOCAL_PATH}/../devil-1.7.8/include \
${LOCAL_PATH}/../devil-1.7.8/src-IL/include \
${LOCAL_PATH}/../jasper-1.900.1/src/libjasper/include \
${LOCAL_PATH}/../libpng-1.5.6/ \
${LOCAL_PATH}/../libmng-1.0.10/ \
${LOCAL_PATH}/../jpeg-8c/ \
${LOCAL_PATH}/../lcms2-2.2/include \
${LOCAL_PATH}/../tiff-3.9.5/libtiff \
${LOCAL_PATH}/../openal-soft-android/include \
${LOCAL_PATH}/../openal-soft-android/OpenAL32/Include \
${LOCAL_PATH}/../freetype2-android/include \
${LOCAL_PATH}/../freetype2-android/src \
${LOCAL_PATH}/../physfs-2.0.2 \
${LOCAL_PATH}/../mpg123-1.13.4/src/libmpg123 \
${LOCAL_PATH}/../libmodplug-0.8.8.4/src \
${LOCAL_PATH}/../libvorbis-1.3.2/include \
${LOCAL_PATH}/../lua-5.1.4/src \
${LOCAL_PATH}/../libogg-1.3.0/include
LOCAL_SRC_FILES := \
$(filter-out \
src/libraries/luasocket/libluasocket/wsocket.c \
,$(subst $(LOCAL_PATH)/,,\
$(wildcard ${LOCAL_PATH}/src/love.cpp) \
$(wildcard ${LOCAL_PATH}/src/common/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/modules/audio/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/modules/audio/null/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/modules/audio/openal/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/modules/event/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/modules/event/sdl/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/modules/filesystem/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/modules/filesystem/physfs/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/modules/font/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/modules/font/freetype/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/modules/graphics/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/modules/graphics/opengl/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/modules/image/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/modules/image/magpie/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/modules/joystick/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/modules/joystick/sdl/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/modules/keyboard/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/modules/keyboard/sdl/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/modules/love/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/modules/math/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/modules/mouse/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/modules/mouse/sdl/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/modules/physics/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/modules/physics/box2d/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/modules/sound/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/modules/sound/lullaby/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/modules/system/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/modules/system/sdl/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/modules/thread/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/modules/thread/sdl/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/modules/timer/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/modules/timer/sdl/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/modules/window/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/modules/window/sdl/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/libraries/ddsparse/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/libraries/Box2D/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/libraries/Box2D/Collision/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/libraries/Box2D/Collision/Shapes/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/libraries/Box2D/Common/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/libraries/Box2D/Dynamics/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/libraries/Box2D/Dynamics/Contacts/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/libraries/Box2D/Dynamics/Joints/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/libraries/Box2D/Rope/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/libraries/glad/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/libraries/enet/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/libraries/enet/libenet/*.c) \
$(wildcard ${LOCAL_PATH}/src/libraries/luasocket/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/libraries/luasocket/libluasocket/*.c) \
$(wildcard ${LOCAL_PATH}/src/libraries/noise1234/*.cpp) \
$(wildcard ${LOCAL_PATH}/src/libraries/Wuff/*.c) \
))
LOCAL_CXXFLAGS := -std=c++0x
LOCAL_SHARED_LIBRARIES := SDL2 libphysfs liblua libvorbis libogg libopenal libmpg123 libmodplug libdevil libtiff libmng libfreetype liblcms libjasper libpng libjpeg
# $(info liblove: include dirs $(LOCAL_C_INCLUDES))
# $(info liblove: src files $(LOCAL_SRC_FILES))
SDL_PATH := ../SDL2-2.0.1
LOCAL_SRC_FILES += $(SDL_PATH)/src/main/android/SDL_android_main.c \
LOCAL_LDLIBS := -lGLESv1_CM -lGLESv2 -llog
LOCAL_LDFLAGS := -lz
include $(BUILD_SHARED_LIBRARY)
jni/love/src/libraries/Box2D/Collision/Shapes/b2ChainShape.cpp
+1
View File
@@ -20,6 +20,7 @@
#include <Box2D/Collision/Shapes/b2EdgeShape.h>
#include <new>
#include <memory.h>
#include <cstring>
b2ChainShape::~b2ChainShape()
{
jni/love/src/libraries/Box2D/Collision/b2DynamicTree.cpp
+1
View File
@@ -18,6 +18,7 @@
#include <Box2D/Collision/b2DynamicTree.h>
#include <memory.h>
#include <cstring>
b2DynamicTree::b2DynamicTree()
{
jni/love/src/libraries/Box2D/Common/b2BlockAllocator.cpp
+1
View File
@@ -20,6 +20,7 @@
#include <limits.h>
#include <memory.h>
#include <stddef.h>
#include <cstring>
int32 b2BlockAllocator::s_blockSizes[b2_blockSizes] =
{
jni/love/src/love.cpp
+6
View File
@@ -20,6 +20,7 @@
#include "modules/love/love.h"
#include <SDL.h>
#include <SDL_opengles.h>
#ifdef LOVE_BUILD_EXE
@@ -135,6 +136,11 @@ static int love_preload(lua_State *L, lua_CFunction f, const char *name)
int main(int argc, char **argv)
{
SDL_LogSetAllPriority(SDL_LOG_PRIORITY_VERBOSE);
SDL_Log ("Hello from love main");
#ifdef LOVE_LEGENDARY_UTF8_ARGV_HACK
int hack_argc = 0; char **hack_argv = 0;
get_utf8_arguments(hack_argc, hack_argv);
jni/love/src/modules/sound/lullaby/ModPlugDecoder.h
+1 -1
View File
@@ -26,7 +26,7 @@
#include "Decoder.h"
// SDL_sound
#include <libmodplug/modplug.h>
#include <modplug.h>
namespace love
{
jni/mpg123-1.13.4/Android.mk
+5 -5
View File
@@ -12,14 +12,14 @@ LOCAL_C_INCLUDES := \
LOCAL_SRC_FILES := \
$(filter-out \
src/libmpg123/dct64_altivec.c src/libmpg123/dct64.c \
src/libmpg123/dct64_altivec.c \
src/libmpg123/dct64_i386.c src/libmpg123/dct64_i486.c \
src/libmpg123/synth_8bit.c src/libmpg123/synth_altivec.c \
src/libmpg123/synth.c src/libmpg123/synth_i486.c \
src/libmpg123/synth_altivec.c src/libmpg123/synth_i486.c \
src/libmpg123/testcpu.c \
, $(subst $(LOCAL_PATH)/,,\
$(wildcard ${LOCAL_PATH}/src/libmpg123/*.c) ))
$(info libmpg123: include dirs $(LOCAL_C_INCLUDES))
$(info libmpg123: src files $(LOCAL_SRC_FILES))
# $(info libmpg123: include dirs $(LOCAL_C_INCLUDES))
# $(info libmpg123: src files $(LOCAL_SRC_FILES))
include $(BUILD_STATIC_LIBRARY)
jni/openal-soft-android/Android.mk
+10 -5
View File
@@ -12,11 +12,16 @@ LOCAL_C_INCLUDES := \
${LOCAL_PATH}/OpenAL32/Include
LOCAL_SRC_FILES := \
$(filter-out \
, $(subst $(LOCAL_PATH)/,,\
$(wildcard ${LOCAL_PATH}/OpenAL32/*.c) ))
$(filter-out , $(subst $(LOCAL_PATH)/,,\
${LOCAL_PATH}/Alc/backends/loopback.c \
${LOCAL_PATH}/Alc/backends/null.c \
${LOCAL_PATH}/Alc/backends/android.c \
${LOCAL_PATH}/Alc/backends/wave.c \
$(wildcard ${LOCAL_PATH}/Alc/*.c) \
$(wildcard ${LOCAL_PATH}/OpenAL32/*.c) \
))
$(info libopenal: include dirs $(LOCAL_C_INCLUDES))
$(info libopenal: src files $(LOCAL_SRC_FILES))
# $(info libopenal: include dirs $(LOCAL_C_INCLUDES))
# $(info libopenal: src files $(LOCAL_SRC_FILES))
include $(BUILD_STATIC_LIBRARY)
jni/physfs-2.0.2/Android.mk
+6 -3
View File
@@ -21,13 +21,16 @@ LOCAL_C_INCLUDES := \
LOCAL_SRC_FILES := \
$(filter-out \
, $(subst $(LOCAL_PATH)/,,\
${LOCAL_PATH}/lzma/C/7zCrc.c \
${LOCAL_PATH}/lzma/C/Compress/Lzma/LzmaDecode.c \
$(wildcard ${LOCAL_PATH}/*.c) \
$(wildcard ${LOCAL_PATH}/lzma/*.c) \
$(wildcard ${LOCAL_PATH}/lzma/C/Archive/7z/*.c) \
$(wildcard ${LOCAL_PATH}/lzma/C/Compress/Branch/*.c) \
$(wildcard ${LOCAL_PATH}/zlib123/*.c) \
$(wildcard ${LOCAL_PATH}/archivers/*.c) \
$(wildcard ${LOCAL_PATH}/platform/*.c) ))
$(info libphysfs: include dirs $(LOCAL_C_INCLUDES))
$(info libphysfs: src files $(LOCAL_SRC_FILES))
# $(info libphysfs: include dirs $(LOCAL_C_INCLUDES))
# $(info libphysfs: src files $(LOCAL_SRC_FILES))
include $(BUILD_STATIC_LIBRARY)
jni/src/Android.mk
+1 -1
View File
@@ -13,7 +13,7 @@ LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.c \
main.cpp
LOCAL_CXXFLAGS := -std=c++0x
LOCAL_SHARED_LIBRARIES := SDL2 liblua libogg libvorbis libmpg123 libmodplug libopenal libjpeg libtiff libphysfs libmng libfreetype liblcms libpng libjasper libdevil
LOCAL_SHARED_LIBRARIES := SDL2 liblua
LOCAL_LDLIBS := -lGLESv1_CM -lGLESv2 -llog
include $(BUILD_SHARED_LIBRARY)
jni/tiff-3.9.5/Android.mk
+3 -2
View File
@@ -16,9 +16,10 @@ LOCAL_SRC_FILES := \
libtiff/tif_acorn.c libtiff/tif_apple.c libtiff/tif_atari.c \
libtiff/tif_msdos.c libtiff/tif_win3.c libtiff/tif_win32.c \
, $(subst $(LOCAL_PATH)/,,\
${LOCAL_PATH}/port/lfind.c \
$(wildcard ${LOCAL_PATH}/libtiff/*.c) ))
$(info libtiff: include dirs $(LOCAL_C_INCLUDES))
$(info libtiff: src files $(LOCAL_SRC_FILES))
# $(info libtiff: include dirs $(LOCAL_C_INCLUDES))
# $(info libtiff: src files $(LOCAL_SRC_FILES))
include $(BUILD_STATIC_LIBRARY)
src/org/libsdl/app/SDLActivity.java
+1 -1
View File
@@ -46,7 +46,7 @@ public class SDLActivity extends Activity {
//System.loadLibrary("SDL2_mixer");
//System.loadLibrary("SDL2_net");
//System.loadLibrary("SDL2_ttf");
System.loadLibrary("main");
System.loadLibrary("love");
}
// Setup