Skip to content

Commit

Permalink
Revert "attempt linux fix"
Browse files Browse the repository at this point in the history
This reverts commit a348b1c.
  • Loading branch information
jmorton06 committed Jan 19, 2019
1 parent a348b1c commit fe43446
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
13 changes: 10 additions & 3 deletions Lumos/premake5.lua
Original file line number Diff line number Diff line change
Expand Up @@ -178,11 +178,15 @@ project "Lumos"
"MoltenVK"
}

os.copyfile("../Dependencies/vulkan/libs/macOS/libMoltenVK.dylib","../bin")
runpathdirs
{
"../Dependencies/vulkan/libs/macOS/"
}

libdirs
{
"../bin/**"
"../bin/**",
"../Dependencies/vulkan/libs/macOS"
}

buildoptions
Expand Down Expand Up @@ -239,7 +243,10 @@ project "Lumos"
--"../Dependencies/vulkan/libs/linux/libvulkan.so.1"
}

os.copyfile("../Dependencies/vulkan/libs/linux/libvulkan.so.1","../bin")
runpathdirs
{
"../Dependencies/vulkan/libs/linux"
}

linkoptions{ "-Wl,-rpath=\\$$ORIGIN" }

Expand Down
2 changes: 1 addition & 1 deletion premake5.lua
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ workspace "LumosEngine"

outputdir = "%{cfg.buildcfg}-%{cfg.system}-%{cfg.architecture}"

targetdir ("bin/") -- .. outputdir)
targetdir ("bin/" .. outputdir)
objdir ("bin-int/" .. outputdir .. "/%{prj.name}")

require("Dependencies/Box2D/premake5")
Expand Down

0 comments on commit fe43446

Please sign in to comment.