Fixup the premake files

This commit is contained in:
Dr. Chat 2015-08-29 22:02:02 -05:00
parent 6c83b35003
commit 3d684ac304
18 changed files with 20 additions and 65 deletions

View File

@ -32,7 +32,7 @@ project("xenia-app")
}) })
includedirs({ includedirs({
project_root.."/third_party/elemental-forms/src", project_root.."/third_party/elemental-forms/src",
project_root.."/build_tools/third_party/gflags/src", project_root.."/build_tools/third_party/gflags/src",
}) })
local_platform_files() local_platform_files()
files({ files({
@ -54,21 +54,6 @@ project("xenia-app")
"xenia-hid-xinput", "xenia-hid-xinput",
}) })
--[[
filter("configurations:Checked")
local libav_root = "../third_party/libav-xma-bin/lib/Debug"
linkoptions({
libav_root.."/libavcodec.a",
libav_root.."/libavutil.a",
})
filter("configurations:Debug or Release")
local libav_root = "../third_party/libav-xma-bin/lib/Release"
linkoptions({
libav_root.."/libavcodec.a",
libav_root.."/libavutil.a",
})
]]
filter("platforms:Windows") filter("platforms:Windows")
-- Only create the .user file if it doesn't already exist. -- Only create the .user file if it doesn't already exist.
local user_file = project_root.."/build/xenia-app.vcxproj.user" local user_file = project_root.."/build/xenia-app.vcxproj.user"

View File

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

View File

@ -15,7 +15,7 @@ project("xenia-apu")
}) })
includedirs({ includedirs({
project_root.."/third_party/libav/include/", project_root.."/third_party/libav/include/",
project_root.."/build_tools/third_party/gflags/src", project_root.."/build_tools/third_party/gflags/src",
}) })
local_platform_files() local_platform_files()

View File

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

View File

@ -8,7 +8,7 @@ project("xenia-base")
defines({ defines({
}) })
includedirs({ includedirs({
project_root.."/build_tools/third_party/gflags/src", project_root.."/build_tools/third_party/gflags/src",
}) })
local_platform_files() local_platform_files()
removefiles({"main_*.cc"}) removefiles({"main_*.cc"})
@ -18,7 +18,7 @@ project("xenia-base")
test_suite("xenia-base-tests", project_root, ".", { test_suite("xenia-base-tests", project_root, ".", {
includedirs = { includedirs = {
project_root.."/build_tools/third_party/gflags/src", project_root.."/build_tools/third_party/gflags/src",
}, },
links = { links = {
"xenia-base", "xenia-base",

View File

@ -25,7 +25,7 @@ project("xenia-cpu-frontend-tests")
"*.s", "*.s",
}) })
includedirs({ includedirs({
project_root.."/build_tools/third_party/gflags/src", project_root.."/build_tools/third_party/gflags/src",
}) })
filter("files:*.s") filter("files:*.s")
flags({"ExcludeFromBuild"}) flags({"ExcludeFromBuild"})

View File

@ -11,7 +11,7 @@ project("xenia-cpu")
}) })
includedirs({ includedirs({
project_root.."/third_party/llvm/include", project_root.."/third_party/llvm/include",
project_root.."/build_tools/third_party/gflags/src", project_root.."/build_tools/third_party/gflags/src",
}) })
local_platform_files() local_platform_files()
local_platform_files("backend") local_platform_files("backend")

View File

