HeeroYui/edn
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compilation error on Linux and Android correction

Browse Source
This commit is contained in:
Edouard Dupin 2012-05-10 11:50:58 +02:00
parent 4821093048
commit 6340cc409e
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
jni/Android.mk
View File

@ -23,12 +23,22 @@ LOCAL_SRC_FILES := ewolAndroidAbstraction.cpp \
LOCAL_LDLIBS := -llog -landroid LOCAL_LDLIBS := -llog -landroid
# -frtti
ifeq ($(DEBUG),1)
LOCAL_CFLAGS := -D__PLATFORM__Android \ LOCAL_CFLAGS := -D__PLATFORM__Android \
-D__MODE__Touch \ -D__MODE__Touch \
-DETK_DEBUG_LEVEL=3 \ -DETK_DEBUG_LEVEL=3 \
-DAPPL_DEBUG_LEVEL=3 \ -DAPPL_DEBUG_LEVEL=3 \
-DDATA_IN_APK \ -DPROJECT_NAME="\"$(LOCAL_MODULE)\""
-frtti else
LOCAL_CFLAGS := -D__PLATFORM__Android \
-D__MODE__Touch \
-DETK_DEBUG_LEVEL=1 \
-DAPPL_DEBUG_LEVEL=1 \
-DMODE_RELEASE \
-DPROJECT_NAME="\"$(LOCAL_MODULE)\""
endif
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

3
jni/Linux.mk
View File

@ -26,7 +26,8 @@ LOCAL_LDLIBS :=
ifeq ($(DEBUG),1) ifeq ($(DEBUG),1)
LOCAL_CFLAGS := -D__PLATFORM__Linux \ LOCAL_CFLAGS := -D__PLATFORM__Linux \
-DETK_DEBUG_LEVEL=3 \ -DETK_DEBUG_LEVEL=3 \
-DAPPL_DEBUG_LEVEL=3 -DAPPL_DEBUG_LEVEL=3 \
-DPROJECT_NAME="\"$(LOCAL_MODULE)\""
else else
LOCAL_CFLAGS := -D__PLATFORM__Linux \ LOCAL_CFLAGS := -D__PLATFORM__Linux \
-DETK_DEBUG_LEVEL=3 \ -DETK_DEBUG_LEVEL=3 \

3
jni/appl/init.cpp
View File

@ -64,13 +64,13 @@ void APP_Init(void)
#endif #endif
ewol::ChangeSize(800, 600); ewol::ChangeSize(800, 600);
char cCurrentPath[FILENAME_MAX];
// set the default Path of the application : // set the default Path of the application :
#ifdef __PLATFORM__Linux #ifdef __PLATFORM__Linux
etk::UString homedir; etk::UString homedir;
#ifdef MODE_RELEASE #ifdef MODE_RELEASE
homedir = "/usr/share/"PROJECT_NAME"/"; homedir = "/usr/share/"PROJECT_NAME"/";
#else #else
char cCurrentPath[FILENAME_MAX];
if (!getcwd(cCurrentPath, FILENAME_MAX)) { if (!getcwd(cCurrentPath, FILENAME_MAX)) {
homedir = "./assets/"; homedir = "./assets/";
} else { } else {
@ -111,7 +111,6 @@ void APP_Init(void)
// get the curent program folder // get the curent program folder
char cCurrentPath[FILENAME_MAX];
if (!getcwd(cCurrentPath, FILENAME_MAX)) { if (!getcwd(cCurrentPath, FILENAME_MAX)) {
return ; return ;
} }