Folding build_tools back into the main repo for simplicity.

2015-12-30 16:52:49 -08:00
parent 214532a3e8
commit 952d35911c
47 changed files with 6903 additions and 82 deletions
--- a/src/xenia/app/premake5.lua
+++ b/src/xenia/app/premake5.lua
@@ -1,5 +1,5 @@
 project_root = "../../.."
-include(project_root.."/build_tools")
+include(project_root.."/tools/build")

 group("src")
 project("xenia-app")
@@ -32,7 +32,7 @@ project("xenia-app")
  defines({
  })
  includedirs({
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
  })
  local_platform_files()
  files({
--- a/src/xenia/apu/nop/premake5.lua
+++ b/src/xenia/apu/nop/premake5.lua
@@ -1,5 +1,5 @@
 project_root = "../../../.."
-include(project_root.."/build_tools")
+include(project_root.."/tools/build")

 group("src")
 project("xenia-apu-nop")
@@ -13,6 +13,6 @@ project("xenia-apu-nop")
  defines({
  })
  includedirs({
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
  })
  local_platform_files()
--- a/src/xenia/apu/premake5.lua
+++ b/src/xenia/apu/premake5.lua
@@ -1,5 +1,5 @@
 project_root = "../../.."
-include(project_root.."/build_tools")
+include(project_root.."/tools/build")

 group("src")
 project("xenia-apu")
@@ -14,7 +14,7 @@ project("xenia-apu")
  defines({
  })
  includedirs({
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
    project_root.."/third_party/libav/",
  })
  local_platform_files()
--- a/src/xenia/apu/xaudio2/premake5.lua
+++ b/src/xenia/apu/xaudio2/premake5.lua
@@ -1,5 +1,5 @@
 project_root = "../../../.."
-include(project_root.."/build_tools")
+include(project_root.."/tools/build")

 group("src")
 project("xenia-apu-xaudio2")
@@ -13,6 +13,6 @@ project("xenia-apu-xaudio2")
  defines({
  })
  includedirs({
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
  })
  local_platform_files()
--- a/src/xenia/base/premake5.lua
+++ b/src/xenia/base/premake5.lua
@@ -1,5 +1,5 @@
 project_root = "../../.."
-include(project_root.."/build_tools")
+include(project_root.."/tools/build")

 project("xenia-base")
  uuid("aeadaf22-2b20-4941-b05f-a802d5679c11")
@@ -8,7 +8,7 @@ project("xenia-base")
  defines({
  })
  includedirs({
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/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.."/third_party/gflags/src",
  },
  links = {
    "xenia-base",
--- a/src/xenia/cpu/backend/x64/premake5.lua
+++ b/src/xenia/cpu/backend/x64/premake5.lua
@@ -1,5 +1,5 @@
 project_root = "../../../../.."
-include(project_root.."/build_tools")
+include(project_root.."/tools/build")

 group("src")
 project("xenia-cpu-backend-x64")
@@ -21,6 +21,6 @@ project("xenia-cpu-backend-x64")
  })
  includedirs({
    project_root.."/third_party/capstone/include",
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
  })
  local_platform_files()
--- a/src/xenia/cpu/ppc/testing/instr_divdu.s
+++ b/src/xenia/cpu/ppc/testing/instr_divdu.s
@@ -178,6 +178,6 @@ test_divdu_11:
  #_ REGISTER_IN r3 0xFFFFFFFF
  divdu. r0, r0, r3
  blr
-  #_ REGISTER_OUT r0 0xFFFFFFFF
+  #_ REGISTER_OUT r0 0
  #_ REGISTER_OUT r3 0xFFFFFFFF
  #_ REGISTER_OUT cr 0x0000000020000000
--- a/src/xenia/cpu/ppc/testing/premake5.lua
+++ b/src/xenia/cpu/ppc/testing/premake5.lua
@@ -1,5 +1,5 @@
 project_root = "../../../../.."
-include(project_root.."/build_tools")
+include(project_root.."/tools/build")

 group("tests")
 project("xenia-cpu-ppc-tests")
@@ -25,7 +25,7 @@ project("xenia-cpu-ppc-tests")
    "*.s",
  })
  includedirs({
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
  })
  filter("files:*.s")
    flags({"ExcludeFromBuild"})
