fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2011-04-19 18:39 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* 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.
This commit is contained in:
Viktor Szakats
2011-04-19 16:40:34 +00:00
parent 54463d9f13
commit 2071544b32
9 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
harbour/ChangeLog
View File

@@ -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

5
harbour/config/android/gcc.mk Normal file
View File

@@ -0,0 +1,5 @@
#
# $Id$
#
include $(TOP)$(ROOT)config/linux/gcc.mk

5
harbour/config/android/gccarm.mk Normal file
View File

@@ -0,0 +1,5 @@
#
# $Id$
#
include $(TOP)$(ROOT)config/linux/gccarm.mk

5
harbour/config/android/global.mk Normal file
View File

@@ -0,0 +1,5 @@
#
# $Id$
#
include $(TOP)$(ROOT)config/linux/global.mk

5
harbour/config/android/libs.mk Normal file
View File

@@ -0,0 +1,5 @@
#
# $Id$
#
include $(TOP)$(ROOT)config/linux/libs.mk

5
harbour/config/android/mingw.mk Normal file
View File

@@ -0,0 +1,5 @@
#
# $Id$
#
include $(TOP)$(ROOT)config/$(HB_PLATFORM)/mingwarm.mk

11
harbour/config/linux/libs.mk
View File

@@ -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

20
harbour/contrib/xhb/hbsyslog.c
View File

@@ -17,10 +17,6 @@
static HANDLE s_RegHandle;
#elif defined( HB_OS_ANDROID ) && 0
#include <android/log.h>
#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 ) && \

25
harbour/src/common/hbtrace.c
View File

@@ -63,8 +63,6 @@
#if defined( HB_OS_WIN )
#include <windows.h>
#elif defined( HB_OS_ANDROID )
#include <android/log.h>
#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;