diff options
| author | withmorten <morten.with@gmail.com> | 2021-07-03 01:59:02 +0200 |
|---|---|---|
| committer | withmorten <morten.with@gmail.com> | 2021-07-03 02:40:25 +0200 |
| commit | be6e273930345cc693699a34ec6a5b33154fe70e (patch) | |
| tree | 996d51fab25599f5463509bdbb6c571bc77288e0 | |
| parent | disable PED_SKIN and PEDS_REPORT_CRIMES_ON_PHONE when COMPATIBLE_SAVES is disabled (diff) | |
| download | re3-be6e273930345cc693699a34ec6a5b33154fe70e.tar re3-be6e273930345cc693699a34ec6a5b33154fe70e.tar.gz re3-be6e273930345cc693699a34ec6a5b33154fe70e.tar.bz2 re3-be6e273930345cc693699a34ec6a5b33154fe70e.tar.lz re3-be6e273930345cc693699a34ec6a5b33154fe70e.tar.xz re3-be6e273930345cc693699a34ec6a5b33154fe70e.tar.zst re3-be6e273930345cc693699a34ec6a5b33154fe70e.zip | |
| -rw-r--r-- | .github/workflows/re3_msvc_amd64.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/re3_msvc_x86.yml | 2 | ||||
| -rw-r--r-- | premake5.lua | 15 |
3 files changed, 14 insertions, 5 deletions
diff --git a/.github/workflows/re3_msvc_amd64.yml b/.github/workflows/re3_msvc_amd64.yml index 29ad024c..428da540 100644 --- a/.github/workflows/re3_msvc_amd64.yml +++ b/.github/workflows/re3_msvc_amd64.yml @@ -34,7 +34,7 @@ jobs: 7z x ${{env.GLFW_FILE}} - name: Configure build run: | - ./premake5 vs2019 --with-librw --glfwdir64=${{env.GLFW_BASE}} + ./premake5 vs2019 --with-librw --no-full-paths --glfwdir64=${{env.GLFW_BASE}} - name: Build run: | msbuild -m build/re3.sln /property:Configuration=${{matrix.buildtype}} /property:Platform=${{matrix.platform}} diff --git a/.github/workflows/re3_msvc_x86.yml b/.github/workflows/re3_msvc_x86.yml index 087b0d19..87f0e430 100644 --- a/.github/workflows/re3_msvc_x86.yml +++ b/.github/workflows/re3_msvc_x86.yml @@ -34,7 +34,7 @@ jobs: 7z x ${{env.GLFW_FILE}} - name: Configure build run: | - ./premake5 vs2019 --with-librw --glfwdir32=${{env.GLFW_BASE}} + ./premake5 vs2019 --with-librw --no-full-paths --glfwdir32=${{env.GLFW_BASE}} - name: Build run: | msbuild -m build/re3.sln /property:Configuration=${{matrix.buildtype}} /property:Platform=${{matrix.platform}} diff --git a/premake5.lua b/premake5.lua index 7fc21907..cce2c7ac 100644 --- a/premake5.lua +++ b/premake5.lua @@ -28,13 +28,18 @@ newoption { }
newoption {
+ trigger = "with-lto",
+ description = "Build with link time optimization"
+}
+
+newoption {
trigger = "no-git-hash",
description = "Don't print git commit hash into binary"
}
newoption {
- trigger = "lto",
- description = "Use link time optimization"
+ trigger = "no-full-paths",
+ description = "Don't print full paths into binary"
}
if(_OPTIONS["with-librw"]) then
@@ -114,7 +119,7 @@ workspace "re3" filter "configurations:not Debug"
defines { "NDEBUG" }
optimize "Speed"
- if(_OPTIONS["lto"]) then
+ if(_OPTIONS["with-lto"]) then
flags { "LinkTimeOptimization" }
end
@@ -327,6 +332,10 @@ project "re3" linkoptions "/SAFESEH:NO"
characterset ("MBCS")
targetextension ".exe"
+ if(_OPTIONS["no-full-paths"]) then
+ usefullpaths "off"
+ linkoptions "/PDBALTPATH:%_PDB%"
+ end
if(_OPTIONS["with-librw"]) then
-- external librw is dynamic
staticruntime "on"
|