From a3774fbca92186bf4058dc431f1bb81fdcc23c0a Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Thu, 9 Jan 2020 21:15:33 -0400 Subject: [PATCH] Fix build error from incorrect include paths --HG-- branch : minor --- platform/xcode/liblove.xcodeproj/project.pbxproj | 3 --- src/libraries/glslang/SPIRV/GlslangToSpv.h | 2 +- src/libraries/glslang/SPIRV/SpvTools.h | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/platform/xcode/liblove.xcodeproj/project.pbxproj b/platform/xcode/liblove.xcodeproj/project.pbxproj index 9441dfb89..79bc992f1 100644 --- a/platform/xcode/liblove.xcodeproj/project.pbxproj +++ b/platform/xcode/liblove.xcodeproj/project.pbxproj @@ -5158,7 +5158,6 @@ "\"$(SRCROOT)/../../src/libraries\"", "\"$(SRCROOT)/../../src/modules\"", "\"$(SRCROOT)/../../src/libraries/enet/libenet/include\"", - "\"$(SRCROOT)/../../src/libraries/glslang\"", ); IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "@rpath"; @@ -5225,7 +5224,6 @@ "\"$(SRCROOT)/../../src/libraries\"", "\"$(SRCROOT)/../../src/modules\"", "\"$(SRCROOT)/../../src/libraries/enet/libenet/include\"", - "\"$(SRCROOT)/../../src/libraries/glslang\"", ); IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "@rpath"; @@ -5412,7 +5410,6 @@ "\"$(SRCROOT)/../../src/libraries\"", "\"$(SRCROOT)/../../src/modules\"", "\"$(SRCROOT)/../../src/libraries/enet/libenet/include\"", - "\"$(SRCROOT)/../../src/libraries/glslang\"", ); IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "@rpath"; diff --git a/src/libraries/glslang/SPIRV/GlslangToSpv.h b/src/libraries/glslang/SPIRV/GlslangToSpv.h index 3907be43b..86e1c23bf 100755 --- a/src/libraries/glslang/SPIRV/GlslangToSpv.h +++ b/src/libraries/glslang/SPIRV/GlslangToSpv.h @@ -40,7 +40,7 @@ #endif #include "SpvTools.h" -#include "glslang/Include/intermediate.h" +#include "../glslang/Include/intermediate.h" #include #include diff --git a/src/libraries/glslang/SPIRV/SpvTools.h b/src/libraries/glslang/SPIRV/SpvTools.h index 59c914da0..7422d0126 100644 --- a/src/libraries/glslang/SPIRV/SpvTools.h +++ b/src/libraries/glslang/SPIRV/SpvTools.h @@ -46,7 +46,7 @@ #include #endif -#include "glslang/MachineIndependent/localintermediate.h" +#include "../glslang/MachineIndependent/localintermediate.h" #include "Logger.h" namespace glslang {