Skip to content

Commit

Permalink
Make Ubuntu builds able to find shared library
Browse files Browse the repository at this point in the history
If I did this correctly it'll make it so the built executable can find shared libraries in its lib directory, so it should work as-is when downloaded.
I'll almost certainly screw it up tho lol

Also converts some tabs to spaces that I didn't know were still here
  • Loading branch information
Radfordhound committed Dec 12, 2019
1 parent 3d72e4d commit 4f35f0f
Show file tree
Hide file tree
Showing 4 changed files with 126 additions and 122 deletions.
97 changes: 49 additions & 48 deletions HedgeEdit/premake5.lua
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
project("HedgeEdit")
language("C++")
cppdialect("C++17")
targetdir("bin/%{cfg.platform}/%{cfg.buildcfg}")
kind("WindowedApp")
links("HedgeLib")
language("C++")
cppdialect("C++17")
targetdir("bin/%{cfg.platform}/%{cfg.buildcfg}")
kind("WindowedApp")
links("HedgeLib")
runpathdirs("bin/%{cfg.platform}/%{cfg.buildcfg}")

-- Backend Option
newoption(
{
trigger = "backend",
description = "Which backend HedgeEdit should use for rendering",
default = "auto",
allowed =
{
trigger = "backend",
description = "Which backend HedgeEdit should use for rendering",
default = "auto",
allowed =
{
{ "auto", "Pick automatically based on target platform" },
{ "d3d11", "Direct3D 11" },
{ "d3d11", "Direct3D 11" },
--{ "vk", "Vulkan" }
}
}
})

-- Static or Shared
Expand All @@ -29,7 +30,7 @@ project("HedgeEdit")
-- Platform-Specifics
if Target == "windows" then
defines("NOMINMAX")
files("app.manifest")
files("app.manifest")

-- Auto
if _OPTIONS["backend"] == "auto" then
Expand Down Expand Up @@ -81,40 +82,40 @@ project("HedgeEdit")
premake.error("Unknown backend.")
end
end
-- Dependencies
local deps = GetDepends("depends.lua")
includedirs({ "ui", "../HedgeLib/include" })
files({ "src/**.cpp", "src/**.h", "ui/**.cpp",
"ui/**.h", "ui/**.ui", "ui/**.qrc" })
-- MSC Optimization
filter("toolset:msc")
flags("MultiProcessorCompile")
-- GCC C++ 17 Filesystem support
filter("toolset:gcc or clang")
links("stdc++fs")
-- Dependencies
local deps = GetDepends("depends.lua")
includedirs({ "ui", "../HedgeLib/include" })
files({ "src/**.cpp", "src/**.h", "ui/**.cpp",
"ui/**.h", "ui/**.ui", "ui/**.qrc" })
-- MSC Optimization
filter("toolset:msc")
flags("MultiProcessorCompile")
-- GCC C++ 17 Filesystem support
filter("toolset:gcc or clang")
links("stdc++fs")

-- Debug Configuration
filter("configurations:Debug*")
defines("DEBUG")
symbols("On")
-- Debug Configuration
filter("configurations:Debug*")
defines("DEBUG")
symbols("On")

-- Release Configuration
filter("configurations:Release*")
defines("NDEBUG")
optimize("Speed")
flags("LinkTimeOptimization")
-- x86
filter("platforms:x86")
architecture("x86")
defines("x86")
-- x64
filter("platforms:x64")
architecture("x86_64")
defines("x64")
FinalizeQtDefault(deps.QtDir32, deps.QtDir64)
-- Release Configuration
filter("configurations:Release*")
defines("NDEBUG")
optimize("Speed")
flags("LinkTimeOptimization")
-- x86
filter("platforms:x86")
architecture("x86")
defines("x86")
-- x64
filter("platforms:x64")
architecture("x86_64")
defines("x64")
FinalizeQtDefault(deps.QtDir32, deps.QtDir64)
75 changes: 38 additions & 37 deletions HedgeTools/HedgeArcPack/premake5.lua
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
project("HedgeArcPack")
language("C++")
cppdialect("C++17")
targetdir("bin/%{cfg.platform}/%{cfg.buildcfg}")
kind("ConsoleApp")
links("HedgeLib")

includedirs({ "../../HedgeLib/include" })
language("C++")
cppdialect("C++17")
targetdir("bin/%{cfg.platform}/%{cfg.buildcfg}")
kind("ConsoleApp")
links("HedgeLib")
runpathdirs("bin/%{cfg.platform}/%{cfg.buildcfg}")

includedirs({ "../../HedgeLib/include" })

