Anubis / Anubis

Compare View

switch
from
...
to
 
Commits (2)
Showing 4 changed files   Show diff stats
Inline Side-by-side
anubis_dev/extensions/cipher/SConstruct
  Show/Hide comments   View file @ed494e4
@@ -11,16 +11,21 @@ opts.Add('LINK', 'The linker') @@ -11,16 +11,21 @@ opts.Add('LINK', 'The linker')
11 opts.Add('LINKFLAGS', 'The linker flags') 11 opts.Add('LINKFLAGS', 'The linker flags')
12 opts.Add('LIBPATH', 'The linker includes paths') 12 opts.Add('LIBPATH', 'The linker includes paths')
13 13
  14 +
  15 +
14 def ArgToList(val): 16 def ArgToList(val):
15 return val.split() 17 return val.split()
16 18
17 opts.Add('LIBS', 'Additionnal libs', '', None, ArgToList) 19 opts.Add('LIBS', 'Additionnal libs', '', None, ArgToList)
18 20
19 -print "Platform: ", platform.system() 21 +print ("Platform: ", platform.system())
20 if platform.system() == 'Windows': 22 if platform.system() == 'Windows':
21 env = Environment(variables = opts, ENV = os.environ, tools = ['mingw']) 23 env = Environment(variables = opts, ENV = os.environ, tools = ['mingw'])
22 else: 24 else:
23 env = Environment(variables = opts, ENV = os.environ) 25 env = Environment(variables = opts, ENV = os.environ)
  26 + env.Append(CCFLAGS = ' -m32')
  27 + env.Append(LINKFLAGS = ' -m32')
  28 +
24 #env.Append(CCFLAGS = ' /MD /GX /O2') 29 #env.Append(CCFLAGS = ' /MD /GX /O2')
25 if env['PLATFORM'] == 'win32': 30 if env['PLATFORM'] == 'win32':
26 env.Append(CPPDEFINES = {'CIPHER_EXPORTS': None}) 31 env.Append(CPPDEFINES = {'CIPHER_EXPORTS': None})
anubis_dev/extensions/json/SConstruct
  Show/Hide comments   View file @ed494e4
@@ -16,11 +16,14 @@ def ArgToList(val): @@ -16,11 +16,14 @@ def ArgToList(val):
16 16
17 opts.Add('LIBS', 'Additionnal libs', '', None, ArgToList) 17 opts.Add('LIBS', 'Additionnal libs', '', None, ArgToList)
18 18
19 -print "Platform: ", platform.system() 19 +print ("Platform: ", platform.system())
20 if platform.system() == 'Windows': 20 if platform.system() == 'Windows':
21 env = Environment(variables = opts, ENV = os.environ, tools = ['mingw']) 21 env = Environment(variables = opts, ENV = os.environ, tools = ['mingw'])
22 else: 22 else:
23 env = Environment(variables = opts, ENV = os.environ) 23 env = Environment(variables = opts, ENV = os.environ)
  24 + env.Append(CCFLAGS = ' -m32')
  25 + env.Append(LINKFLAGS = ' -m32')
  26 +
24 #env.Append(CCFLAGS = ' /MD /GX /O2') 27 #env.Append(CCFLAGS = ' /MD /GX /O2')
25 if env['PLATFORM'] == 'win32': 28 if env['PLATFORM'] == 'win32':
26 env.Append(CPPDEFINES = {'JSON_EXPORTS': None}) 29 env.Append(CPPDEFINES = {'JSON_EXPORTS': None})
anubis_dev/vm/SConstruct
  Show/Hide comments   View file @ed494e4
