Fix gpu example Makefiles for latest picasso

diff --git a/examples/graphics/gpu/Makefile b/examples/graphics/gpu/Makefile
new file mode 100644 (file)
index 0000000..bce05ec
--- /dev/null
+++ b/examples/graphics/gpu/Makefile
@@ -0,0 +1,7 @@
+SUBDIRS:= `ls | egrep -v '^(CVS)$$'`
+all:
+       @for i in $(SUBDIRS); do if test -e $$i/Makefile ; then $(MAKE) -C $$i || { exit 1;} fi; done;
+clean:
+       @for i in $(SUBDIRS); do if test -e $$i/Makefile ; then $(MAKE)  -C $$i clean || { exit 1;} fi; done;
+install:
+       @for i in $(SUBDIRS); do if test -e $$i/Makefile ; then $(MAKE)  -C $$i install || { exit 1;} fi; done;

diff --git a/examples/graphics/gpu/geoshader/Makefile b/examples/graphics/gpu/geoshader/Makefile
index 1e4e9eff2163972751fb36add18bd29c34903016..3b728242d378eaa12a0fb7436e4b835298dc4525 100644 (file)
--- a/examples/graphics/gpu/geoshader/Makefile
+++ b/examples/graphics/gpu/geoshader/Makefile
@@ -164,7 +164,7 @@ $(OUTPUT).elf       :       $(OFILES)
        @echo $(notdir $<)
        $(eval CURBIN := $(patsubst %.pica,%.shbin,$(notdir $<)))
        $(eval CURH := $(patsubst %.pica,%.psh.h,$(notdir $<)))
-       @picasso $(CURBIN) $< $(CURH)
+       @picasso -h $(CURH) -o $(CURBIN) $<
        @bin2s $(CURBIN) | $(AS) -o $@
        @echo "extern const u8" `(echo $(CURBIN) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_end[];" > `(echo $(CURBIN) | tr . _)`.h
        @echo "extern const u8" `(echo $(CURBIN) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"[];" >> `(echo $(CURBIN) | tr . _)`.h

diff --git a/examples/graphics/gpu/simple_tri/Makefile b/examples/graphics/gpu/simple_tri/Makefile
index 1e4e9eff2163972751fb36add18bd29c34903016..3b728242d378eaa12a0fb7436e4b835298dc4525 100644 (file)
--- a/examples/graphics/gpu/simple_tri/Makefile
+++ b/examples/graphics/gpu/simple_tri/Makefile
@@ -164,7 +164,7 @@ $(OUTPUT).elf       :       $(OFILES)
        @echo $(notdir $<)
        $(eval CURBIN := $(patsubst %.pica,%.shbin,$(notdir $<)))
        $(eval CURH := $(patsubst %.pica,%.psh.h,$(notdir $<)))
-       @picasso $(CURBIN) $< $(CURH)
+       @picasso -h $(CURH) -o $(CURBIN) $<
        @bin2s $(CURBIN) | $(AS) -o $@
        @echo "extern const u8" `(echo $(CURBIN) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_end[];" > `(echo $(CURBIN) | tr . _)`.h
        @echo "extern const u8" `(echo $(CURBIN) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"[];" >> `(echo $(CURBIN) | tr . _)`.h

diff --git a/examples/graphics/gpu/textured_cube/Makefile b/examples/graphics/gpu/textured_cube/Makefile
index 1e4e9eff2163972751fb36add18bd29c34903016..3b728242d378eaa12a0fb7436e4b835298dc4525 100644 (file)
--- a/examples/graphics/gpu/textured_cube/Makefile
+++ b/examples/graphics/gpu/textured_cube/Makefile
@@ -164,7 +164,7 @@ $(OUTPUT).elf       :       $(OFILES)
        @echo $(notdir $<)
        $(eval CURBIN := $(patsubst %.pica,%.shbin,$(notdir $<)))
        $(eval CURH := $(patsubst %.pica,%.psh.h,$(notdir $<)))
-       @picasso $(CURBIN) $< $(CURH)
+       @picasso -h $(CURH) -o $(CURBIN) $<
        @bin2s $(CURBIN) | $(AS) -o $@
        @echo "extern const u8" `(echo $(CURBIN) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_end[];" > `(echo $(CURBIN) | tr . _)`.h
        @echo "extern const u8" `(echo $(CURBIN) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"[];" >> `(echo $(CURBIN) | tr . _)`.h