From 2071544b3274a99be752bd1a71227333fd28fea2 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 19 Apr 2011 16:40:34 +0000 Subject: [PATCH] 2011-04-19 18:39 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * src/common/hbtrace.c * contrib/xhb/hbsyslog.c - Deleted Android specific logging. syslog works good. + config/android + config/android/libs.mk + config/android/gcc.mk + config/android/gccarm.mk + config/android/global.mk + config/android/mingw.mk + Added android specific core build files. They are all redirected to linux. * config/linux/libs.mk + Do not add rt and pthreads libs for android targets. --- harbour/ChangeLog | 17 +++++++++++++++++ harbour/config/android/gcc.mk | 5 +++++ harbour/config/android/gccarm.mk | 5 +++++ harbour/config/android/global.mk | 5 +++++ harbour/config/android/libs.mk | 5 +++++ harbour/config/android/mingw.mk | 5 +++++ harbour/config/linux/libs.mk | 11 +++++++---- harbour/contrib/xhb/hbsyslog.c | 20 -------------------- harbour/src/common/hbtrace.c | 25 ------------------------- 9 files changed, 49 insertions(+), 49 deletions(-) create mode 100644 harbour/config/android/gcc.mk create mode 100644 harbour/config/android/gccarm.mk create mode 100644 harbour/config/android/global.mk create mode 100644 harbour/config/android/libs.mk create mode 100644 harbour/config/android/mingw.mk diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 3d86611fba..c40f4ee6eb 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,23 @@ The license applies to all entries newer than 2009-04-28. */ +2011-04-19 18:39 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * src/common/hbtrace.c + * contrib/xhb/hbsyslog.c + - Deleted Android specific logging. syslog works good. + + + config/android + + config/android/libs.mk + + config/android/gcc.mk + + config/android/gccarm.mk + + config/android/global.mk + + config/android/mingw.mk + + Added android specific core build files. They are + all redirected to linux. + + * config/linux/libs.mk + + Do not add rt and pthreads libs for android targets. + 2011-04-19 17:55 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * include/harbour.hbx * src/rtl/version.c diff --git a/harbour/config/android/gcc.mk b/harbour/config/android/gcc.mk new file mode 100644 index 0000000000..25c8e3e61a --- /dev/null +++ b/harbour/config/android/gcc.mk @@ -0,0 +1,5 @@ +# +# $Id$ +# + +include $(TOP)$(ROOT)config/linux/gcc.mk diff --git a/harbour/config/android/gccarm.mk b/harbour/config/android/gccarm.mk new file mode 100644 index 0000000000..393c5b1ca6 --- /dev/null +++ b/harbour/config/android/gccarm.mk @@ -0,0 +1,5 @@ +# +# $Id$ +# + +include $(TOP)$(ROOT)config/linux/gccarm.mk diff --git a/harbour/config/android/global.mk b/harbour/config/android/global.mk new file mode 100644 index 0000000000..391c495f6b --- /dev/null +++ b/harbour/config/android/global.mk @@ -0,0 +1,5 @@ +# +# $Id$ +# + +include $(TOP)$(ROOT)config/linux/global.mk diff --git a/harbour/config/android/libs.mk b/harbour/config/android/libs.mk new file mode 100644 index 0000000000..fd3f59765e --- /dev/null +++ b/harbour/config/android/libs.mk @@ -0,0 +1,5 @@ +# +# $Id$ +# + +include $(TOP)$(ROOT)config/linux/libs.mk diff --git a/harbour/config/android/mingw.mk b/harbour/config/android/mingw.mk new file mode 100644 index 0000000000..42159f89d0 --- /dev/null +++ b/harbour/config/android/mingw.mk @@ -0,0 +1,5 @@ +# +# $Id$ +# + +include $(TOP)$(ROOT)config/$(HB_PLATFORM)/mingwarm.mk diff --git a/harbour/config/linux/libs.mk b/harbour/config/linux/libs.mk index 1eed434094..82927da76f 100644 --- a/harbour/config/linux/libs.mk +++ b/harbour/config/linux/libs.mk @@ -33,10 +33,13 @@ ifneq ($(HB_LINKING_RTL),) ifeq ($(HB_HAS_ZLIB_LOCAL),) SYSLIBS += z endif - SYSLIBS += rt dl - # Don't seem to be needed here, but added it for reference to move/copy it to *nix platforms where this is required - ifneq ($(HB_LINKING_VMMT),) - SYSLIBS += pthread + SYSLIBS += dl + ifneq ($(HB_PLATFORM),android) + SYSLIBS += rt + # Don't seem to be needed here, but added it for reference to move/copy it to *nix platforms where this is required + ifneq ($(HB_LINKING_VMMT),) + SYSLIBS += pthread + endif endif endif diff --git a/harbour/contrib/xhb/hbsyslog.c b/harbour/contrib/xhb/hbsyslog.c index 1a3ae41210..0586ed08b2 100644 --- a/harbour/contrib/xhb/hbsyslog.c +++ b/harbour/contrib/xhb/hbsyslog.c @@ -17,10 +17,6 @@ static HANDLE s_RegHandle; -#elif defined( HB_OS_ANDROID ) && 0 - - #include - #elif defined( HB_OS_UNIX ) && \ ! defined( __WATCOMC__ ) && \ ! defined( HB_OS_VXWORKS ) && \ @@ -114,22 +110,6 @@ HB_FUNC( HB_SYSLOGMESSAGE ) #endif hb_retl( HB_FALSE ); - #elif defined( HB_OS_ANDROID ) && 0 - - int logval; - - switch( hb_parni( 2 ) ) - { - case HB_LOG_CRITICAL: logval = ANDROID_LOG_FATAL; break; - case HB_LOG_ERROR: logval = ANDROID_LOG_ERROR; break; - case HB_LOG_WARN: logval = ANDROID_LOG_WARN; break; - case HB_LOG_INFO: logval = ANDROID_LOG_INFO; break; - default: logval = ANDROID_LOG_DEBUG; - } - - __android_log_print( logval, "xhb", "[%lX]: %s", hb_parnl( 3 ), hb_parcx( 1 ) ); - hb_retl( HB_TRUE ); - #elif defined( HB_OS_UNIX ) && \ ! defined( __WATCOMC__ ) && \ ! defined( HB_OS_VXWORKS ) && \ diff --git a/harbour/src/common/hbtrace.c b/harbour/src/common/hbtrace.c index 7ef45ec9b6..9badc0f52e 100644 --- a/harbour/src/common/hbtrace.c +++ b/harbour/src/common/hbtrace.c @@ -63,8 +63,6 @@ #if defined( HB_OS_WIN ) #include -#elif defined( HB_OS_ANDROID ) - #include #elif defined( HB_OS_UNIX ) && \ ! defined( __WATCOMC__ ) && \ ! defined( HB_OS_VXWORKS ) && \ @@ -299,29 +297,6 @@ static void hb_tracelog_( int level, const char * file, int line, const char * p #endif OutputDebugString( buf.lp ); } -# elif defined( HB_OS_ANDROID ) - { - char psz[ 1024 ]; - int slevel; - - switch( level ) - { - case HB_TR_ALWAYS: slevel = ANDROID_LOG_VERBOSE; break; - case HB_TR_FATAL: slevel = ANDROID_LOG_FATAL; break; - case HB_TR_ERROR: slevel = ANDROID_LOG_ERROR; break; - case HB_TR_WARNING: slevel = ANDROID_LOG_WARN; break; - case HB_TR_INFO: slevel = ANDROID_LOG_INFO; break; - case HB_TR_DEBUG: slevel = ANDROID_LOG_DEBUG; break; - default: slevel = ANDROID_LOG_DEBUG; - } - - if( proc ) - hb_snprintf( psz, sizeof( psz ), "%s:%d:%s() %s", file, line, proc, pszLevel ); - else - hb_snprintf( psz, sizeof( psz ), "%s:%d: %s", file, line, pszLevel ); - - __android_log_print( slevel, psz, message ); - } # else { int slevel;