@@ -123,7 +123,7 @@ if ssl == 1: @@ -123,7 +123,7 @@ if ssl == 1:
123 else: 123 else:
124 openssl_version = '1.1.1q' 124 openssl_version = '1.1.1q'
125 openssl_dir = 'openssl-'+openssl_version 125 openssl_dir = 'openssl-'+openssl_version
126 - print "OpenSSL version ", openssl_version 126 + print ("OpenSSL version ", openssl_version)
127 env.Append(CPPPATH = [os.path.join(env['TRDDIR'], openssl_dir, 'include')]) 127 env.Append(CPPPATH = [os.path.join(env['TRDDIR'], openssl_dir, 'include')])
128 env.Append(LIBS=[File(os.path.join(env['TRDDIR'], openssl_dir, 'libssl.a'))]) 128 env.Append(LIBS=[File(os.path.join(env['TRDDIR'], openssl_dir, 'libssl.a'))])
129 env.Append(LIBS=[File(os.path.join(env['TRDDIR'], openssl_dir, 'libcrypto.a'))]) 129 env.Append(LIBS=[File(os.path.join(env['TRDDIR'], openssl_dir, 'libcrypto.a'))])
@@ -186,9 +186,12 @@ if is_posix: @@ -186,9 +186,12 @@ if is_posix:
186 #env.Append(CCFLAGS = ' -fpermissive') 186 #env.Append(CCFLAGS = ' -fpermissive')
187 187
188 if static: 188 if static:
  189 + print("STATIC = TRUE")
189 env.Append(LINKFLAGS = '-static') 190 env.Append(LINKFLAGS = '-static')
190 env.Append(CCFLAGS = ' -static') 191 env.Append(CCFLAGS = ' -static')
191 - 192 +else:
  193 + print("STATIC = FALSE")
  194 +
192 if icalldroid == 0 and sys.platform != 'haiku1': 195 if icalldroid == 0 and sys.platform != 'haiku1':
193 env.Append(CCFLAGS = ' -m32') 196 env.Append(CCFLAGS = ' -m32')
194 env.Append(LINKFLAGS = ' -m32') 197 env.Append(LINKFLAGS = ' -m32')
@@ -225,7 +228,7 @@ elif sys.platform.startswith('freebsd'): @@ -225,7 +228,7 @@ elif sys.platform.startswith('freebsd'):
225 host = 'linux' #used to construct a src path specific to that platform 228 host = 'linux' #used to construct a src path specific to that platform
226 env.Append(CPPDEFINES = {'_LINUX_': None, 'FD_SETSIZE' : 65356}) 229 env.Append(CPPDEFINES = {'_LINUX_': None, 'FD_SETSIZE' : 65356})
227 env.Append(CPPPATH = ['/usr/local/include']) 230 env.Append(CPPPATH = ['/usr/local/include'])
228 - env.Append(LIBPATH = ['/usr/local/lib']) 231 + env.Append(LIBPATH = ['/usr/local/lib32'])
229 232
230 #CYGWIN 233 #CYGWIN
231 elif sys.platform.startswith('cygwin'): 234 elif sys.platform.startswith('cygwin'):
third_dev/sqlite3/CMakeLists.txt
  Show/Hide comments   View file @ed494e4
1 -if(${CMAKE_SYSTEM_NAME} STREQUAL Windows)  
2 - add_definitions( -c)  
3 - remove_definitions( -O2 )  
4 - set (CMAKE_C_FLAGS_RELEASE "/MD /O2 /Ob2 /D NDEBUG")  
5 -elseif(${CMAKE_SYSTEM_NAME} STREQUAL Linux)  
6 - add_definitions( -O3 -c -m32 )  
7 -elseif(${CMAKE_SYSTEM_NAME} STREQUAL Darwin)  
8 - add_definitions( -O3 -c -m32 )  
9 -else()  
10 - add_definitions( -O3 -c -m32 )  
11 -endif()  
12 -  
13 -  
14 -add_definitions( -DNO_TCL -DTHREADSAFE=0)  
15 - 1 +if(${CMAKE_SYSTEM_NAME} STREQUAL Windows)
  2 + add_definitions( -c)
  3 + remove_definitions( -O2 )
  4 + set (CMAKE_C_FLAGS_RELEASE "/MD /O2 /Ob2 /D NDEBUG")
  5 +elseif(${CMAKE_SYSTEM_NAME} STREQUAL Linux)
  6 + add_definitions( -O3 -c -m32 )
  7 +elseif(${CMAKE_SYSTEM_NAME} STREQUAL Darwin)
  8 + add_definitions( -O3 -c -m32 )
  9 +else()
  10 + add_definitions( -O3 -c -m32 )
  11 +endif()
  12 +
  13 +
  14 +add_definitions( -DNO_TCL -DTHREADSAFE=0)
  15 +
16 add_library(sqlite3 STATIC sqlite3.c sqlite3.h sqlite3ext.h) 16 add_library(sqlite3 STATIC sqlite3.c sqlite3.h sqlite3ext.h)
17 \ No newline at end of file 17 \ No newline at end of file