Merge pull request #825 from MAnyKey/linux-port-5

add linux64 lua, rewrite linkDir in genie config, compile engine.so
nem0 · Apr 23, 2016 · 4b5805f · 4b5805f
2 parents 73c7d60 + 6e83f1b
commit 4b5805f
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 24 deletions.
diff --git a/external/lua/lib/linux64_gmake/debug/liblua.a b/external/lua/lib/linux64_gmake/debug/liblua.a
diff --git a/external/lua/lib/linux64_gmake/release/liblua.a b/external/lua/lib/linux64_gmake/release/liblua.a
diff --git a/projects/genie.lua b/projects/genie.lua
@@ -101,32 +101,30 @@ function defaultConfigurations()
 
 	configuration "not windows"
 		buildoptions { "-std=c++11" }
+		linkoptions { "-lpthread" }
 
 	configuration {}
 		files { "lumix.natvis" }
 
 end
 
-function linkLib(lib)
-	links {lib}
-
-	configuration { "x64", "Debug" }
-		libdirs {"../external/" .. lib .. "/lib/win64_" .. ide_dir .. "/debug"}
+function linkLibWithPlatform(lib, platform_bit, platform, conf)
+	configuration { "x" .. platform_bit, conf }
+		libdirs {"../external/" .. lib .. "/lib/" .. platform .. platform_bit .. "_" .. ide_dir .. "/" .. conf}
 
-	configuration { "x64", "Release" }
-		libdirs {"../external/" .. lib .. "/lib/win64_" .. ide_dir .. "/release"}
-
-	configuration { "x64", "RelWithDebInfo" }
-		libdirs {"../external/" .. lib .. "/lib/win64_" .. ide_dir .. "/release"}
-
-	configuration { "x32", "Debug" }
-		libdirs {"../external/" .. lib .. "/lib/win32_" .. ide_dir .. "/debug"}
+end
 
-	configuration { "x32", "Release" }
-		libdirs {"../external/" .. lib .. "/lib/win32_" .. ide_dir .. "/release"}
+function linkLib(lib)
+	links {lib}
 
-	configuration { "x32", "RelWithDebInfo" }
-		libdirs {"../external/" .. lib .. "/lib/win32_" .. ide_dir .. "/release"}
+	for _,platform_bit in ipairs({"32", "64"}) do
+		for conf,conf_dir in pairs({Debug="debug", Release="release", RelWithDebInfo="release"}) do
+			for platform,target_platform in pairs({win="windows", linux="linux"}) do
+				configuration { "x" .. platform_bit, conf, target_platform }
+					libdirs {"../external/" .. lib .. "/lib/" .. platform .. platform_bit .. "_" .. ide_dir .. "/" .. conf_dir}
+			end
+		end
+	end
 
 	configuration {}
 end
@@ -213,10 +211,11 @@ project "engine"
 
 	defines { "BUILDING_ENGINE" }
 	includedirs { "../external/lua/include" }
-	if not _OPTIONS["static-plugins"] then
-		linkoptions {"/DEF:\"../../../src/engine/engine.def\""}
-	end
 
+	configuration "windows"
+		if not _OPTIONS["static-plugins"] then
+			linkoptions {"/DEF:\"../../../src/engine/engine.def\""}
+		end
 	configuration "not macosx"
 		excludes { "../src/engine/**/osx/*"}
 	configuration "not windows"

diff --git a/src/engine/core/mt/thread.h b/src/engine/core/mt/thread.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "engine/lumix.h"
 
 namespace Lumix
 {

diff --git a/src/engine/core/mtjd/manager.cpp b/src/engine/core/mtjd/manager.cpp
@@ -200,11 +200,7 @@ struct ManagerImpl : public Manager
 
 	uint32 getAffinityMask(uint32) const
 	{
-#if defined(_WIN32) || defined(_WIN64)
 		return MT::getProccessAffinityMask();
-#else
-#error "Not Supported!"
-#endif
 	}
 
 	IAllocator&			m_allocator;