From f4dae2335c284cc198232c64b1c6ca6731fa2923 Mon Sep 17 00:00:00 2001 From: sephiroth99 Date: Fri, 27 Nov 2015 20:10:20 -0500 Subject: [PATCH 1/3] premake: Small fixes to various premake files In particular, add the "src" group to apu/xaudio2 project, which was missing. --- src/xenia/apu/premake5.lua | 1 - src/xenia/apu/xaudio2/premake5.lua | 1 + src/xenia/hid/xinput/premake5.lua | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/xenia/apu/premake5.lua b/src/xenia/apu/premake5.lua index 6214cea71..13a440bed 100644 --- a/src/xenia/apu/premake5.lua +++ b/src/xenia/apu/premake5.lua @@ -18,4 +18,3 @@ project("xenia-apu") project_root.."/third_party/libav/", }) local_platform_files() - diff --git a/src/xenia/apu/xaudio2/premake5.lua b/src/xenia/apu/xaudio2/premake5.lua index 466268609..44966e265 100644 --- a/src/xenia/apu/xaudio2/premake5.lua +++ b/src/xenia/apu/xaudio2/premake5.lua @@ -1,6 +1,7 @@ project_root = "../../../.." include(project_root.."/build_tools") +group("src") project("xenia-apu-xaudio2") uuid("7a54a497-24d9-4c0e-a013-8507a04231f9") kind("StaticLib") diff --git a/src/xenia/hid/xinput/premake5.lua b/src/xenia/hid/xinput/premake5.lua index 568171b6f..0fcca2319 100644 --- a/src/xenia/hid/xinput/premake5.lua +++ b/src/xenia/hid/xinput/premake5.lua @@ -13,6 +13,6 @@ project("xenia-hid-xinput") defines({ }) includedirs({ - project_root.."/build_tools/third_party/gflags/src", + project_root.."/build_tools/third_party/gflags/src", }) local_platform_files() From b899bde55aa8d989984349eb8df3421621f01911 Mon Sep 17 00:00:00 2001 From: sephiroth99 Date: Sat, 28 Nov 2015 01:25:01 -0500 Subject: [PATCH 2/3] third_party: Use latest libav --- third_party/libav | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/libav b/third_party/libav index 17d2a58db..9919df9eb 160000 --- a/third_party/libav +++ b/third_party/libav @@ -1 +1 @@ -Subproject commit 17d2a58db396a153d8b5e3d262b2a561f7786f12 +Subproject commit 9919df9ebe02baa4f4a8082e82d6807680977f34 From 1b8b1d03502291f39532cb65df4b05d287d2320c Mon Sep 17 00:00:00 2001 From: sephiroth99 Date: Sat, 28 Nov 2015 14:17:08 -0500 Subject: [PATCH 3/3] third_party: Use latest elemental-forms --- third_party/elemental-forms | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/elemental-forms b/third_party/elemental-forms index e4b3316c3..3e7d961fe 160000 --- a/third_party/elemental-forms +++ b/third_party/elemental-forms @@ -1 +1 @@ -Subproject commit e4b3316c360085ced026087e82b0e31aaba57532 +Subproject commit 3e7d961fea8cf8a857292d21106834c8566903f2