Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add linux64 lua, rewrite linkDir in genie config, compile engine.so #825

Merged
merged 1 commit into from
Apr 23, 2016
Merged

add linux64 lua, rewrite linkDir in genie config, compile engine.so #825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added external/lua/lib/linux64_gmake/debug/liblua.a
View file
Open in desktop
Binary file not shown.
Binary file added external/lua/lib/linux64_gmake/release/liblua.a
View file
Open in desktop
Binary file not shown.
39 changes: 19 additions & 20 deletions projects/genie.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions src/engine/core/mt/thread.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#pragma once

#include "engine/lumix.h"

namespace Lumix
{
Expand Down
4 changes: 0 additions & 4 deletions src/engine/core/mtjd/manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down