@ -3,7 +3,7 @@ include(project_root.."/build_tools")
test_suite("xenia-cpu-tests", project_root, ".", { test_suite("xenia-cpu-tests", project_root, ".", {
includedirs = { includedirs = {
project_root.."/build_tools/third_party/gflags/src", project_root.."/build_tools/third_party/gflags/src",
}, },
links = { links = {
"xenia-base", "xenia-base",

View File

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

View File

@ -34,7 +34,7 @@ project("xenia-debug-ui")
}) })
includedirs({ includedirs({
project_root.."/third_party/elemental-forms/src", project_root.."/third_party/elemental-forms/src",
project_root.."/build_tools/third_party/gflags/src", project_root.."/build_tools/third_party/gflags/src",
}) })
recursive_platform_files() recursive_platform_files()
files({ files({
@ -49,21 +49,6 @@ project("xenia-debug-ui")
project_root.."/third_party/elemental-forms", project_root.."/third_party/elemental-forms",
}) })
--[[
filter("configurations:Checked")
local libav_root = "../third_party/libav-xma-bin/lib/Debug"
linkoptions({
libav_root.."/libavcodec.a",
libav_root.."/libavutil.a",
})
filter("configurations:Debug or Release")
local libav_root = "../third_party/libav-xma-bin/lib/Release"
linkoptions({
libav_root.."/libavcodec.a",
libav_root.."/libavutil.a",
})
]]
filter("platforms:Windows") filter("platforms:Windows")
debugdir(project_root) debugdir(project_root)
debugargs({ debugargs({

View File

@ -21,7 +21,7 @@ project("xenia-gpu-gl4")
}) })
includedirs({ includedirs({
project_root.."/third_party/elemental-forms/src", project_root.."/third_party/elemental-forms/src",
project_root.."/build_tools/third_party/gflags/src", project_root.."/build_tools/third_party/gflags/src",
}) })
local_platform_files() local_platform_files()
@ -63,28 +63,13 @@ project("xenia-gpu-gl4-trace-viewer")
}) })
includedirs({ includedirs({
project_root.."/third_party/elemental-forms/src", project_root.."/third_party/elemental-forms/src",
project_root.."/build_tools/third_party/gflags/src", project_root.."/build_tools/third_party/gflags/src",
}) })
files({ files({
"trace_viewer_main.cc", "trace_viewer_main.cc",
"../../base/main_"..platform_suffix..".cc", "../../base/main_"..platform_suffix..".cc",
}) })
--[[
filter("configurations:Checked")
local libav_root = "../third_party/libav-xma-bin/lib/Debug"
linkoptions({
libav_root.."/libavcodec.a",
libav_root.."/libavutil.a",
})
filter("configurations:Debug or Release")
local libav_root = "../third_party/libav-xma-bin/lib/Release"
linkoptions({
libav_root.."/libavcodec.a",
libav_root.."/libavutil.a",
})
]]
filter("platforms:Windows") filter("platforms:Windows")
debugdir(project_root) debugdir(project_root)
debugargs({ debugargs({

View File

@ -16,6 +16,6 @@ project("xenia-gpu")
}) })
includedirs({ includedirs({
project_root.."/third_party/elemental-forms/src", project_root.."/third_party/elemental-forms/src",
project_root.."/build_tools/third_party/gflags/src", project_root.."/build_tools/third_party/gflags/src",
}) })
local_platform_files() local_platform_files()

View File

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

View File

@ -20,7 +20,7 @@ project("xenia-kernel")
}) })
includedirs({ includedirs({
project_root.."/third_party/elemental-forms/src", project_root.."/third_party/elemental-forms/src",
project_root.."/build_tools/third_party/gflags/src", project_root.."/build_tools/third_party/gflags/src",
}) })
recursive_platform_files() recursive_platform_files()
files({ files({

View File

@ -14,6 +14,6 @@ project("xenia-core")
}) })
includedirs({ includedirs({
project_root.."/third_party/elemental-forms/src", project_root.."/third_party/elemental-forms/src",
project_root.."/build_tools/third_party/gflags/src", project_root.."/build_tools/third_party/gflags/src",
}) })
files({"*.h", "*.cc"}) files({"*.h", "*.cc"})

View File

@ -18,6 +18,6 @@ project("xenia-ui-gl")
}) })
includedirs({ includedirs({
project_root.."/third_party/elemental-forms/src", project_root.."/third_party/elemental-forms/src",
project_root.."/build_tools/third_party/gflags/src", project_root.."/build_tools/third_party/gflags/src",
}) })
local_platform_files() local_platform_files()

View File

@ -14,6 +14,6 @@ project("xenia-ui")
}) })
includedirs({ includedirs({
project_root.."/third_party/elemental-forms/src", project_root.."/third_party/elemental-forms/src",
project_root.."/build_tools/third_party/gflags/src", project_root.."/build_tools/third_party/gflags/src",
}) })
local_platform_files() local_platform_files()

View File

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