Compilation error on Linux and Android correction

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

View File

@ -23,12 +23,22 @@ LOCAL_SRC_FILES := ewolAndroidAbstraction.cpp \
LOCAL_LDLIBS := -llog -landroid
# -frtti
ifeq ($(DEBUG),1)
LOCAL_CFLAGS := -D__PLATFORM__Android \
-D__MODE__Touch \
-DETK_DEBUG_LEVEL=3 \
-DAPPL_DEBUG_LEVEL=3 \
-DDATA_IN_APK \
-frtti
-DPROJECT_NAME="\"$(LOCAL_MODULE)\""
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)

View File

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

View File

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