Fixup the premake files

2015-08-29 22:02:02 -05:00
parent 6c83b35003
commit 3d684ac304
18 changed files with 20 additions and 65 deletions
--- 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"
--- 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()
--- 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()

--- 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()
--- 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",
--- 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"})
--- 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")
--- 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",
--- 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")
--- 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({
--- 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({
--- 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()
--- 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()
--- 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({
--- 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"})
--- 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()
--- 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()
--- 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()