Remove -Wno-error from glslang files

This commit is contained in:
baldurk
2015-07-12 12:09:32 +02:00
parent 0f54cc550c
commit 97e0697cc2
+5 -11
View File
@@ -12,8 +12,11 @@ OBJDIR=.obj
VPATH=../../../3rdparty
# VPATH above takes care of finding these within the 3rdparty directory
GLSLANG_OBJECTS=glslang/OGLCompilersDLL/InitializeDll.o \
# VPATH above takes care of finding the glslang files within the 3rdparty directory
OBJECTS=spirv_common.o \
spirv_compile.o \
spirv_disassemble.o \
glslang/OGLCompilersDLL/InitializeDll.o \
glslang/SPIRV/GlslangToSpv.o \
glslang/SPIRV/SpvBuilder.o \
glslang/glslang/GenericCodeGen/CodeGen.o \
@@ -45,19 +48,10 @@ glslang/glslang/MachineIndependent/preprocessor/PpSymbols.o \
glslang/glslang/MachineIndependent/preprocessor/PpTokens.o \
glslang/glslang/OSDependent/Linux/ossource.o
OBJECTS=spirv_common.o \
spirv_compile.o \
spirv_disassemble.o \
$(GLSLANG_OBJECTS)
.PHONY: all
all: rdoc_spirv.a
# glslang needs -Wno-error added :(
GLSLANG_OBJDIR_OBJECTS=$(addprefix $(OBJDIR)/, $(GLSLANG_OBJECTS))
$(GLSLANG_OBJDIR_OBJECTS): CPPFLAGS += -Wno-error
$(OBJDIR)/%.o: %.cpp
@mkdir -p $$(dirname $@)
$(CPP) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<