diff --git a/scripts/shader-embeded.mk b/scripts/shader-embeded.mk index 0112b64f5..023d1dc21 100644 --- a/scripts/shader-embeded.mk +++ b/scripts/shader-embeded.mk @@ -36,8 +36,8 @@ vs_%.bin.h : vs_%.sc -@cat $(SHADER_TMP) >> $(@) -$(SILENT) $(SHADERC) $(VS_FLAGS) --platform ios -p metal -O 3 -f $(<) -o $(SHADER_TMP) --bin2c $(basename $(<))_mtl -@cat $(SHADER_TMP) >> $(@) - -@echo extern const uint8_t* $(basename $(<))_pssl;>> $(@) - -@echo extern const uint32_t $(basename $(<))_pssl_size;>> $(@) + -@printf "extern const uint8_t* $(basename $(<))_pssl;\n" | tr -d '\015' >> $(@) + -@printf "extern const uint32_t $(basename $(<))_pssl_size;\n" | tr -d '\015' >> $(@) fs_%.bin.h : fs_%.sc @echo [$(<)] @@ -53,8 +53,8 @@ fs_%.bin.h : fs_%.sc -@cat $(SHADER_TMP) >> $(@) -$(SILENT) $(SHADERC) $(FS_FLAGS) --platform ios -p metal -O 3 -f $(<) -o $(SHADER_TMP) --bin2c $(basename $(<))_mtl -@cat $(SHADER_TMP) >> $(@) - -@echo extern const uint8_t* $(basename $(<))_pssl;>> $(@) - -@echo extern const uint32_t $(basename $(<))_pssl_size;>> $(@) + -@printf "extern const uint8_t* $(basename $(<))_pssl;\n" | tr -d '\015' >> $(@) + -@printf "extern const uint32_t $(basename $(<))_pssl_size;\n" | tr -d '\015' >> $(@) cs_%.bin.h : cs_%.sc @echo [$(<)] @@ -66,8 +66,8 @@ cs_%.bin.h : cs_%.sc # -@cat $(SHADER_TMP) >> $(@) -$(SILENT) $(SHADERC) $(CS_FLAGS) --platform windows -p cs_5_0 -O 1 -f $(<) -o $(SHADER_TMP) --bin2c $(basename $(<))_dx11 -@cat $(SHADER_TMP) >> $(@) - -@echo extern const uint8_t* $(basename $(<))_pssl;>> $(@) - -@echo extern const uint32_t $(basename $(<))_pssl_size;>> $(@) + -@printf "extern const uint8_t* $(basename $(<))_pssl;\n" | tr -d '\015' >> $(@) + -@printf "extern const uint32_t $(basename $(<))_pssl_size;\n" | tr -d '\015' >> $(@) .PHONY: all all: $(BIN) diff --git a/src/makefile b/src/makefile index 853eb8e21..94216b7cf 100644 --- a/src/makefile +++ b/src/makefile @@ -37,8 +37,8 @@ define shader-embedded -@cat $(SHADER_TMP) >> $(@) -$(SILENT) $(SHADERC) --type $(1) --platform ios -p metal -O 3 -f $(<) -o $(SHADER_TMP) --bin2c $(basename $(<))_mtl -@cat $(SHADER_TMP) >> $(@) - -@echo extern const uint8_t* $(basename $(<))_pssl;>> $(@) - -@echo extern const uint32_t $(basename $(<))_pssl_size;>> $(@) + -@printf "extern const uint8_t* $(basename $(<))_pssl;\n" | tr -d '\015' >> $(@) + -@printf "extern const uint32_t $(basename $(<))_pssl_size;\n" | tr -d '\015' >> $(@) endef vs_debugfont.bin.h : vs_debugfont.sc