From 6da758cdd7d6588d3dd32ed0879852dd6942311d Mon Sep 17 00:00:00 2001
From: Erin Catto <erincatto@users.noreply.github.com>
Date: Thu, 31 May 2018 21:00:15 -0700
Subject: [PATCH] Xcode Fixes

Fix cppdialect=C++11
Fix angle bracket include complaints
---
 binmodules/example/main.c      | 2 +-
 contrib/libzip/zip.h           | 2 +-
 contrib/luashim/luashim.c      | 4 ++--
 contrib/luashim/luashim.h      | 4 ++--
 modules/xcode/xcode_common.lua | 2 +-
 src/host/os_compile.c          | 4 ++--
 src/host/zip_extract.c         | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/binmodules/example/main.c b/binmodules/example/main.c
index 85a2f678..524ab34d 100644
--- a/binmodules/example/main.c
+++ b/binmodules/example/main.c
@@ -1,4 +1,4 @@
-#include <luashim.h>
+#include "luashim.h"
 
 
 static int example_test(lua_State* L)
diff --git a/contrib/libzip/zip.h b/contrib/libzip/zip.h
index 26104bf0..492beaf7 100644
--- a/contrib/libzip/zip.h
+++ b/contrib/libzip/zip.h
@@ -51,7 +51,7 @@
 extern "C" {
 #endif
 
-#include <zipconf.h>
+#include "zipconf.h"
 
 #include <sys/types.h>
 #include <stdio.h>
diff --git a/contrib/luashim/luashim.c b/contrib/luashim/luashim.c
index de929fe4..88dbde09 100644
--- a/contrib/luashim/luashim.c
+++ b/contrib/luashim/luashim.c
@@ -5,7 +5,7 @@
 */
 #include "luashim.h"
 #include <assert.h>
-#include <lstate.h>
+#include "lstate.h"
 
 static const LuaFunctionTable_t* g_shimTable;
 
@@ -858,4 +858,4 @@ void shimInitialize(lua_State* L)
 	assert(g_shimTable != NULL);
 
 	lua_unlock(L);
-}
\ No newline at end of file
+}
diff --git a/contrib/luashim/luashim.h b/contrib/luashim/luashim.h
index 2c28f9e9..18bda586 100644
--- a/contrib/luashim/luashim.h
+++ b/contrib/luashim/luashim.h
@@ -6,8 +6,8 @@
 #ifndef HEADER_luashim_H
 #define HEADER_luashim_H
 
-#include <lua.h>
-#include <lauxlib.h>
+#include "lua.h"
+#include "lauxlib.h"
 
 // premake specific helper methods.
 void luaL_register(lua_State *L, const char *libname, const luaL_Reg *l);
diff --git a/modules/xcode/xcode_common.lua b/modules/xcode/xcode_common.lua
index 92c0f6b0..e9e0b909 100644
--- a/modules/xcode/xcode_common.lua
+++ b/modules/xcode/xcode_common.lua
@@ -1032,7 +1032,7 @@
 	xcode.cppLanguageStandards = {
 		["Default"] = "compiler-default",  -- explicit compiler default
 		["C++98"] = "c++98",
-		["C++11"] = "c++0x",      -- Xcode project GUI uses c++0x, but c++11 also works
+		["C++11"] = "c++11",      -- Xcode project GUI uses c++0x, but c++11 also works
 		["C++14"] = "c++14",
 		["C++17"] = "c++1z",
 		["gnu++98"] = "gnu++98",
diff --git a/src/host/os_compile.c b/src/host/os_compile.c
index ac8c9f58..d35690c8 100644
--- a/src/host/os_compile.c
+++ b/src/host/os_compile.c
@@ -5,8 +5,8 @@
  */
 
 #include "premake.h"
-#include <lundump.h>
-#include <lstate.h>
+#include "lundump.h"
+#include "lstate.h"
 
 extern int original_luaL_loadfilex(lua_State* L, const char* filename, const char* mode);
 
diff --git a/src/host/zip_extract.c b/src/host/zip_extract.c
index 07eb1cee..96b2d59b 100644
--- a/src/host/zip_extract.c
+++ b/src/host/zip_extract.c
@@ -8,7 +8,7 @@
 
 #ifdef PREMAKE_COMPRESSION
 
-#include <zip.h>
+#include "zip.h"
 
 #ifdef WIN32
 #include <direct.h>