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

Simplify makefiles

Browse Source
This commit is contained in:
Edouard Dupin 2012-08-10 12:11:28 +02:00
parent 96047c36e8
commit c36a9d21f3
4 changed files with 19 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
jni/Android.mk
View File

@ -24,22 +24,14 @@ LOCAL_SRC_FILES := ewolAndroidAbstraction.cpp \
LOCAL_LDLIBS := -llog -landroid LOCAL_LDLIBS := -llog -landroid
ifeq ($(DEBUG),1) ifeq ($(DEBUG),1)
LOCAL_CFLAGS := -D__PLATFORM__Android \ LOCAL_CFLAGS := -D__MODE__Touch \
-D__MODE__Touch \
-DETK_DEBUG_LEVEL=3 \
-DAPPL_DEBUG_LEVEL=3 \
-DPROJECT_NAME="\"$(LOCAL_MODULE)\"" \ -DPROJECT_NAME="\"$(LOCAL_MODULE)\"" \
-DAPPL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-debug\"" \ -DAPPL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-$(BUILD_DIRECTORY_MODE)\""
-DBUILD_TIME="\"$(BUILD_TIME)\""
else else
LOCAL_CFLAGS := -D__PLATFORM__Android \ LOCAL_CFLAGS := -D__MODE__Touch \
-D__MODE__Touch \
-DETK_DEBUG_LEVEL=1 \
-DAPPL_DEBUG_LEVEL=1 \
-DMODE_RELEASE \ -DMODE_RELEASE \
-DPROJECT_NAME="\"$(LOCAL_MODULE)\"" \ -DPROJECT_NAME="\"$(LOCAL_MODULE)\"" \
-DAPPL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-release\"" \ -DAPPL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-$(BUILD_DIRECTORY_MODE)\""
-DBUILD_TIME="\"$(BUILD_TIME)\""
endif endif

16
jni/Linux.mk
View File

@ -24,20 +24,12 @@ LOCAL_SRC_FILES := $(FILE_LIST)
LOCAL_LDLIBS := LOCAL_LDLIBS :=
ifeq ($(DEBUG),1) ifeq ($(DEBUG),1)
LOCAL_CFLAGS := -D__PLATFORM__Linux \ LOCAL_CFLAGS := -DPROJECT_NAME="\"$(LOCAL_MODULE)\"" \
-DETK_DEBUG_LEVEL=3 \ -DAPPL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-$(BUILD_DIRECTORY_MODE)\""
-DAPPL_DEBUG_LEVEL=3 \
-DPROJECT_NAME="\"$(LOCAL_MODULE)\"" \
-DAPPL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-debug\"" \
-DBUILD_TIME="\"$(BUILD_TIME)\""
else else
LOCAL_CFLAGS := -D__PLATFORM__Linux \ LOCAL_CFLAGS := -DMODE_RELEASE \
-DETK_DEBUG_LEVEL=3 \
-DAPPL_DEBUG_LEVEL=1 \
-DMODE_RELEASE \
-DPROJECT_NAME="\"$(LOCAL_MODULE)\"" \ -DPROJECT_NAME="\"$(LOCAL_MODULE)\"" \
-DAPPL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-release\"" \ -DAPPL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-$(BUILD_DIRECTORY_MODE)\""
-DBUILD_TIME="\"$(BUILD_TIME)\""
endif endif
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)

48
jni/appl/Debug.h
View File

@ -32,47 +32,13 @@
extern const char * applLog; extern const char * applLog;
#define APPL_CRITICAL(data) ETK_CRITICAL(applLog, data) #define APPL_CRITICAL(data) ETK_CRITICAL(applLog, data)
// General #define APPL_WARNING(data) ETK_WARNING(applLog, data)
#if APPL_DEBUG_LEVEL > 0 #define APPL_ERROR(data) ETK_ERROR(applLog, data)
# define APPL_WARNING(data) ETK_WARNING(applLog, data) #define APPL_INFO(data) ETK_INFO(applLog, data)
# define APPL_ERROR(data) ETK_ERROR(applLog, data) #define APPL_DEBUG(data) ETK_DEBUG(applLog, data)
#else #define APPL_VERBOSE(data) ETK_VERBOSE(applLog, data)
# define APPL_WARNING(data) do {}while(0)
# define APPL_ERROR(data) do {}while(0)
#endif
#if APPL_DEBUG_LEVEL > 1
# define APPL_INFO(data) ETK_INFO(applLog, data)
#else
# define APPL_INFO(data) do {}while(0)
#endif
#if APPL_DEBUG_LEVEL > 2
# define APPL_DEBUG(data) ETK_DEBUG(applLog, data)
#else
# define APPL_DEBUG(data) do {}while(0)
#endif
#if APPL_DEBUG_LEVEL > 3
# define APPL_VERBOSE(data) ETK_VERBOSE(applLog, data)
#else
# define APPL_VERBOSE(data) do {}while(0)
#endif
#define APPL_TODO(data) ETK_WARNING(applLog, "TODO : " << data)
#define APPL_ASSERT(cond, data) ETK_ASSERT(applLog, cond, data) #define APPL_ASSERT(cond, data) ETK_ASSERT(applLog, cond, data)
#define APPL_CHECK_INOUT(cond) ETK_CHECK_INOUT(applLog, cond)
#if APPL_DEBUG_LEVEL > 1 #define APPL_TODO(cond) ETK_TODO(applLog, cond)
# define APPL_CHECK_INOUT(cond) ETK_CHECK_INOUT_ASSERT(applLog, cond)
#elif APPL_DEBUG_LEVEL > 0
# define APPL_CHECK_INOUT(cond) ETK_CHECK_INOUT_WARNING(applLog, cond)
#else
# define APPL_CHECK_INOUT(cond) do { } while (0)
#endif
#endif #endif

4
jni/appl/init.cpp
View File

@ -50,7 +50,7 @@ MainWindows * basicWindows = NULL;
*/ */
void APP_Init(void) void APP_Init(void)
{ {
#ifdef __PLATFORM__Linux #ifdef __TARGET_OS__Linux
#ifdef MODE_RELEASE #ifdef MODE_RELEASE
APPL_INFO("==> Init "PROJECT_NAME" (START) (Linux) (Release)"); APPL_INFO("==> Init "PROJECT_NAME" (START) (Linux) (Release)");
#else #else
@ -68,7 +68,7 @@ void APP_Init(void)
ewol::SetFontFolder("Font"); ewol::SetFontFolder("Font");
#ifdef __PLATFORM__Android #ifdef __TARGET_OS__Android
ewol::SetDefaultFont("freefont/FreeSerif.ttf", 19); ewol::SetDefaultFont("freefont/FreeSerif.ttf", 19);
#else #else
ewol::SetDefaultFont("freefont/FreeSerif.ttf", 14); ewol::SetDefaultFont("freefont/FreeSerif.ttf", 14);