CoreAndroid.diff

Can be problem with some arm architecture (Compiled with all arm architectures) - Zbigniew Rebacz, 05/07/2016 09:14 PM

Download (2.94 KB)

View differences:

Core/Core.upp (kopia robocza)
9 9 

  		




  10
  10
  
    
library(WIN32 !GUI !GNU !GCC) "ole32 oleaut32 oldnames";

  		




  11
  11
  
    

  		




  12
  
  
    
library(LINUX) "pthread dl rt";

  		




  
  12
  
    
library(LINUX !ANDROID) "pthread dl rt";

  		




  13
  13
  
    

  		




  14
  14
  
    
library(BSD) "pthread rt execinfo";

  		




  15
  15
  
    

  		












  

    
      Core/Cpu.cpp	(kopia robocza)
    
  





  106
  106
  
    

  		




  107
  107
  
    
int CPU_Cores()

  		




  108
  108
  
    
{

  		




  109
  
  
    
	return minmax(get_nprocs(), 1, 256);

  		




  
  109
  
    
	#ifdef PLATFORM_ANDROID

  		




  
  110
  
    
		return 1;

  		




  
  111
  
    
	#else

  		




  
  112
  
    
		return minmax(get_nprocs(), 1, 256);

  		




  
  113
  
    
	#endif

  		




  110
  114
  
    
}

  		




  111
  115
  
    
#else

  		




  112
  116
  
    
int CPU_Cores()

  		












  

    
      Core/Lang.cpp	(kopia robocza)
    
  





  6
  6
  
    
#endif

  		




  7
  7
  
    
#ifdef PLATFORM_POSIX

  		




  8
  8
  
    
#include <locale.h>

  		




  9
  
  
    
#include <langinfo.h>

  		




  
  9
  
    
	#ifndef PLATFORM_ANDROID

  		




  
  10
  
    
	#include <langinfo.h>

  		




  
  11
  
    
	#endif

  		




  10
  12
  
    
#endif

  		




  11
  13
  
    

  		




  12
  14
  
    
NAMESPACE_UPP

  		












  

    
      Core/LangInfo.cpp	(kopia robocza)
    
  





  6
  6
  
    
#endif


  		




  7
  7
  
    
#ifdef PLATFORM_POSIX


  		




  8
  8
  
    
#include <locale.h>


  		




  9
  
  
    
#include <langinfo.h>


  		




  
  9
  
    
	#ifndef PLATFORM_ANDROID


  		




  
  10
  
    
	#include <langinfo.h>


  		




  
  11
  
    
	#endif


  		




  10
  12
  
    
#endif


  		




  11
  13
  
    

  		




  12
  14
  
    
namespace Upp {


  		




  ......




  295
  297
  
    
	}


  		




  296
  298
  
    
#endif


  		




  297
  299
  
    

  		




  298
  
  
    
#ifdef PLATFORM_POSIX


  		




  
  300
  
    
#if defined(PLATFORM_POSIX) && !defined(PLATFORM_ANDROID)


  		




  299
  301
  
    
	String langtext = LNGAsText(language);


  		




  300
  302
  
    
	char ltext[6];


  		




  301
  303
  
    
	ltext[0] = ToLower(langtext[0]);


  		












  

    
      Core/Util.cpp	(kopia robocza)
    
  





  4
  4
  
    
#	include <winnls.h>

  		




  5
  5
  
    
#endif

  		




  6
  6
  
    

  		




  7
  
  
    
#if defined(PLATFORM_POSIX) && defined(COMPILER_GCC)

  		




  
  7
  
    
#if defined(PLATFORM_POSIX) && defined(COMPILER_GCC) && !defined(PLATFORM_ANDROID)

  		




  8
  8
  
    
#	include <execinfo.h>

  		




  9
  9
  
    
#	include <cxxabi.h>

  		




  10
  10
  
    
#endif

  		




  ......




  38
  38
  
    
}

  		




  39
  39
  
    

  		




  40
  40
  
    

  		




  41
  
  
    
#if defined(PLATFORM_POSIX) && defined(COMPILER_GCC)

  		




  
  41
  
    
#if defined(PLATFORM_POSIX) && defined(COMPILER_GCC) && !defined(PLATFORM_ANDROID)

  		




  42
  42
  
    
void AddStackTrace(char * str, int len)

  		




  43
  43
  
    
{

  		




  44
  44
  
    
	const size_t max_depth = 100;

  		












  

    
      Core/config.h	(kopia robocza)
    
  





  18
  18
  
    

  		




  19
  19
  
    
	#if __unix || __unix__ || __APPLE__


  		




  20
  20
  
    
		#define PLATFORM_POSIX 1


  		




  21
  
  
    
	


  		




  
  21
  
    
		


  		




  22
  22
  
    
		#if __linux


  		




  23
  23
  
    
			#define PLATFORM_LINUX 1


  		




  
  24
  
    
			#if __ANDROID__


  		




  
  25
  
    
				#define PLATFORM_ANDROID 1


  		




  
  26
  
    
			#endif


  		




  24
  27
  
    
		// zvzv add


  		




  25
  28
  
    
		// __linux is undef on APPLE MACOSX, MACOSX has BSD stuff


  		




  26
  29
  
    
		#elif __APPLE__


  		




  ......




  76
  79
  
    
		#define CPU_BE 1


  		




  77
  80
  
    
		#define CPU_BIG_ENDIAN 1


  		




  78
  81
  
    
		#define CPU_ALIGNED 1


  		




  
  82
  
    
	#elif __aarch64__


  		




  
  83
  
    
		#define CPU_64 1


  		




  
  84
  
    
		#define CPU_ARM 1


  		




  
  85
  
    
		#define CPU_LE 1


  		




  
  86
  
    
		#define CPU_LITTLE_ENDIAN 1


  		




  
  87
  
    
		#define CPU_UNALIGNED 1


  		




  79
  88
  
    
	#elif __arm__


  		




  80
  89
  
    
		#define CPU_32 1


  		




  81
  90
  
    
		#define CPU_ARM 1