From f2b2a22687ad2c5a87cb20e2935ffe020e7fd24d Mon Sep 17 00:00:00 2001 From: "Dr. Chat" Date: Sat, 22 Aug 2015 11:10:16 -0500 Subject: [PATCH] Add gflags to projects that need it only --- premake5.lua | 17 +++++++++-------- src/xenia/app/premake5.lua | 4 ++++ src/xenia/apu/nop/premake5.lua | 1 + src/xenia/apu/premake5.lua | 7 ++++--- src/xenia/apu/xaudio2/premake5.lua | 1 + src/xenia/base/premake5.lua | 2 ++ src/xenia/cpu/backend/x64/premake5.lua | 1 + src/xenia/cpu/frontend/testing/premake5.lua | 3 +++ src/xenia/cpu/premake5.lua | 1 + src/xenia/cpu/testing/premake5.lua | 1 + src/xenia/debug/premake5.lua | 1 + src/xenia/debug/ui/premake5.lua | 3 +++ src/xenia/gpu/gl4/premake5.lua | 4 ++++ src/xenia/gpu/premake5.lua | 1 + src/xenia/hid/nop/premake5.lua | 1 + src/xenia/hid/premake5.lua | 1 + src/xenia/hid/winkey/premake5.lua | 1 + src/xenia/hid/xinput/premake5.lua | 1 + src/xenia/kernel/premake5.lua | 1 + src/xenia/premake5.lua | 1 + src/xenia/ui/gl/premake5.lua | 1 + src/xenia/ui/premake5.lua | 1 + src/xenia/vfs/premake5.lua | 1 + 23 files changed, 45 insertions(+), 11 deletions(-) diff --git a/premake5.lua b/premake5.lua index 75999667d..47ea4af6c 100644 --- a/premake5.lua +++ b/premake5.lua @@ -8,7 +8,6 @@ includedirs({ ".", "src", "third_party", - "build_tools/third_party/gflags/src", }) defines({ @@ -146,6 +145,15 @@ solution("xenia") end configurations({"Checked", "Debug", "Release"}) + -- Include third party files first so they don't have to deal with gflags. + include("third_party/capstone.lua") + include("third_party/elemental-forms") + include("third_party/glew.lua") + include("third_party/imgui.lua") + include("third_party/libav.lua") + include("third_party/xxhash.lua") + include("build_tools/third_party/gflags.lua") + include("src/xenia") include("src/xenia/app") include("src/xenia/apu") @@ -169,10 +177,3 @@ solution("xenia") include("src/xenia/hid/winkey") include("src/xenia/hid/xinput") end - - include("third_party/capstone.lua") - include("third_party/elemental-forms") - include("third_party/glew.lua") - include("third_party/imgui.lua") - include("third_party/xxhash.lua") - include("build_tools/third_party/gflags.lua") diff --git a/src/xenia/app/premake5.lua b/src/xenia/app/premake5.lua index 1de6feb17..7fb8001bc 100644 --- a/src/xenia/app/premake5.lua +++ b/src/xenia/app/premake5.lua @@ -32,6 +32,7 @@ project("xenia-app") }) includedirs({ project_root.."/third_party/elemental-forms/src", + project_root.."/build_tools/third_party/gflags/src", }) local_platform_files() files({ @@ -52,6 +53,8 @@ project("xenia-app") "xenia-hid-winkey", "xenia-hid-xinput", }) + +--[[ filter("configurations:Checked") local libav_root = "../third_party/libav-xma-bin/lib/Debug" linkoptions({ @@ -64,6 +67,7 @@ project("xenia-app") libav_root.."/libavcodec.a", libav_root.."/libavutil.a", }) +]] filter("platforms:Windows") -- Only create the .user file if it doesn't already exist. diff --git a/src/xenia/apu/nop/premake5.lua b/src/xenia/apu/nop/premake5.lua index 068234586..b11bdacc5 100644 --- a/src/xenia/apu/nop/premake5.lua +++ b/src/xenia/apu/nop/premake5.lua @@ -13,5 +13,6 @@ project("xenia-apu-nop") defines({ }) includedirs({ + project_root.."/build_tools/third_party/gflags/src", }) local_platform_files() diff --git a/src/xenia/apu/premake5.lua b/src/xenia/apu/premake5.lua index 68ed44140..8fa1b6d42 100644 --- a/src/xenia/apu/premake5.lua +++ b/src/xenia/apu/premake5.lua @@ -7,14 +7,15 @@ project("xenia-apu") kind("StaticLib") language("C++") links({ - "libavcodec.a", - "libavutil.a", + "libavcodec", + "libavutil", "xenia-base", }) defines({ }) includedirs({ - project_root.."/third_party/libav-xma-bin/include/", + project_root.."/third_party/libav/include/", + project_root.."/build_tools/third_party/gflags/src", }) local_platform_files() diff --git a/src/xenia/apu/xaudio2/premake5.lua b/src/xenia/apu/xaudio2/premake5.lua index 7054e7419..8eb33a010 100644 --- a/src/xenia/apu/xaudio2/premake5.lua +++ b/src/xenia/apu/xaudio2/premake5.lua @@ -12,5 +12,6 @@ project("xenia-apu-xaudio2") defines({ }) includedirs({ + project_root.."/build_tools/third_party/gflags/src", }) local_platform_files() diff --git a/src/xenia/base/premake5.lua b/src/xenia/base/premake5.lua index 155c68613..0499fc945 100644 --- a/src/xenia/base/premake5.lua +++ b/src/xenia/base/premake5.lua @@ -8,6 +8,7 @@ project("xenia-base") defines({ }) includedirs({ + project_root.."/build_tools/third_party/gflags/src", }) local_platform_files() removefiles({"main_*.cc"}) @@ -17,6 +18,7 @@ project("xenia-base") test_suite("xenia-base-tests", project_root, ".", { includedirs = { + project_root.."/build_tools/third_party/gflags/src", }, links = { "xenia-base", diff --git a/src/xenia/cpu/backend/x64/premake5.lua b/src/xenia/cpu/backend/x64/premake5.lua index 795946cc9..1ad85ce55 100644 --- a/src/xenia/cpu/backend/x64/premake5.lua +++ b/src/xenia/cpu/backend/x64/premake5.lua @@ -21,5 +21,6 @@ project("xenia-cpu-backend-x64") }) includedirs({ project_root.."/third_party/capstone/include", + project_root.."/build_tools/third_party/gflags/src", }) local_platform_files() diff --git a/src/xenia/cpu/frontend/testing/premake5.lua b/src/xenia/cpu/frontend/testing/premake5.lua index afce34fba..ffb8f38e1 100644 --- a/src/xenia/cpu/frontend/testing/premake5.lua +++ b/src/xenia/cpu/frontend/testing/premake5.lua @@ -24,6 +24,9 @@ project("xenia-cpu-frontend-tests") files({ "*.s", }) + includedirs({ + project_root.."/build_tools/third_party/gflags/src", + }) filter("files:*.s") flags({"ExcludeFromBuild"}) filter("platforms:Windows") diff --git a/src/xenia/cpu/premake5.lua b/src/xenia/cpu/premake5.lua index 14c731837..d92540557 100644 --- a/src/xenia/cpu/premake5.lua +++ b/src/xenia/cpu/premake5.lua @@ -11,6 +11,7 @@ project("xenia-cpu") }) includedirs({ project_root.."/third_party/llvm/include", + project_root.."/build_tools/third_party/gflags/src", }) local_platform_files() local_platform_files("backend") diff --git a/src/xenia/cpu/testing/premake5.lua b/src/xenia/cpu/testing/premake5.lua index bbef37b84..796b51064 100644 --- a/src/xenia/cpu/testing/premake5.lua +++ b/src/xenia/cpu/testing/premake5.lua @@ -3,6 +3,7 @@ include(project_root.."/build_tools") test_suite("xenia-cpu-tests", project_root, ".", { includedirs = { + project_root.."/build_tools/third_party/gflags/src", }, links = { "xenia-base", diff --git a/src/xenia/debug/premake5.lua b/src/xenia/debug/premake5.lua index 0a2e8da88..8f8403580 100644 --- a/src/xenia/debug/premake5.lua +++ b/src/xenia/debug/premake5.lua @@ -13,6 +13,7 @@ project("xenia-debug") defines({ }) includedirs({ + project_root.."/build_tools/third_party/gflags/src", }) local_platform_files() recursive_platform_files("proto") diff --git a/src/xenia/debug/ui/premake5.lua b/src/xenia/debug/ui/premake5.lua index 508d4ccb8..a3d845bef 100644 --- a/src/xenia/debug/ui/premake5.lua +++ b/src/xenia/debug/ui/premake5.lua @@ -34,6 +34,7 @@ project("xenia-debug-ui") }) includedirs({ project_root.."/third_party/elemental-forms/src", + project_root.."/build_tools/third_party/gflags/src", }) recursive_platform_files() files({ @@ -48,6 +49,7 @@ project("xenia-debug-ui") project_root.."/third_party/elemental-forms", }) +--[[ filter("configurations:Checked") local libav_root = "../third_party/libav-xma-bin/lib/Debug" linkoptions({ @@ -60,6 +62,7 @@ project("xenia-debug-ui") libav_root.."/libavcodec.a", libav_root.."/libavutil.a", }) +]] filter("platforms:Windows") debugdir(project_root) diff --git a/src/xenia/gpu/gl4/premake5.lua b/src/xenia/gpu/gl4/premake5.lua index 643896d3d..d21887d88 100644 --- a/src/xenia/gpu/gl4/premake5.lua +++ b/src/xenia/gpu/gl4/premake5.lua @@ -21,6 +21,7 @@ project("xenia-gpu-gl4") }) includedirs({ project_root.."/third_party/elemental-forms/src", + project_root.."/build_tools/third_party/gflags/src", }) local_platform_files() @@ -62,12 +63,14 @@ project("xenia-gpu-gl4-trace-viewer") }) includedirs({ project_root.."/third_party/elemental-forms/src", + project_root.."/build_tools/third_party/gflags/src", }) files({ "trace_viewer_main.cc", "../../base/main_"..platform_suffix..".cc", }) +--[[ filter("configurations:Checked") local libav_root = "../third_party/libav-xma-bin/lib/Debug" linkoptions({ @@ -80,6 +83,7 @@ project("xenia-gpu-gl4-trace-viewer") libav_root.."/libavcodec.a", libav_root.."/libavutil.a", }) +]] filter("platforms:Windows") debugdir(project_root) diff --git a/src/xenia/gpu/premake5.lua b/src/xenia/gpu/premake5.lua index 66d919f30..dc1d339f1 100644 --- a/src/xenia/gpu/premake5.lua +++ b/src/xenia/gpu/premake5.lua @@ -16,5 +16,6 @@ project("xenia-gpu") }) includedirs({ project_root.."/third_party/elemental-forms/src", + project_root.."/build_tools/third_party/gflags/src", }) local_platform_files() diff --git a/src/xenia/hid/nop/premake5.lua b/src/xenia/hid/nop/premake5.lua index 7fec94cc3..baf417d5f 100644 --- a/src/xenia/hid/nop/premake5.lua +++ b/src/xenia/hid/nop/premake5.lua @@ -13,5 +13,6 @@ project("xenia-hid-nop") defines({ }) includedirs({ + project_root.."/build_tools/third_party/gflags/src", }) local_platform_files() diff --git a/src/xenia/hid/premake5.lua b/src/xenia/hid/premake5.lua index 45f3f7bcd..54052f94d 100644 --- a/src/xenia/hid/premake5.lua +++ b/src/xenia/hid/premake5.lua @@ -12,5 +12,6 @@ project("xenia-hid") defines({ }) includedirs({ + project_root.."/build_tools/third_party/gflags/src", }) local_platform_files() diff --git a/src/xenia/hid/winkey/premake5.lua b/src/xenia/hid/winkey/premake5.lua index b30122d2a..44736b50d 100644 --- a/src/xenia/hid/winkey/premake5.lua +++ b/src/xenia/hid/winkey/premake5.lua @@ -13,6 +13,7 @@ project("xenia-hid-winkey") defines({ }) includedirs({ + project_root.."/build_tools/third_party/gflags/src", project_root.."/third_party/elemental-forms/src", }) local_platform_files() diff --git a/src/xenia/hid/xinput/premake5.lua b/src/xenia/hid/xinput/premake5.lua index adb3f758c..568171b6f 100644 --- a/src/xenia/hid/xinput/premake5.lua +++ b/src/xenia/hid/xinput/premake5.lua @@ -13,5 +13,6 @@ project("xenia-hid-xinput") defines({ }) includedirs({ + project_root.."/build_tools/third_party/gflags/src", }) local_platform_files() diff --git a/src/xenia/kernel/premake5.lua b/src/xenia/kernel/premake5.lua index 509d39a72..89141bf4b 100644 --- a/src/xenia/kernel/premake5.lua +++ b/src/xenia/kernel/premake5.lua @@ -20,6 +20,7 @@ project("xenia-kernel") }) includedirs({ project_root.."/third_party/elemental-forms/src", + project_root.."/build_tools/third_party/gflags/src", }) recursive_platform_files() files({ diff --git a/src/xenia/premake5.lua b/src/xenia/premake5.lua index 9fc178e71..4834319c9 100644 --- a/src/xenia/premake5.lua +++ b/src/xenia/premake5.lua @@ -14,5 +14,6 @@ project("xenia-core") }) includedirs({ project_root.."/third_party/elemental-forms/src", + project_root.."/build_tools/third_party/gflags/src", }) files({"*.h", "*.cc"}) diff --git a/src/xenia/ui/gl/premake5.lua b/src/xenia/ui/gl/premake5.lua index 4d773ce9a..346f7ade0 100644 --- a/src/xenia/ui/gl/premake5.lua +++ b/src/xenia/ui/gl/premake5.lua @@ -18,5 +18,6 @@ project("xenia-ui-gl") }) includedirs({ project_root.."/third_party/elemental-forms/src", + project_root.."/build_tools/third_party/gflags/src", }) local_platform_files() diff --git a/src/xenia/ui/premake5.lua b/src/xenia/ui/premake5.lua index 9e4fed1ae..119458987 100644 --- a/src/xenia/ui/premake5.lua +++ b/src/xenia/ui/premake5.lua @@ -14,5 +14,6 @@ project("xenia-ui") }) includedirs({ project_root.."/third_party/elemental-forms/src", + project_root.."/build_tools/third_party/gflags/src", }) local_platform_files() diff --git a/src/xenia/vfs/premake5.lua b/src/xenia/vfs/premake5.lua index b5659dcf8..9a5b2b03c 100644 --- a/src/xenia/vfs/premake5.lua +++ b/src/xenia/vfs/premake5.lua @@ -12,5 +12,6 @@ project("xenia-vfs") defines({ }) includedirs({ + project_root.."/build_tools/third_party/gflags/src", }) recursive_platform_files()