From 93c76bf190d843ef77c71682570f28e9fb871a08 Mon Sep 17 00:00:00 2001 From: Tomasz Kramkowski Date: Wed, 28 Mar 2018 13:46:10 +0100 Subject: Remote texture assets can now be included in the project. --- assets.mk | 4 +++- tex/.gitignore | 5 +++++ tex/grass.png.src | 1 + tex/tex.mk | 7 +++++++ tex/wood.png.src | 1 + 5 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 tex/.gitignore create mode 100644 tex/grass.png.src create mode 100644 tex/tex.mk create mode 100644 tex/wood.png.src diff --git a/assets.mk b/assets.mk index cdb2c8a..a4ea512 100644 --- a/assets.mk +++ b/assets.mk @@ -1,4 +1,6 @@ -ASSETS := vert.glsl frag.glsl +include tex/tex.mk + +ASSETS := vert.glsl frag.glsl $(TEX) OBJ += assets.o assets_data.o CLEAN += assets.bie assets.idx diff --git a/tex/.gitignore b/tex/.gitignore new file mode 100644 index 0000000..24f0871 --- /dev/null +++ b/tex/.gitignore @@ -0,0 +1,5 @@ +* +!.gitignore +!fetch.sh +!tex.mk +!*.src diff --git a/tex/grass.png.src b/tex/grass.png.src new file mode 100644 index 0000000..4bb70ef --- /dev/null +++ b/tex/grass.png.src @@ -0,0 +1 @@ +https://opengameart.org/sites/default/files/oga-textures/grass1.png diff --git a/tex/tex.mk b/tex/tex.mk new file mode 100644 index 0000000..d723983 --- /dev/null +++ b/tex/tex.mk @@ -0,0 +1,7 @@ +TEX := wood.png grass.png + +TEX_PATH := $(dir $(lastword $(MAKEFILE_LIST))) +TEX := $(addprefix $(TEX_PATH), $(TEX)) + +%: %.src + curl -o "$@" "$(shell cat $<)" diff --git a/tex/wood.png.src b/tex/wood.png.src new file mode 100644 index 0000000..325453d --- /dev/null +++ b/tex/wood.png.src @@ -0,0 +1 @@ +https://opengameart.org/sites/default/files/oga-textures/wood%20floor%202.png -- cgit v1.2.3-54-g00ecf