From 3d684ac304b75bcbee775885db5e2ceff7db9b7c Mon Sep 17 00:00:00 2001 From: "Dr. Chat" Date: Sat, 29 Aug 2015 22:02:02 -0500 Subject: [PATCH] Fixup the premake files --- src/xenia/app/premake5.lua | 17 +---------------- src/xenia/apu/nop/premake5.lua | 2 +- src/xenia/apu/premake5.lua | 2 +- src/xenia/apu/xaudio2/premake5.lua | 2 +- src/xenia/base/premake5.lua | 4 ++-- src/xenia/cpu/frontend/testing/premake5.lua | 2 +- src/xenia/cpu/premake5.lua | 2 +- src/xenia/cpu/testing/premake5.lua | 2 +- src/xenia/debug/premake5.lua | 2 +- src/xenia/debug/ui/premake5.lua | 17 +---------------- src/xenia/gpu/gl4/premake5.lua | 19 ++----------------- src/xenia/gpu/premake5.lua | 2 +- src/xenia/hid/premake5.lua | 2 +- src/xenia/kernel/premake5.lua | 2 +- src/xenia/premake5.lua | 2 +- src/xenia/ui/gl/premake5.lua | 2 +- src/xenia/ui/premake5.lua | 2 +- src/xenia/vfs/premake5.lua | 2 +- 18 files changed, 20 insertions(+), 65 deletions(-) diff --git a/src/xenia/app/premake5.lua b/src/xenia/app/premake5.lua index 7fb8001bc..a7746755e 100644 --- a/src/xenia/app/premake5.lua +++ b/src/xenia/app/premake5.lua @@ -32,7 +32,7 @@ project("xenia-app") }) includedirs({ 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() files({ @@ -54,21 +54,6 @@ project("xenia-app") "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") -- Only create the .user file if it doesn't already exist. local user_file = project_root.."/build/xenia-app.vcxproj.user" diff --git a/src/xenia/apu/nop/premake5.lua b/src/xenia/apu/nop/premake5.lua index b11bdacc5..276404fb1 100644 --- a/src/xenia/apu/nop/premake5.lua +++ b/src/xenia/apu/nop/premake5.lua @@ -13,6 +13,6 @@ project("xenia-apu-nop") defines({ }) includedirs({ - project_root.."/build_tools/third_party/gflags/src", + 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 8fa1b6d42..647bf02d6 100644 --- a/src/xenia/apu/premake5.lua +++ b/src/xenia/apu/premake5.lua @@ -15,7 +15,7 @@ project("xenia-apu") }) includedirs({ 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() diff --git a/src/xenia/apu/xaudio2/premake5.lua b/src/xenia/apu/xaudio2/premake5.lua index 8eb33a010..466268609 100644 --- a/src/xenia/apu/xaudio2/premake5.lua +++ b/src/xenia/apu/xaudio2/premake5.lua @@ -12,6 +12,6 @@ project("xenia-apu-xaudio2") defines({ }) includedirs({ - project_root.."/build_tools/third_party/gflags/src", + 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 0499fc945..21ed7720e 100644 --- a/src/xenia/base/premake5.lua +++ b/src/xenia/base/premake5.lua @@ -8,7 +8,7 @@ project("xenia-base") defines({ }) includedirs({ - project_root.."/build_tools/third_party/gflags/src", + project_root.."/build_tools/third_party/gflags/src", }) local_platform_files() removefiles({"main_*.cc"}) @@ -18,7 +18,7 @@ project("xenia-base") test_suite("xenia-base-tests", project_root, ".", { includedirs = { - project_root.."/build_tools/third_party/gflags/src", + project_root.."/build_tools/third_party/gflags/src", }, links = { "xenia-base", diff --git a/src/xenia/cpu/frontend/testing/premake5.lua b/src/xenia/cpu/frontend/testing/premake5.lua index ffb8f38e1..74f0a39fc 100644 --- a/src/xenia/cpu/frontend/testing/premake5.lua +++ b/src/xenia/cpu/frontend/testing/premake5.lua @@ -25,7 +25,7 @@ project("xenia-cpu-frontend-tests") "*.s", }) includedirs({ - project_root.."/build_tools/third_party/gflags/src", + project_root.."/build_tools/third_party/gflags/src", }) filter("files:*.s") flags({"ExcludeFromBuild"}) diff --git a/src/xenia/cpu/premake5.lua b/src/xenia/cpu/premake5.lua index d92540557..15f6a00a2 100644 --- a/src/xenia/cpu/premake5.lua +++ b/src/xenia/cpu/premake5.lua @@ -11,7 +11,7 @@ project("xenia-cpu") }) includedirs({ 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("backend") diff --git a/src/xenia/cpu/testing/premake5.lua b/src/xenia/cpu/testing/premake5.lua index 796b51064..fa3df2df2 100644 --- a/src/xenia/cpu/testing/premake5.lua +++ b/src/xenia/cpu/testing/premake5.lua @@ -3,7 +3,7 @@ include(project_root.."/build_tools") test_suite("xenia-cpu-tests", project_root, ".", { includedirs = { - project_root.."/build_tools/third_party/gflags/src", + 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 8f8403580..ad6670fc5 100644 --- a/src/xenia/debug/premake5.lua +++ b/src/xenia/debug/premake5.lua @@ -13,7 +13,7 @@ project("xenia-debug") defines({ }) includedirs({ - project_root.."/build_tools/third_party/gflags/src", + 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 a3d845bef..e7f24d51c 100644 --- a/src/xenia/debug/ui/premake5.lua +++ b/src/xenia/debug/ui/premake5.lua @@ -34,7 +34,7 @@ project("xenia-debug-ui") }) includedirs({ 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() files({ @@ -49,21 +49,6 @@ project("xenia-debug-ui") 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") debugdir(project_root) debugargs({ diff --git a/src/xenia/gpu/gl4/premake5.lua b/src/xenia/gpu/gl4/premake5.lua index d21887d88..435e3542f 100644 --- a/src/xenia/gpu/gl4/premake5.lua +++ b/src/xenia/gpu/gl4/premake5.lua @@ -21,7 +21,7 @@ project("xenia-gpu-gl4") }) includedirs({ 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() @@ -63,28 +63,13 @@ project("xenia-gpu-gl4-trace-viewer") }) includedirs({ project_root.."/third_party/elemental-forms/src", - project_root.."/build_tools/third_party/gflags/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({ - 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") debugdir(project_root) debugargs({ diff --git a/src/xenia/gpu/premake5.lua b/src/xenia/gpu/premake5.lua index dc1d339f1..521a04869 100644 --- a/src/xenia/gpu/premake5.lua +++ b/src/xenia/gpu/premake5.lua @@ -16,6 +16,6 @@ project("xenia-gpu") }) includedirs({ 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() diff --git a/src/xenia/hid/premake5.lua b/src/xenia/hid/premake5.lua index 54052f94d..4904d9efd 100644 --- a/src/xenia/hid/premake5.lua +++ b/src/xenia/hid/premake5.lua @@ -12,6 +12,6 @@ project("xenia-hid") defines({ }) includedirs({ - project_root.."/build_tools/third_party/gflags/src", + 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 89141bf4b..e26ea9ccb 100644 --- a/src/xenia/kernel/premake5.lua +++ b/src/xenia/kernel/premake5.lua @@ -20,7 +20,7 @@ project("xenia-kernel") }) includedirs({ 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() files({ diff --git a/src/xenia/premake5.lua b/src/xenia/premake5.lua index 4834319c9..f5d11a6fc 100644 --- a/src/xenia/premake5.lua +++ b/src/xenia/premake5.lua @@ -14,6 +14,6 @@ project("xenia-core") }) includedirs({ 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"}) diff --git a/src/xenia/ui/gl/premake5.lua b/src/xenia/ui/gl/premake5.lua index 346f7ade0..dab3c9a42 100644 --- a/src/xenia/ui/gl/premake5.lua +++ b/src/xenia/ui/gl/premake5.lua @@ -18,6 +18,6 @@ project("xenia-ui-gl") }) includedirs({ 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() diff --git a/src/xenia/ui/premake5.lua b/src/xenia/ui/premake5.lua index 119458987..43697e222 100644 --- a/src/xenia/ui/premake5.lua +++ b/src/xenia/ui/premake5.lua @@ -14,6 +14,6 @@ project("xenia-ui") }) includedirs({ 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() diff --git a/src/xenia/vfs/premake5.lua b/src/xenia/vfs/premake5.lua index 9a5b2b03c..dc2331f56 100644 --- a/src/xenia/vfs/premake5.lua +++ b/src/xenia/vfs/premake5.lua @@ -12,6 +12,6 @@ project("xenia-vfs") defines({ }) includedirs({ - project_root.."/build_tools/third_party/gflags/src", + project_root.."/build_tools/third_party/gflags/src", }) recursive_platform_files()