Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-06-04 20:46:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Changed the texture loader, added ETC1 support.

Browse Source 
Some minor changes to Android port.
And other minor changes.
This commit is contained in:
Martín Lucas Golini
2013-04-29 17:03:36 -03:00
parent 7af08f1f78
commit eaed47f7ec
19 changed files with 161 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
projects/android-project/AndroidManifest.xml
View File

@@ -18,5 +18,5 @@
<supports-screens android:anyDensity="true" />
<uses-sdk android:minSdkVersion="7" />
<uses-sdk android:minSdkVersion="9" />
</manifest>

2
projects/android-project/README
View File

@@ -1,5 +1,5 @@
Inside:
src/eepp/helper/android/SDL2/include/
src/eepp/helper/SDL2/include
add a symbolic link to the same folder in a subfolder called SDL ( ln -s . SDL )

3
projects/android-project/assets.sh Executable file
View File

@@ -0,0 +1,3 @@
#!/bin/sh
adb push ../../assets /sdcard/assets

4
projects/android-project/compile.sh
View File

@@ -1,8 +1,8 @@
#!/bin/sh
cd $(dirname "$0")
export NDK_PROJECT_PATH=$(dirname "$0")
ndk-build -j4
ndk-build NDK_LOG=1 NDK_DEBUG=1 -j4
rm -rf ./bin
ant debug
adb install -r bin/EEPPApp-debug.apk
ndk-gdb --force --start
ndk-gdb --force --start --verbose

3
projects/android-project/data.sh
View File

@@ -1,3 +0,0 @@
#!/bin/sh
adb push data /sdcard/data

11
projects/android-project/jni/Android.mk
View File

@@ -7,7 +7,7 @@ MY_SDL_PATH := $(MY_PATH)/helper/SDL2
MY_SDL_MAIN_PATH := helper/SDL2/src/main/android/*.cpp
MY_C_INCLUDES := \
$(MY_PATH)/helper/android/openal/include/ \
$(MY_PATH)/helper/android/openal-soft/include/ \
$(MY_PATH)/helper/freetype2/include \
$(MY_SDL_PATH)/include \
$(MY_PATH)/helper/chipmunk \
@@ -161,10 +161,9 @@ LOCAL_PATH := $(MY_SDL_PATH)
LOCAL_MODULE := SDL2
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include \
$(MY_PATH)/helper/android/openal/include/
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_CFLAGS := -O3 -D__ANDROID__ -DANDROID -DGL_GLEXT_PROTOTYPES \
LOCAL_CFLAGS := -D__ANDROID__ -DANDROID -DGL_GLEXT_PROTOTYPES \
$(EE_GLES_VERSION)
LOCAL_SRC_FILES := \
@@ -207,7 +206,7 @@ include $(CLEAR_VARS)
LOCAL_PATH := $(MY_PATH)
LOCAL_MODULE := main
LOCAL_MODULE := empty_window
LOCAL_LDLIBS := $(MY_LDLIBS)
@@ -255,7 +254,7 @@ include $(CLEAR_VARS)
LOCAL_PATH := $(MY_PATH)
LOCAL_MODULE := eetest
LOCAL_MODULE := main
LOCAL_LDLIBS := $(MY_LDLIBS)

12
projects/android-project/jni/Application.mk
View File

@@ -13,12 +13,14 @@ APP_STL := stlport_static
APP_LDLIBS := -llog $(EE_GLES_LINK) -lm -lz -lOpenSLES
#Debug Build
#APP_CFLAGS := -g -DDEBUG -DEE_DEBUG -DEE_MEMORY_MANAGER # arm-linux-androideabi-4.4.3 crashes in -O0 mode on SDL sources
# arm-linux-androideabi-4.4.3 crashes in -O0 mode on SDL sources
APP_CFLAGS := -g -DDEBUG -DEE_DEBUG -DEE_MEMORY_MANAGER
APP_OPTIM :=debug
#Release Build
APP_CFLAGS := -fno-strict-aliasing -O3 -s -DNDEBUG -ffast-math
#APP_CFLAGS := -fno-strict-aliasing -O3 -s -DNDEBUG -ffast-math
APP_PLATFORM := android-7
APP_PLATFORM := android-9
APP_MODULES := main
#APP_ABI := armeabi-v7a
APP_ABI := x86
APP_ABI := armeabi-v7a
#APP_ABI := x86

4
projects/linux/ee.creator.user
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by Qt Creator 2.6.1, 2013-01-26T03:04:03. -->
<!-- Written by QtCreator 2.7.0, 2013-04-29T17:01:39. -->
<qtcreator>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>
@@ -13,7 +13,7 @@
<value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
<value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
<valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
<value type="QString" key="language">Cpp</value>
<value type="QByteArray" key="language">Cpp</value>
<valuemap type="QVariantMap" key="value">
<value type="QString" key="CurrentPreferences">CppGlobal</value>
</valuemap>

22
projects/linux/ee.files
View File

@@ -586,3 +586,25 @@
../../src/eepp/system/clock.cpp
../../src/eepp/ui/cuidefaulttheme.cpp
../../include/eepp/ui/cuidefaulttheme.hpp
../../src/eepp/helper/SOIL2/src/SOIL2/stbi_pvr_c.h
../../src/eepp/helper/SOIL2/src/SOIL2/stbi_pvr.h
../../src/eepp/helper/SOIL2/src/SOIL2/stbi_pkm_c.h
../../src/eepp/helper/SOIL2/src/SOIL2/stbi_pkm.h
../../src/eepp/helper/SOIL2/src/SOIL2/stbi_DDS_c.h
../../src/eepp/helper/SOIL2/src/SOIL2/stbi_DDS.h
../../src/eepp/helper/SOIL2/src/SOIL2/stb_image_write.h
../../src/eepp/helper/SOIL2/src/SOIL2/stb_image.h
../../src/eepp/helper/SOIL2/src/SOIL2/pvr_helper.h
../../src/eepp/helper/SOIL2/src/SOIL2/pkm_helper.h
../../src/eepp/helper/SOIL2/src/SOIL2/image_helper.h
../../src/eepp/helper/SOIL2/src/SOIL2/image_DXT.h
../../src/eepp/helper/SOIL2/src/SOIL2/etc1_utils.h
../../src/eepp/helper/SOIL2/src/SOIL2/SOIL2.h
../../src/eepp/helper/SOIL2/src/SOIL2/stb_image_write.c
../../src/eepp/helper/SOIL2/src/SOIL2/stb_image.c
../../src/eepp/helper/SOIL2/src/SOIL2/image_helper.c
../../src/eepp/helper/SOIL2/src/SOIL2/image_DXT.c
../../src/eepp/helper/SOIL2/src/SOIL2/etc1_utils.c
../../src/eepp/helper/SOIL2/src/SOIL2/SOIL2.c
../../src/eepp/helper/SOIL2/src/SOIL2/stbi_ext_c.h
../../src/eepp/helper/SOIL2/src/SOIL2/stbi_ext.h