clang fixes.

venkatarajasekhar · Aug 1, 2015 · 8494ca2 · 8494ca2
1 parent 27944c4
commit 8494ca2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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
diff --git 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.')
+1 −1		src/el/animation_manager.cc
+1 −1		src/el/elements/text_box.cc
+2 −0		src/el/graphics/bitmap_fragment_map.cc
+1 −0		src/el/io/memory_file_system.cc
+1 −1		src/el/io/win32_res_file_system_win.cc
+3 −3		src/el/io/win32_res_file_system_win.h
+10 −10		src/el/list_item.h
+2 −0		src/el/parsing/parse_node.cc
+1 −0		src/el/parsing/parse_node.h
+2 −0		src/el/parsing/text_parser_stream.cc
+1 −4		src/el/text/caret.cc
+1 −0		src/el/text/font_face.cc
+7 −7		src/el/text/text_fragment.cc
+2 −2		src/el/text/text_fragment_content.cc
+1 −1		testbed/testbed_application.cc