diff --git a/src/xenia/app/discord/premake5.lua b/src/xenia/app/discord/premake5.lua index cd9cf12c5..13e82b5f0 100644 --- a/src/xenia/app/discord/premake5.lua +++ b/src/xenia/app/discord/premake5.lua @@ -9,8 +9,6 @@ project("xenia-app-discord") links({ "discord-rpc" }) - defines({ - }) includedirs({ project_root.."/third_party/discord-rpc/src" }) diff --git a/src/xenia/app/premake5.lua b/src/xenia/app/premake5.lua index 5a1dbf59d..65015953b 100644 --- a/src/xenia/app/premake5.lua +++ b/src/xenia/app/premake5.lua @@ -129,6 +129,4 @@ project("xenia-app") local user_file = project_root.."/build/xenia-app.vcxproj.user" if not os.isfile(user_file) then debugdir(project_root) - debugargs({ - }) end diff --git a/src/xenia/apu/nop/premake5.lua b/src/xenia/apu/nop/premake5.lua index 8c16c8a65..2b5435229 100644 --- a/src/xenia/apu/nop/premake5.lua +++ b/src/xenia/apu/nop/premake5.lua @@ -10,6 +10,4 @@ project("xenia-apu-nop") "xenia-base", "xenia-apu", }) - defines({ - }) local_platform_files() diff --git a/src/xenia/apu/premake5.lua b/src/xenia/apu/premake5.lua index 8f04e7593..4ed3949f1 100644 --- a/src/xenia/apu/premake5.lua +++ b/src/xenia/apu/premake5.lua @@ -12,8 +12,6 @@ project("xenia-apu") "libavformat", "xenia-base", }) - defines({ - }) includedirs({ project_root.."/third_party/FFmpeg/", }) diff --git a/src/xenia/apu/sdl/premake5.lua b/src/xenia/apu/sdl/premake5.lua index 8f0e9ab61..77bf00131 100644 --- a/src/xenia/apu/sdl/premake5.lua +++ b/src/xenia/apu/sdl/premake5.lua @@ -12,7 +12,5 @@ project("xenia-apu-sdl") "xenia-helper-sdl", "SDL2", }) - defines({ - }) local_platform_files() sdl2_include() diff --git a/src/xenia/apu/xaudio2/premake5.lua b/src/xenia/apu/xaudio2/premake5.lua index 9198a9a4a..8444d05b1 100644 --- a/src/xenia/apu/xaudio2/premake5.lua +++ b/src/xenia/apu/xaudio2/premake5.lua @@ -10,6 +10,4 @@ project("xenia-apu-xaudio2") "xenia-base", "xenia-apu", }) - defines({ - }) local_platform_files() diff --git a/src/xenia/base/premake5.lua b/src/xenia/base/premake5.lua index 7edd282a8..1b91d2e98 100644 --- a/src/xenia/base/premake5.lua +++ b/src/xenia/base/premake5.lua @@ -8,8 +8,6 @@ project("xenia-base") links({ "fmt", }) - defines({ - }) local_platform_files() removefiles({"console_app_main_*.cc"}) removefiles({"main_init_*.cc"}) @@ -19,4 +17,4 @@ project("xenia-base") if enableTests then include("testing") -end \ No newline at end of file +end diff --git a/src/xenia/cpu/backend/x64/premake5.lua b/src/xenia/cpu/backend/x64/premake5.lua index f2a990f29..ac9c7f80d 100644 --- a/src/xenia/cpu/backend/x64/premake5.lua +++ b/src/xenia/cpu/backend/x64/premake5.lua @@ -14,8 +14,6 @@ project("xenia-cpu-backend-x64") }) defines({ "CAPSTONE_X86_ATT_DISABLE", - "CAPSTONE_DIET_NO", - "CAPSTONE_X86_REDUCE_NO", "CAPSTONE_HAS_X86", "CAPSTONE_USE_SYS_DYN_MEM", "XBYAK_NO_OP_NAMES", diff --git a/src/xenia/debug/ui/premake5.lua b/src/xenia/debug/ui/premake5.lua index 2afdeabd5..19d48cc2f 100644 --- a/src/xenia/debug/ui/premake5.lua +++ b/src/xenia/debug/ui/premake5.lua @@ -12,13 +12,4 @@ project("xenia-debug-ui") "xenia-cpu", "xenia-ui", }) --- filter({"configurations:Release", "platforms:Windows"}) --- buildoptions({ --- "/O1", --- }) --- filter{} - defines({ - }) - includedirs({ - }) local_platform_files() diff --git a/src/xenia/helper/sdl/premake5.lua b/src/xenia/helper/sdl/premake5.lua index fd13bd5aa..26058f713 100644 --- a/src/xenia/helper/sdl/premake5.lua +++ b/src/xenia/helper/sdl/premake5.lua @@ -9,9 +9,5 @@ project("xenia-helper-sdl") links({ "SDL2", }) - defines({ - }) - includedirs({ - }) local_platform_files() sdl2_include() diff --git a/src/xenia/hid/nop/premake5.lua b/src/xenia/hid/nop/premake5.lua index 53fefaee5..4b83e2573 100644 --- a/src/xenia/hid/nop/premake5.lua +++ b/src/xenia/hid/nop/premake5.lua @@ -10,6 +10,4 @@ project("xenia-hid-nop") "xenia-base", "xenia-hid", }) - defines({ - }) local_platform_files() diff --git a/src/xenia/hid/premake5.lua b/src/xenia/hid/premake5.lua index f1b897702..da3cf2b79 100644 --- a/src/xenia/hid/premake5.lua +++ b/src/xenia/hid/premake5.lua @@ -10,7 +10,5 @@ project("xenia-hid") "xenia-base", "xenia-hid-skylander", }) - defines({ - }) local_platform_files() removefiles({"*_demo.cc"}) diff --git a/src/xenia/hid/sdl/premake5.lua b/src/xenia/hid/sdl/premake5.lua index d29b0b606..15bcf4fca 100644 --- a/src/xenia/hid/sdl/premake5.lua +++ b/src/xenia/hid/sdl/premake5.lua @@ -12,7 +12,5 @@ project("xenia-hid-sdl") "xenia-ui", "SDL2", }) - defines({ - }) local_platform_files() sdl2_include() diff --git a/src/xenia/hid/winkey/premake5.lua b/src/xenia/hid/winkey/premake5.lua index 0e3b86580..819bc8f97 100644 --- a/src/xenia/hid/winkey/premake5.lua +++ b/src/xenia/hid/winkey/premake5.lua @@ -11,6 +11,4 @@ project("xenia-hid-winkey") "xenia-hid", "xenia-ui", }) - defines({ - }) local_platform_files() diff --git a/src/xenia/hid/xinput/premake5.lua b/src/xenia/hid/xinput/premake5.lua index 6247cf98c..d50332af9 100644 --- a/src/xenia/hid/xinput/premake5.lua +++ b/src/xenia/hid/xinput/premake5.lua @@ -10,6 +10,4 @@ project("xenia-hid-xinput") "xenia-base", "xenia-hid", }) - defines({ - }) local_platform_files() diff --git a/src/xenia/patcher/premake5.lua b/src/xenia/patcher/premake5.lua index ac8f255c4..c41265f0b 100644 --- a/src/xenia/patcher/premake5.lua +++ b/src/xenia/patcher/premake5.lua @@ -9,6 +9,4 @@ project("xenia-patcher") links({ "xenia-base" }) - defines({ - }) recursive_platform_files() diff --git a/src/xenia/premake5.lua b/src/xenia/premake5.lua index 4d01ea74e..19a2e9222 100644 --- a/src/xenia/premake5.lua +++ b/src/xenia/premake5.lua @@ -10,6 +10,4 @@ project("xenia-core") "fmt", "xenia-base", }) - defines({ - }) files({"*.h", "*.cc"}) diff --git a/src/xenia/ui/premake5.lua b/src/xenia/ui/premake5.lua index 5c55c8c88..0640045a3 100644 --- a/src/xenia/ui/premake5.lua +++ b/src/xenia/ui/premake5.lua @@ -9,8 +9,6 @@ project("xenia-ui") links({ "xenia-base", }) - defines({ - }) local_platform_files() removefiles({"*_demo.cc"}) removefiles({"windowed_app_main_*.cc"}) @@ -30,4 +28,4 @@ project("xenia-ui") "xcb", "X11", "X11-xcb" - }) \ No newline at end of file + }) diff --git a/src/xenia/vfs/premake5.lua b/src/xenia/vfs/premake5.lua index ee6709c65..f7150abc9 100644 --- a/src/xenia/vfs/premake5.lua +++ b/src/xenia/vfs/premake5.lua @@ -11,8 +11,6 @@ project("xenia-vfs") "zstd", "zarchive" }) - defines({ - }) recursive_platform_files() removefiles({"vfs_dump.cc"}) @@ -27,7 +25,6 @@ if enableMiscSubprojects then "xenia-base", "xenia-vfs", }) - defines({}) files({ "vfs_dump.cc", diff --git a/third_party/SDL2-static.lua b/third_party/SDL2-static.lua index 9e534cd54..3cf513ab3 100644 --- a/third_party/SDL2-static.lua +++ b/third_party/SDL2-static.lua @@ -7,8 +7,8 @@ project("SDL2") defines({ "HAVE_LIBC", - "SDL_LEAN_AND_MEAN=1", - "SDL_RENDER_DISABLED=1" + "SDL_LEAN_AND_MEAN", + "SDL_RENDER_DISABLED", }) links({ "setupapi.lib", @@ -21,7 +21,6 @@ project("SDL2") }) files({ -- 1:1 from SDL2/VisualC/SDL/SDL.vcxproj file - "SDL2/include/begin_code.h", "SDL2/include/close_code.h", "SDL2/include/SDL.h", diff --git a/third_party/capstone.lua b/third_party/capstone.lua index f22713909..956c4cf56 100644 --- a/third_party/capstone.lua +++ b/third_party/capstone.lua @@ -5,17 +5,10 @@ project("capstone") language("C") defines({ "CAPSTONE_X86_ATT_DISABLE", - "CAPSTONE_DIET_NO", - "CAPSTONE_X86_REDUCE_NO", "CAPSTONE_HAS_X86", "CAPSTONE_USE_SYS_DYN_MEM", "_LIB", }) --- filter({"configurations:Release", "platforms:Windows"}) --- buildoptions({ --- "/O1", --- }) --- filter {} includedirs({ "capstone", @@ -49,3 +42,7 @@ project("capstone") "capstone/**.c", "capstone/arch/X86/**.c", }) + removefiles({ + "capstone/arch/X86/X86ATTInstPrinter.c", + "capstone/arch/X86/*reduce.inc", + }) diff --git a/third_party/discord-rpc.lua b/third_party/discord-rpc.lua index 1f6e795f8..79d04b8a8 100644 --- a/third_party/discord-rpc.lua +++ b/third_party/discord-rpc.lua @@ -3,8 +3,6 @@ project("discord-rpc") uuid("012f6131-efc0-4abd-852d-a33640732d4c") kind("StaticLib") language("C++") - links({ - }) defines({ "_LIB", }) @@ -34,4 +32,4 @@ project("discord-rpc") files({ "discord-rpc/src/connection_win.cpp", "discord-rpc/src/discord_register_win.cpp" - }) \ No newline at end of file + }) diff --git a/third_party/dxbc.lua b/third_party/dxbc.lua index c86df4498..63df2ff2f 100644 --- a/third_party/dxbc.lua +++ b/third_party/dxbc.lua @@ -3,8 +3,6 @@ project("dxbc") uuid("c96688ca-51ca-406e-aeef-068734a67abe") kind("StaticLib") language("C++") - links({ - }) defines({ "_LIB", }) diff --git a/third_party/fmt.lua b/third_party/fmt.lua index 5e8ce2d84..ff1c46dd6 100644 --- a/third_party/fmt.lua +++ b/third_party/fmt.lua @@ -3,16 +3,9 @@ project("fmt") uuid("b9ff4b2c-b438-42a9-971e-e0c19a711a13") kind("StaticLib") language("C++") - links({ - }) defines({ "_LIB", }) --- filter({"configurations:Release", "platforms:Windows"}) --- buildoptions({ --- "/O1", --- }) --- filter {} includedirs({ "fmt/include", diff --git a/third_party/glslang-spirv.lua b/third_party/glslang-spirv.lua index 38d8ad7f0..a460fe793 100644 --- a/third_party/glslang-spirv.lua +++ b/third_party/glslang-spirv.lua @@ -3,18 +3,9 @@ project("glslang-spirv") uuid("1cc8f45e-91e2-4daf-a55e-666bf8b5e6b2") kind("StaticLib") language("C++") - links({ - }) defines({ "_LIB", }) - includedirs({ - }) --- filter({"configurations:Release", "platforms:Windows"}) --- buildoptions({ --- "/O1", --- }) --- filter {} files({ "glslang/SPIRV/bitutils.h", diff --git a/third_party/imgui.lua b/third_party/imgui.lua index 253133621..6f046dc90 100644 --- a/third_party/imgui.lua +++ b/third_party/imgui.lua @@ -3,19 +3,12 @@ project("imgui") uuid("ed9271c4-b0a1-42ef-8403-067b11bf49d0") kind("StaticLib") language("C++") - links({ - }) defines({ "_LIB", }) includedirs({ "imgui", }) --- filter({"configurations:Release", "platforms:Windows"}) --- buildoptions({ --- "/O1", --- }) --- filter{} files({ "imgui/imconfig.h", "imgui/imgui.cpp", diff --git a/third_party/mspack.lua b/third_party/mspack.lua index c1d1b44a5..0b4f64e83 100644 --- a/third_party/mspack.lua +++ b/third_party/mspack.lua @@ -27,10 +27,3 @@ project("mspack") "mspack/system.c", "mspack/system.h", }) - - filter("platforms:Windows") - defines({ - }) - filter("platforms:Linux") - defines({ - }) diff --git a/third_party/xxhash.lua b/third_party/xxhash.lua index cc6955c93..4c097f882 100644 --- a/third_party/xxhash.lua +++ b/third_party/xxhash.lua @@ -3,8 +3,6 @@ project("xxhash") uuid("40d4ce21-5448-4399-9f98-589b7e1c23b1") kind("StaticLib") language("C") - links({ - }) defines({ "_LIB", })