Use luajit 2.0 if available
This commit is contained in:
		
							parent
							
								
									11d4d3ec30
								
							
						
					
					
						commit
						3353e482ef
					
				| @ -109,7 +109,6 @@ if sys.platform == 'darwin':	#Mac OS X | |||||||
| 	boost_prefix = subprocess.check_output(["brew", "--prefix", "boost"]).strip() | 	boost_prefix = subprocess.check_output(["brew", "--prefix", "boost"]).strip() | ||||||
| 	env.Append(CPPPATH = [boost_prefix+"/include"] ) | 	env.Append(CPPPATH = [boost_prefix+"/include"] ) | ||||||
| 	env.Append(LIBPATH = [boost_prefix+"/lib"] ) | 	env.Append(LIBPATH = [boost_prefix+"/lib"] ) | ||||||
| #	env.ParseConfig('pkg-config --cflags --libs libzip') |  | ||||||
| 	if not conf.CheckLibWithHeader('lua', 'lua.h', 'C'): | 	if not conf.CheckLibWithHeader('lua', 'lua.h', 'C'): | ||||||
| 		print "lua library not found. Exiting" | 		print "lua library not found. Exiting" | ||||||
| 		Exit(-1) | 		Exit(-1) | ||||||
| @ -118,7 +117,6 @@ if sys.platform == 'darwin':	#Mac OS X | |||||||
| 		print "luabind library not found. Exiting" | 		print "luabind library not found. Exiting" | ||||||
| 		Exit(-1) | 		Exit(-1) | ||||||
| 
 | 
 | ||||||
| 
 |  | ||||||
| elif sys.platform.startswith("freebsd"): | elif sys.platform.startswith("freebsd"): | ||||||
| 	env.ParseConfig('pkg-config --cflags --libs protobuf') | 	env.ParseConfig('pkg-config --cflags --libs protobuf') | ||||||
| 	env.Append(CPPPATH = ['/usr/local/include', '/usr/local/include/libxml2']) | 	env.Append(CPPPATH = ['/usr/local/include', '/usr/local/include/libxml2']) | ||||||
| @ -141,11 +139,10 @@ else: | |||||||
| 	if not conf.CheckLibWithHeader('pthread', 'pthread.h', 'CXX'): | 	if not conf.CheckLibWithHeader('pthread', 'pthread.h', 'CXX'): | ||||||
| 		print "pthread not found. Exiting" | 		print "pthread not found. Exiting" | ||||||
| 		Exit(-1) | 		Exit(-1) | ||||||
| 	if not conf.CheckLibWithHeader('zip', 'zip.h', 'CXX'): |  | ||||||
| 		print "zip library not found. Exiting" |  | ||||||
| 		Exit(-1) |  | ||||||
| 	 | 	 | ||||||
| 	env.ParseConfig('pkg-config --cflags --libs lua5.1') | 	if not conf.CheckLibWithHeader('luajit-5.1', 'luajit-2.0/lua.h', 'CXX'): | ||||||
|  | 		print "luajit library not found. Checking for interpreter" | ||||||
|  | 		env.ParseConfig('pkg-config --cflags --libs lua5.1') | ||||||
| 	env.ParseConfig('pkg-config --cflags --libs luabind') | 	env.ParseConfig('pkg-config --cflags --libs luabind') | ||||||
| 
 | 
 | ||||||
| #Check if architecture optimizations shall be turned off | #Check if architecture optimizations shall be turned off | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user