From 3785d5e60d1c37042eea5d171d2e39e41fd5f7da Mon Sep 17 00:00:00 2001 From: bkaradzic Date: Sat, 16 Nov 2013 20:14:06 -0800 Subject: [PATCH] Changed compile order when building embedded shaders. --- premake/shader-embeded.mk | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/premake/shader-embeded.mk b/premake/shader-embeded.mk index 617c11eab..d6e292308 100644 --- a/premake/shader-embeded.mk +++ b/premake/shader-embeded.mk @@ -24,21 +24,21 @@ SHADER_TMP = $(TEMP)/tmp vs_%.bin.h : vs_%.sc @echo [$(<)] - $(SILENT) $(SHADERC) $(VS_FLAGS) --platform windows -p vs_3_0 -O 3 -f $(<) -o $(SHADER_TMP) --bin2c $(basename $(<))_dx9 - @cat $(SHADER_TMP) > $(@) - $(SILENT) $(SHADERC) $(VS_FLAGS) --platform windows -p vs_4_0 -O 3 -f $(<) -o $(SHADER_TMP) --bin2c $(basename $(<))_dx11 - @cat $(SHADER_TMP) >> $(@) $(SILENT) $(SHADERC) $(VS_FLAGS) --platform linux -f $(<) -o $(SHADER_TMP) --bin2c $(basename $(<))_glsl - @cat $(SHADER_TMP) >> $(@) + @cat $(SHADER_TMP) > $(@) + -$(SILENT) $(SHADERC) $(VS_FLAGS) --platform windows -p vs_3_0 -O 3 -f $(<) -o $(SHADER_TMP) --bin2c $(basename $(<))_dx9 + -@cat $(SHADER_TMP) >> $(@) + -$(SILENT) $(SHADERC) $(VS_FLAGS) --platform windows -p vs_4_0 -O 3 -f $(<) -o $(SHADER_TMP) --bin2c $(basename $(<))_dx11 + -@cat $(SHADER_TMP) >> $(@) fs_%.bin.h : fs_%.sc @echo [$(<)] - $(SILENT) $(SHADERC) $(FS_FLAGS) --platform windows -p ps_3_0 -O 3 -f $(<) -o $(SHADER_TMP) --bin2c $(basename $(<))_dx9 - @cat $(SHADER_TMP) > $(@) - $(SILENT) $(SHADERC) $(FS_FLAGS) --platform windows -p ps_4_0 -O 3 -f $(<) -o $(SHADER_TMP) --bin2c $(basename $(<))_dx11 - @cat $(SHADER_TMP) >> $(@) $(SILENT) $(SHADERC) $(FS_FLAGS) --platform linux -f $(<) -o $(SHADER_TMP) --bin2c $(basename $(<))_glsl - @cat $(SHADER_TMP) >> $(@) + @cat $(SHADER_TMP) > $(@) + -$(SILENT) $(SHADERC) $(FS_FLAGS) --platform windows -p ps_3_0 -O 3 -f $(<) -o $(SHADER_TMP) --bin2c $(basename $(<))_dx9 + -@cat $(SHADER_TMP) >> $(@) + -$(SILENT) $(SHADERC) $(FS_FLAGS) --platform windows -p ps_4_0 -O 3 -f $(<) -o $(SHADER_TMP) --bin2c $(basename $(<))_dx11 + -@cat $(SHADER_TMP) >> $(@) .PHONY: all all: $(BIN)