From 43d206d2e99ada38804fa68c20def23bdf6e1c3f Mon Sep 17 00:00:00 2001 From: Margen67 Date: Tue, 29 Jul 2025 12:02:49 -0700 Subject: [PATCH] [premake] More cleanup --- premake5.lua | 16 ++++++---------- third_party/aes_128.lua | 3 --- third_party/capstone.lua | 1 - third_party/discord-rpc.lua | 3 --- third_party/dxbc.lua | 3 --- third_party/fmt.lua | 3 --- third_party/glslang-spirv.lua | 3 --- third_party/imgui.lua | 3 --- third_party/libusb.lua | 3 --- third_party/mspack.lua | 1 - third_party/snappy.lua | 3 --- third_party/xxhash.lua | 3 --- third_party/zarchive.lua | 3 --- 13 files changed, 6 insertions(+), 42 deletions(-) diff --git a/premake5.lua b/premake5.lua index be06b9a14..b3be27c32 100644 --- a/premake5.lua +++ b/premake5.lua @@ -32,10 +32,7 @@ defines({ cdialect("C17") cppdialect("C++20") ---exceptionhandling("On") ---rtti("On") symbols("On") ---characterset("Unicode") fatalwarnings("All") -- TODO(DrChat): Find a way to disable this on other architectures. @@ -71,6 +68,9 @@ filter({"configurations:Checked or Debug", "platforms:Linux"}) "_GLIBCXX_DEBUG", -- libstdc++ debug mode }) +filter({"configurations:Checked or Debug", "platforms:Windows"}) + symbols("Full") + filter("configurations:Debug") runtime("Release") optimize("Off") @@ -79,11 +79,6 @@ filter("configurations:Debug") "_NO_DEBUG_HEAP=1", }) ---filter({"configurations:Debug", "platforms:Linux"}) --- defines({ --- "_GLIBCXX_DEBUG", -- make dbg symbols work on some distros --- }) - filter("configurations:Release") runtime("Release") defines({ @@ -91,7 +86,6 @@ filter("configurations:Release") "_NO_DEBUG_HEAP=1", }) optimize("Speed") - symbols("Off") flags({ "NoBufferSecurityCheck" }) @@ -104,9 +98,11 @@ filter("configurations:Release") -- (such as constant propagation) emulation as predictable as possible, -- including handling of specials since games make assumptions about them. +filter({"configurations:Release", "platforms:not Windows"}) + symbols("Off") + filter({"configurations:Release", "platforms:Windows"}) -- "toolset:msc" linktimeoptimization("On") - symbols("On") buildoptions({ "/Gw", "/Ob3", diff --git a/third_party/aes_128.lua b/third_party/aes_128.lua index 6f7a00e5f..fe0e5298e 100644 --- a/third_party/aes_128.lua +++ b/third_party/aes_128.lua @@ -3,9 +3,6 @@ project("aes_128") uuid("b50458bf-dd83-4c1a-8cad-61f5fbbfd720") kind("StaticLib") language("C") - defines({ - "_LIB", - }) includedirs({ "aes_128", }) diff --git a/third_party/capstone.lua b/third_party/capstone.lua index 956c4cf56..b7d922851 100644 --- a/third_party/capstone.lua +++ b/third_party/capstone.lua @@ -7,7 +7,6 @@ project("capstone") "CAPSTONE_X86_ATT_DISABLE", "CAPSTONE_HAS_X86", "CAPSTONE_USE_SYS_DYN_MEM", - "_LIB", }) includedirs({ diff --git a/third_party/discord-rpc.lua b/third_party/discord-rpc.lua index 79d04b8a8..a6b0467c5 100644 --- a/third_party/discord-rpc.lua +++ b/third_party/discord-rpc.lua @@ -3,9 +3,6 @@ project("discord-rpc") uuid("012f6131-efc0-4abd-852d-a33640732d4c") kind("StaticLib") language("C++") - defines({ - "_LIB", - }) includedirs({ "discord-rpc/include", "rapidjson/include" diff --git a/third_party/dxbc.lua b/third_party/dxbc.lua index 63df2ff2f..ed5a262f0 100644 --- a/third_party/dxbc.lua +++ b/third_party/dxbc.lua @@ -3,9 +3,6 @@ project("dxbc") uuid("c96688ca-51ca-406e-aeef-068734a67abe") kind("StaticLib") language("C++") - defines({ - "_LIB", - }) includedirs({ "dxbc", }) diff --git a/third_party/fmt.lua b/third_party/fmt.lua index ff1c46dd6..1be2a91bf 100644 --- a/third_party/fmt.lua +++ b/third_party/fmt.lua @@ -3,9 +3,6 @@ project("fmt") uuid("b9ff4b2c-b438-42a9-971e-e0c19a711a13") kind("StaticLib") language("C++") - defines({ - "_LIB", - }) includedirs({ "fmt/include", diff --git a/third_party/glslang-spirv.lua b/third_party/glslang-spirv.lua index a460fe793..646a83162 100644 --- a/third_party/glslang-spirv.lua +++ b/third_party/glslang-spirv.lua @@ -3,9 +3,6 @@ project("glslang-spirv") uuid("1cc8f45e-91e2-4daf-a55e-666bf8b5e6b2") kind("StaticLib") language("C++") - defines({ - "_LIB", - }) files({ "glslang/SPIRV/bitutils.h", diff --git a/third_party/imgui.lua b/third_party/imgui.lua index 6f046dc90..314b83f32 100644 --- a/third_party/imgui.lua +++ b/third_party/imgui.lua @@ -3,9 +3,6 @@ project("imgui") uuid("ed9271c4-b0a1-42ef-8403-067b11bf49d0") kind("StaticLib") language("C++") - defines({ - "_LIB", - }) includedirs({ "imgui", }) diff --git a/third_party/libusb.lua b/third_party/libusb.lua index c38165723..42b773012 100644 --- a/third_party/libusb.lua +++ b/third_party/libusb.lua @@ -3,9 +3,6 @@ project("libusb") uuid("5f8b5485-fde5-4a42-8a13-8545fcf6d25b") kind("StaticLib") language("C") - defines({ - "_LIB", - }) includedirs({"libusb/libusb/"}) files({ diff --git a/third_party/mspack.lua b/third_party/mspack.lua index ac43fc480..5f057361c 100644 --- a/third_party/mspack.lua +++ b/third_party/mspack.lua @@ -7,7 +7,6 @@ project("mspack") "xenia-base", }) defines({ - "_LIB", "HAVE_CONFIG_H", }) includedirs({ diff --git a/third_party/snappy.lua b/third_party/snappy.lua index 36a7a18c3..2d338362b 100644 --- a/third_party/snappy.lua +++ b/third_party/snappy.lua @@ -4,9 +4,6 @@ project("snappy") kind("StaticLib") language("C++") - defines({ - "_LIB", - }) files({ "snappy/snappy-internal.h", "snappy/snappy-sinksource.cc", diff --git a/third_party/xxhash.lua b/third_party/xxhash.lua index 4c097f882..e763ac2b2 100644 --- a/third_party/xxhash.lua +++ b/third_party/xxhash.lua @@ -3,9 +3,6 @@ project("xxhash") uuid("40d4ce21-5448-4399-9f98-589b7e1c23b1") kind("StaticLib") language("C") - defines({ - "_LIB", - }) includedirs({ "xxhash", }) diff --git a/third_party/zarchive.lua b/third_party/zarchive.lua index 4aa9ec820..7856bd81f 100644 --- a/third_party/zarchive.lua +++ b/third_party/zarchive.lua @@ -6,9 +6,6 @@ project("zarchive") links({ "zstd", }) - defines({ - "_LIB", - }) includedirs({ "zarchive/include", "zstd/lib",