Add gflags to projects that need it only

This commit is contained in:
Dr. Chat 2015-08-22 11:10:16 -05:00
parent b7203c2989
commit f2b2a22687
23 changed files with 45 additions and 11 deletions

View File

@ -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")

View File

@ -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.

View File

@ -13,5 +13,6 @@ project("xenia-apu-nop")
defines({
})
includedirs({
project_root.."/build_tools/third_party/gflags/src",
})
local_platform_files()

View File

@ -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()

View File

@ -12,5 +12,6 @@ project("xenia-apu-xaudio2")
defines({
})
includedirs({
project_root.."/build_tools/third_party/gflags/src",
})
local_platform_files()

View File

@ -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",

View File

@ -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()

View File

@ -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")

View File

@ -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")

View File

@ -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",

View File

@ -13,6 +13,7 @@ project("xenia-debug")
defines({
})
includedirs({
project_root.."/build_tools/third_party/gflags/src",
})
local_platform_files()
recursive_platform_files("proto")

View File

@ -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)

View File

@ -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)

View File

@ -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()

View File

@ -13,5 +13,6 @@ project("xenia-hid-nop")
defines({
})
includedirs({
project_root.."/build_tools/third_party/gflags/src",
})
local_platform_files()

View File

@ -12,5 +12,6 @@ project("xenia-hid")
defines({
})
includedirs({
project_root.."/build_tools/third_party/gflags/src",
})
local_platform_files()

View File

@ -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()

View File

@ -13,5 +13,6 @@ project("xenia-hid-xinput")
defines({
})
includedirs({
project_root.."/build_tools/third_party/gflags/src",
})
local_platform_files()

View File

@ -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({

View File

@ -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"})

View File

@ -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()

View File

@ -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()

View File

@ -12,5 +12,6 @@ project("xenia-vfs")
defines({
})
includedirs({
project_root.."/build_tools/third_party/gflags/src",
})
recursive_platform_files()