--- a/src/xenia/cpu/premake5.lua
+++ b/src/xenia/cpu/premake5.lua
@@ -1,5 +1,5 @@
 project_root = "../../.."
-include(project_root.."/build_tools")
+include(project_root.."/tools/build")

 group("src")
 project("xenia-cpu")
@@ -11,7 +11,7 @@ project("xenia-cpu")
  })
  includedirs({
    project_root.."/third_party/llvm/include",
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/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
@@ -1,9 +1,9 @@
 project_root = "../../../.."
-include(project_root.."/build_tools")
+include(project_root.."/tools/build")

 test_suite("xenia-cpu-tests", project_root, ".", {
  includedirs = {
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
  },
  links = {
    "xenia-base",
--- a/src/xenia/debug/premake5.lua
+++ b/src/xenia/debug/premake5.lua
@@ -1,5 +1,5 @@
 project_root = "../../.."
-include(project_root.."/build_tools")
+include(project_root.."/tools/build")

 group("src")
 project("xenia-debug")
@@ -13,6 +13,6 @@ project("xenia-debug")
  defines({
  })
  includedirs({
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
  })
  local_platform_files()
--- a/src/xenia/debug/ui/premake5.lua
+++ b/src/xenia/debug/ui/premake5.lua
@@ -1,5 +1,5 @@
 project_root = "../../../.."
-include(project_root.."/build_tools")
+include(project_root.."/tools/build")

 group("src")
 project("xenia-debug-ui")
@@ -20,6 +20,6 @@ project("xenia-debug-ui")
    "GLEW_MX=1",
  })
  includedirs({
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
  })
  local_platform_files()
--- a/src/xenia/gpu/gl4/premake5.lua
+++ b/src/xenia/gpu/gl4/premake5.lua
@@ -1,5 +1,5 @@
 project_root = "../../../.."
-include(project_root.."/build_tools")
+include(project_root.."/tools/build")

 group("src")
 project("xenia-gpu-gl4")
@@ -19,7 +19,7 @@ project("xenia-gpu-gl4")
    "GLEW_MX=1",
  })
  includedirs({
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
  })
  local_platform_files()

@@ -59,7 +59,7 @@ project("xenia-gpu-gl4-trace-viewer")
    "GLEW_MX=1",
  })
  includedirs({
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
  })
  files({
    "gl4_trace_viewer_main.cc",
@@ -110,7 +110,7 @@ project("xenia-gpu-gl4-trace-dump")
    "GLEW_MX=1",
  })
  includedirs({
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
  })
  files({
    "gl4_trace_dump_main.cc",
--- a/src/xenia/gpu/premake5.lua
+++ b/src/xenia/gpu/premake5.lua
@@ -1,5 +1,5 @@
 project_root = "../../.."
-include(project_root.."/build_tools")
+include(project_root.."/tools/build")

 group("src")
 project("xenia-gpu")
@@ -18,7 +18,7 @@ project("xenia-gpu")
  })
  includedirs({
    project_root.."/third_party/spirv-tools/external/include",
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
  })
  local_platform_files()

