mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-12 09:40:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10196 from orbea/deps2

Browse Source 
Fix the header paths with the system glslang.
This commit is contained in:
Twinaphex 2020-03-02 23:38:52 +01:00 committed by GitHub
commit ae21ebddc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.common
View File

@ -1524,16 +1524,17 @@ ifeq ($(HAVE_BUILTINGLSLANG), 1)
GLSLANG_PLATFORM := Unix GLSLANG_PLATFORM := Unix
endif endif
DEFINES += -DHAVE_BUILTINGLSLANG
INCLUDE_DIRS += \ INCLUDE_DIRS += \
-I$(DEPS_DIR)/glslang/glslang/glslang/OSDependent/$(GLSLANG_PLATFORM) \ -I$(DEPS_DIR)/glslang/glslang/glslang/OSDependent/$(GLSLANG_PLATFORM) \
-I$(DEPS_DIR)/glslang/glslang/OGLCompilersDLL \ -I$(DEPS_DIR)/glslang/glslang/OGLCompilersDLL \
-I$(DEPS_DIR)/glslang/glslang \
-I$(DEPS_DIR)/glslang/glslang/glslang/MachineIndependent \ -I$(DEPS_DIR)/glslang/glslang/glslang/MachineIndependent \
-I$(DEPS_DIR)/glslang/glslang/glslang/Public \ -I$(DEPS_DIR)/glslang/glslang/glslang/Public \
-I$(DEPS_DIR)/glslang/glslang/SPIRV -I$(DEPS_DIR)/glslang/glslang/SPIRV
GLSLANG_SOURCES := \ GLSLANG_SOURCES := \
$(wildcard $(DEPS_DIR)/glslang/*.cpp) \ gfx/drivers_shader/glslang.cpp \
$(wildcard $(DEPS_DIR)/glslang/glslang/SPIRV/*.cpp) \ $(wildcard $(DEPS_DIR)/glslang/glslang/SPIRV/*.cpp) \
$(wildcard $(DEPS_DIR)/glslang/glslang/glslang/GenericCodeGen/*.cpp) \ $(wildcard $(DEPS_DIR)/glslang/glslang/glslang/GenericCodeGen/*.cpp) \
$(wildcard $(DEPS_DIR)/glslang/glslang/OGLCompilersDLL/*.cpp) \ $(wildcard $(DEPS_DIR)/glslang/glslang/OGLCompilersDLL/*.cpp) \
@ -1547,7 +1548,7 @@ ifeq ($(HAVE_BUILTINGLSLANG), 1)
endif endif
else ifeq ($(HAVE_GLSLANG),1) else ifeq ($(HAVE_GLSLANG),1)
HAVE_GLSLANG_COMMON = 1 HAVE_GLSLANG_COMMON = 1
GLSLANG_SOURCES := $(DEPS_DIR)/glslang/glslang.cpp GLSLANG_SOURCES := gfx/drivers_shader/glslang.cpp
# The order of these libs are somewhat specific # The order of these libs are somewhat specific
LIBS += $(GLSLANG_LIBS) \ LIBS += $(GLSLANG_LIBS) \
@ -1561,7 +1562,6 @@ endif
ifeq ($(HAVE_GLSLANG_COMMON), 1) ifeq ($(HAVE_GLSLANG_COMMON), 1)
DEFINES += -DHAVE_GLSLANG DEFINES += -DHAVE_GLSLANG
INCLUDE_DIRS += -I$(DEPS_DIR)/glslang
OBJ += $(GLSLANG_SOURCES:.cpp=.o) OBJ += $(GLSLANG_SOURCES:.cpp=.o)
endif endif

4
deps/glslang/glslang.cpp → gfx/drivers_shader/glslang.cpp
View File

@ -16,8 +16,8 @@
#include "glslang.hpp" #include "glslang.hpp"
#ifdef HAVE_BUILTINGLSLANG #ifdef HAVE_BUILTINGLSLANG
#include "glslang/glslang/Public/ShaderLang.h" #include "ShaderLang.h"
#include "glslang/SPIRV/GlslangToSpv.h" #include "GlslangToSpv.h"
#elif HAVE_GLSLANG #elif HAVE_GLSLANG
#include <glslang/Public/ShaderLang.h> #include <glslang/Public/ShaderLang.h>
#include <glslang/SPIRV/GlslangToSpv.h> #include <glslang/SPIRV/GlslangToSpv.h>

0
deps/glslang/glslang.hpp → gfx/drivers_shader/glslang.hpp
View File

2
gfx/drivers_shader/glslang_util_cxx.cpp
View File

@ -32,7 +32,7 @@
#include "glslang_util.h" #include "glslang_util.h"
#include "glslang_util_cxx.h" #include "glslang_util_cxx.h"
#if defined(HAVE_GLSLANG) #if defined(HAVE_GLSLANG)
#include <glslang.hpp> #include "glslang.hpp"
#endif #endif
#include "../../verbosity.h" #include "../../verbosity.h"

2
menu/cbs/menu_cbs_title.c
View File

@ -24,7 +24,7 @@
#include "../../retroarch.h" #include "../../retroarch.h"
#include "../../configuration.h" #include "../../configuration.h"
#include "../managers/core_option_manager.h" #include "../../managers/core_option_manager.h"
#ifndef BIND_ACTION_GET_TITLE #ifndef BIND_ACTION_GET_TITLE
#define BIND_ACTION_GET_TITLE(cbs, name) \ #define BIND_ACTION_GET_TITLE(cbs, name) \