From 8494ca2eaa85f433d867699c1510717406579127 Mon Sep 17 00:00:00 2001
From: Ben Vanik <ben.vanik@gmail.com>
Date: Sat, 1 Aug 2015 03:55:50 -0700
Subject: [PATCH] clang fixes.

---
 premake5.lua                | 3 ++-
 src/xenia/ui/window.cc      | 2 +-
 third_party/elemental-forms | 2 +-
 xenia-build                 | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/premake5.lua b/premake5.lua
index dc19e92d9b..51d7683128 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -36,6 +36,7 @@ filter("configurations:Checked")
   })
   flags({"Symbols"})
   runtime("Debug")
+filter("configurations:Checked", "platforms:Windows")
   buildoptions({
     "/RTCsu",   -- Full Run-Time Checks.
   })
@@ -67,7 +68,7 @@ filter("platforms:Linux")
   system("linux")
   toolset("clang")
   buildoptions({
-    "-std=c++11",
+    "-std=c++14",
   })
 
 filter("platforms:Windows")
diff --git a/src/xenia/ui/window.cc b/src/xenia/ui/window.cc
index 0f57f8c1b0..1bffa1a1db 100644
--- a/src/xenia/ui/window.cc
+++ b/src/xenia/ui/window.cc
@@ -14,7 +14,7 @@
 #include "el/elemental_forms.h"
 #include "el/io/file_manager.h"
 #include "el/io/posix_file_system.h"
-#include "el/io/win32_res_file_system.h"
+#include "el/io/win32_res_file_system_win.h"
 #include "el/message_handler.h"
 #include "el/text/font_manager.h"
 #include "el/util/metrics.h"
diff --git a/third_party/elemental-forms b/third_party/elemental-forms
index 1511edbc5a..c0725a31ca 160000
--- a/third_party/elemental-forms
+++ b/third_party/elemental-forms
@@ -1 +1 @@
-Subproject commit 1511edbc5a0512c403dd86db17b49837f9fff7e2
+Subproject commit c0725a31caa3727cbdad03b707ab764ca3a8df15
diff --git a/xenia-build b/xenia-build
index 67749326b5..d1cc67481e 100755
--- a/xenia-build
+++ b/xenia-build
@@ -503,7 +503,7 @@ class BaseBuildCommand(Command):
           'make',
           '-Cbuild/',
           'config=%s_linux' % (args['config']),
-          ] + pass_args, throw_on_error=False)
+          ] + pass_args + args['target'], throw_on_error=False)
     print('')
     if result != 0:
       print('ERROR: build failed with one or more errors.')