From d8c94b1aee873a1cd0ab97406095009f60dbcc96 Mon Sep 17 00:00:00 2001 From: "chss95cs@gmail.com" Date: Sat, 8 Oct 2022 10:10:36 -0700 Subject: [PATCH] Fix premake filter mistake that broke debug builds (and likely any build other than release) --- src/xenia/cpu/premake5.lua | 11 ++++++----- src/xenia/ui/d3d12/premake5.lua | 1 + src/xenia/ui/vulkan/premake5.lua | 1 + src/xenia/vfs/premake5.lua | 2 ++ third_party/capstone.lua | 2 ++ third_party/fmt.lua | 2 ++ third_party/glslang-spirv.lua | 2 ++ third_party/imgui.lua | 1 + 8 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/xenia/cpu/premake5.lua b/src/xenia/cpu/premake5.lua index d1291d198..c689ff8d3 100644 --- a/src/xenia/cpu/premake5.lua +++ b/src/xenia/cpu/premake5.lua @@ -10,11 +10,7 @@ project("xenia-cpu") "xenia-base", "mspack", }) - filter({"configurations:Release", "platforms:Windows"}) - buildoptions({ - "/Os", - "/O1" - }) + includedirs({ project_root.."/third_party/llvm/include", }) @@ -27,3 +23,8 @@ project("xenia-cpu") include("testing") include("ppc/testing") +filter({"configurations:Release", "platforms:Windows"}) +buildoptions({ + "/Os", + "/O1" +}) \ No newline at end of file diff --git a/src/xenia/ui/d3d12/premake5.lua b/src/xenia/ui/d3d12/premake5.lua index ecde1c1f3..c650b1b0f 100644 --- a/src/xenia/ui/d3d12/premake5.lua +++ b/src/xenia/ui/d3d12/premake5.lua @@ -15,6 +15,7 @@ project("xenia-ui-d3d12") "/Os", "/O1" }) + filter {} local_platform_files() files({ "../shaders/bytecode/d3d12_5_1/*.h", diff --git a/src/xenia/ui/vulkan/premake5.lua b/src/xenia/ui/vulkan/premake5.lua index cbe4e26f0..f732bcf24 100644 --- a/src/xenia/ui/vulkan/premake5.lua +++ b/src/xenia/ui/vulkan/premake5.lua @@ -15,6 +15,7 @@ project("xenia-ui-vulkan") "/Os", "/O1" }) + filter {} includedirs({ project_root.."/third_party/Vulkan-Headers/include", }) diff --git a/src/xenia/vfs/premake5.lua b/src/xenia/vfs/premake5.lua index 9cd71842d..be9d5d45a 100644 --- a/src/xenia/vfs/premake5.lua +++ b/src/xenia/vfs/premake5.lua @@ -16,6 +16,8 @@ project("xenia-vfs") "/Os", "/O1" }) + filter {} + recursive_platform_files() removefiles({"vfs_dump.cc"}) diff --git a/third_party/capstone.lua b/third_party/capstone.lua index b5c4d0107..62bd4e028 100644 --- a/third_party/capstone.lua +++ b/third_party/capstone.lua @@ -16,6 +16,8 @@ project("capstone") "/Os", "/O1" }) + filter {} + includedirs({ "capstone", "capstone/include", diff --git a/third_party/fmt.lua b/third_party/fmt.lua index 394e34800..5aa8bad70 100644 --- a/third_party/fmt.lua +++ b/third_party/fmt.lua @@ -13,6 +13,8 @@ project("fmt") "/Os", "/O1" }) + filter {} + includedirs({ "fmt/include", }) diff --git a/third_party/glslang-spirv.lua b/third_party/glslang-spirv.lua index c5f00a584..d3b1d40d9 100644 --- a/third_party/glslang-spirv.lua +++ b/third_party/glslang-spirv.lua @@ -15,6 +15,8 @@ project("glslang-spirv") "/Os", "/O1" }) + filter {} + files({ "glslang/SPIRV/bitutils.h", "glslang/SPIRV/disassemble.cpp", diff --git a/third_party/imgui.lua b/third_party/imgui.lua index 99c14b9a5..780212dd8 100644 --- a/third_party/imgui.lua +++ b/third_party/imgui.lua @@ -16,6 +16,7 @@ project("imgui") "/Os", "/O1" }) + filter{} files({ "imgui/imconfig.h", "imgui/imgui.cpp",