atria-soft/ewol
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

DEV : try to compile Android directly

Browse Source
This commit is contained in:
Edouard DUPIN 2012-08-08 18:19:31 +02:00
parent 274e9d7ef7
commit 3842609b16
7 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Build

@ -1 +1 @@
Subproject commit 7548e45ca868e292735b507ec3ba2472d6d5eefc
Subproject commit 24f89101d8a98145120bf343ef366dd44f48084a

2
Sources/libagg

@ -1 +1 @@
Subproject commit aa55ba51b9e12d93ec18ede6183d028904b4dc1d
Subproject commit 431b3c77f947b1fd23f273f852e6613c8e888bac

2
Sources/libetk/etk/RegExp.h
View File

@ -1745,7 +1745,7 @@ template<class CLASS_TYPE> class RegExp {
//TK_DEBUG("=> must not end with char");
m_notEndWithChar = true;
// remove element
tmpExp.erase(tmpExp.end());
tmpExp.erase(tmpExp.end()-1);
}
if (tmpExp.size() != m_exprRootNode.Generate(tmpExp) ) {

9
Sources/libewol/Android.mk
View File

@ -11,9 +11,9 @@ LOCAL_VERSION_TAG_SHORT=$(shell cd $(LOCAL_PATH) ; git describe --tags --abbrev=
$(info $(LOCAL_MODULE) version TAG : $(LOCAL_VERSION_TAG))
# name of the dependency
LOCAL_STATIC_LIBRARIES := libetk libfreetype libtinyxml libzip libpng libagg libparsersvg liblua
LOCAL_STATIC_LIBRARIES := etk freetype tinyxml libzip libpng agg parsersvg lua portaudio
LOCAL_C_INCLUDES := $(LOCAL_PATH)
LOCAL_C_INCLUDES :=
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
LOCAL_EXPORT_LDLIBS := -lGLESv1_CM -ldl -llog -lz
@ -46,7 +46,10 @@ include $(LOCAL_PATH)/file.mk
LOCAL_SRC_FILES := ewol/base/guiAndroid.cpp $(FILE_LIST)
# Ewol Test Software :
LOCAL_LDLIBS := -lGLESv1_CM -ldl -llog -lz
LOCAL_LDLIBS := -lGLESv1_CM -ldl -llog -lz --sysroot=/home/edupin/dev/perso/android/ndk/platforms/android-14/arch-arm \
/home/edupin/dev/perso/copyDirectServeur/yourDevFolder/edn/obj/local/armeabi/libstdc++.a \
/home/edupin/dev/perso/android/ndk/sources/cxx-stl/gnu-libstdc++/libs/armeabi/libsupc++.a \
-lstdc++
include $(BUILD_STATIC_LIBRARY)

6
Sources/libewol/Linux.mk
View File

@ -11,7 +11,7 @@ LOCAL_VERSION_TAG_SHORT=$(shell cd $(LOCAL_PATH) ; git describe --tags --abbrev=
$(info $(LOCAL_MODULE) version TAG : $(LOCAL_VERSION_TAG))
# name of the dependency
LOCAL_STATIC_LIBRARIES := etk libfreetype tinyxml libzip libpng agg parsersvg lua portaudio
LOCAL_STATIC_LIBRARIES := etk freetype tinyxml libzip libpng agg parsersvg lua portaudio
LOCAL_C_INCLUDES :=
@ -25,7 +25,6 @@ LOCAL_CFLAGS := -D__PLATFORM__Linux \
-DEWOL_DEBUG_LEVEL=3 \
-DEWOL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-debug\"" \
-DBUILD_TIME="\"$(BUILD_TIME)\"" \
-DEWOL_USE_FREE_TYPE \
-DLUA_COMPAT_ALL \
-Wall
@ -36,8 +35,7 @@ LOCAL_CFLAGS := -D__PLATFORM__Linux \
-DEWOL_DEBUG_LEVEL=3 \
-DEWOL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-release\"" \
-DBUILD_TIME="\"$(BUILD_TIME)\"" \
-DLUA_COMPAT_ALL \
-DEWOL_USE_FREE_TYPE
-DLUA_COMPAT_ALL
endif

2
Sources/libfreetype

@ -1 +1 @@
Subproject commit 8cfc7258e28e250efc4b9d64c76bf8847616cd13
Subproject commit 3cce0f240c0ebb26d322f8698c24461b272ccdc6

2
Sources/libparsersvg

@ -1 +1 @@
Subproject commit f15fc7bbad327fb793ba7ad6973a2aa091f71e5f
Subproject commit cd5fa34bcf344ce0978329ed4226f064d651c3fa