-- Static or Shared
if LibType == "shared" then
Expand All @@ -14,35 +15,35 @@ project("HedgeArcPack")
postbuildcommands("copy /Y \"$(SolutionDir)HedgeLib\\bin\\$(PlatformTarget)\\$(Configuration)\\HedgeLib.dll\" \"$(TargetDir)HedgeLib.dll\" >NUL")
end
end
-- Platform-Specifics
if Target == "windows" then
defines("NOMINMAX")
end
files({ "src/**.cpp", "src/**.h" })
-- MSC Optimization
filter("toolset:msc")
flags("MultiProcessorCompile")
-- Platform-Specifics
if Target == "windows" then
defines("NOMINMAX")
end
files({ "src/**.cpp", "src/**.h" })
-- MSC Optimization
filter("toolset:msc")
flags("MultiProcessorCompile")

-- Debug Configuration
filter("configurations:Debug*")
defines("DEBUG")
symbols("On")
-- Debug Configuration
filter("configurations:Debug*")
defines("DEBUG")
symbols("On")

-- Release Configuration
filter("configurations:Release*")
defines("NDEBUG")
optimize("Speed")
flags("LinkTimeOptimization")
-- x86
filter("platforms:x86")
architecture("x86")
defines("x86")
-- x64
filter("platforms:x64")
architecture("x86_64")
defines("x64")
-- Release Configuration
filter("configurations:Release*")
defines("NDEBUG")
optimize("Speed")
flags("LinkTimeOptimization")
-- x86
filter("platforms:x86")
architecture("x86")
defines("x86")
-- x64
filter("platforms:x64")
architecture("x86_64")
defines("x64")
75 changes: 38 additions & 37 deletions HedgeTools/HedgeOffsets/premake5.lua
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
project("HedgeOffsets")
language("C++")
cppdialect("C++17")
targetdir("bin/%{cfg.platform}/%{cfg.buildcfg}")
kind("ConsoleApp")
links("HedgeLib")

includedirs({ "../../HedgeLib/include" })
language("C++")
cppdialect("C++17")
targetdir("bin/%{cfg.platform}/%{cfg.buildcfg}")
kind("ConsoleApp")
links("HedgeLib")
runpathdirs("bin/%{cfg.platform}/%{cfg.buildcfg}")

includedirs({ "../../HedgeLib/include" })

-- Static or Shared
if LibType == "shared" then
Expand All @@ -14,35 +15,35 @@ project("HedgeOffsets")
postbuildcommands("copy /Y \"$(SolutionDir)HedgeLib\\bin\\$(PlatformTarget)\\$(Configuration)\\HedgeLib.dll\" \"$(TargetDir)HedgeLib.dll\" >NUL")
end
end
-- Platform-Specifics
if Target == "windows" then
defines("NOMINMAX")
end
files({ "src/**.cpp", "src/**.h" })
-- MSC Optimization
filter("toolset:msc")
flags("MultiProcessorCompile")
-- Platform-Specifics
if Target == "windows" then
defines("NOMINMAX")
end
files({ "src/**.cpp", "src/**.h" })
-- MSC Optimization
filter("toolset:msc")
flags("MultiProcessorCompile")

-- Debug Configuration
filter("configurations:Debug*")
defines("DEBUG")
symbols("On")
-- Debug Configuration
filter("configurations:Debug*")
defines("DEBUG")
symbols("On")

-- Release Configuration
filter("configurations:Release*")
defines("NDEBUG")
optimize("Speed")
flags("LinkTimeOptimization")
-- x86
filter("platforms:x86")
architecture("x86")
defines("x86")
-- x64
filter("platforms:x64")
architecture("x86_64")
defines("x64")
-- Release Configuration
filter("configurations:Release*")
defines("NDEBUG")
optimize("Speed")
flags("LinkTimeOptimization")
-- x86
filter("platforms:x86")
architecture("x86")
defines("x86")
-- x64
filter("platforms:x64")
architecture("x86_64")
defines("x64")
1 change: 1 addition & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ for:
Copy-Item "$dir/HedgeLib/include" -Destination "$dir/HedgeLib/bin/$env:PLATFORM/Release/include" -Recurse
foreach ($project in $projects) {
cp -n "$dir/License.txt" "$dir/$project/bin/$env:PLATFORM/Release/License.txt"
cp -n "$dir/HedgeLib/bin/$env:PLATFORM/Release/libHedgeLib.so" "$dir/$project/bin/$env:PLATFORM/Release/libHedgeLib.so"
}
artifacts:
- path: HedgeLib/bin/$(PLATFORM)/Release
Expand Down

0 comments on commit 4f35f0f

Please sign in to comment.