@@ -37,7 +37,7 @@ project("xenia-gpu-shader-compiler")
  defines({
  })
  includedirs({
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
  })
  files({
    "shader_compiler_main.cc",
--- a/src/xenia/hid/nop/premake5.lua
+++ b/src/xenia/hid/nop/premake5.lua
@@ -1,5 +1,5 @@
 project_root = "../../../.."
-include(project_root.."/build_tools")
+include(project_root.."/tools/build")

 group("src")
 project("xenia-hid-nop")
@@ -13,6 +13,6 @@ project("xenia-hid-nop")
  defines({
  })
  includedirs({
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
  })
  local_platform_files()
--- a/src/xenia/hid/premake5.lua
+++ b/src/xenia/hid/premake5.lua
@@ -1,5 +1,5 @@
 project_root = "../../.."
-include(project_root.."/build_tools")
+include(project_root.."/tools/build")

 group("src")
 project("xenia-hid")
@@ -12,7 +12,7 @@ project("xenia-hid")
  defines({
  })
  includedirs({
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
  })
  local_platform_files()
  removefiles({"*_demo.cc"})
@@ -40,7 +40,7 @@ project("xenia-hid-demo")
    "GLEW_MX=1",
  })
  includedirs({
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
  })
  files({
    "hid_demo.cc",
--- a/src/xenia/hid/winkey/premake5.lua
+++ b/src/xenia/hid/winkey/premake5.lua
@@ -1,5 +1,5 @@
 project_root = "../../../.."
-include(project_root.."/build_tools")
+include(project_root.."/tools/build")

 group("src")
 project("xenia-hid-winkey")
@@ -14,6 +14,6 @@ project("xenia-hid-winkey")
  defines({
  })
  includedirs({
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
  })
  local_platform_files()
--- a/src/xenia/hid/xinput/premake5.lua
+++ b/src/xenia/hid/xinput/premake5.lua
@@ -1,5 +1,5 @@
 project_root = "../../../.."
-include(project_root.."/build_tools")
+include(project_root.."/tools/build")

 group("src")
 project("xenia-hid-xinput")
@@ -13,6 +13,6 @@ project("xenia-hid-xinput")
  defines({
  })
  includedirs({
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
  })
  local_platform_files()
--- a/src/xenia/kernel/premake5.lua
+++ b/src/xenia/kernel/premake5.lua
@@ -1,5 +1,5 @@
 project_root = "../../.."
-include(project_root.."/build_tools")
+include(project_root.."/tools/build")

 group("src")
 project("xenia-kernel")
@@ -18,7 +18,7 @@ project("xenia-kernel")
  defines({
  })
  includedirs({
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
  })
  recursive_platform_files()
  files({
--- a/src/xenia/premake5.lua
+++ b/src/xenia/premake5.lua
@@ -1,5 +1,5 @@
 project_root = "../.."
-include(project_root.."/build_tools")
+include(project_root.."/tools/build")

 group("src")
 project("xenia-core")
@@ -12,6 +12,6 @@ project("xenia-core")
  defines({
  })
  includedirs({
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
  })
  files({"*.h", "*.cc"})
--- a/src/xenia/ui/gl/premake5.lua
+++ b/src/xenia/ui/gl/premake5.lua
@@ -1,5 +1,5 @@
 project_root = "../../../.."
-include(project_root.."/build_tools")
+include(project_root.."/tools/build")

 group("src")
 project("xenia-ui-gl")
@@ -16,7 +16,7 @@ project("xenia-ui-gl")
    "GLEW_MX=1",
  })
  includedirs({
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
  })
  local_platform_files()
  removefiles({"*_demo.cc"})
@@ -42,7 +42,7 @@ project("xenia-ui-window-gl-demo")
    "GLEW_MX=1",
  })
  includedirs({
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
  })
  files({
    "../window_demo.cc",
--- a/src/xenia/ui/premake5.lua
+++ b/src/xenia/ui/premake5.lua
@@ -1,5 +1,5 @@
 project_root = "../../.."
-include(project_root.."/build_tools")
+include(project_root.."/tools/build")

 group("src")
 project("xenia-ui")
@@ -12,7 +12,7 @@ project("xenia-ui")
  defines({
  })
  includedirs({
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
  })
  local_platform_files()
  removefiles({"*_demo.cc"})
--- a/src/xenia/ui/spirv/premake5.lua
+++ b/src/xenia/ui/spirv/premake5.lua
@@ -1,5 +1,5 @@
 project_root = "../../../.."
-include(project_root.."/build_tools")
+include(project_root.."/tools/build")

 group("src")
 project("xenia-ui-spirv")
@@ -13,7 +13,7 @@ project("xenia-ui-spirv")
  defines({
  })
  includedirs({
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
    project_root.."/third_party/spirv-tools/external/include",
  })
  local_platform_files()
--- a/src/xenia/vfs/premake5.lua
+++ b/src/xenia/vfs/premake5.lua
@@ -1,5 +1,5 @@
 project_root = "../../.."
-include(project_root.."/build_tools")
+include(project_root.."/tools/build")

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