From 666e913831d96c5c077150ae838fb253be4872d4 Mon Sep 17 00:00:00 2001 From: Crayon2000 Date: Wed, 4 Nov 2015 08:53:16 -0500 Subject: [PATCH] In the examples Makefile's: added rule for PNG image. --- examples/3D_CubedTileDemo/Makefile | 8 ++++++++ examples/3D_Light1/Makefile | 8 ++++++++ examples/3D_Light2/Makefile | 8 ++++++++ examples/3D_Light3/Makefile | 8 ++++++++ examples/3D_sample1/Makefile | 8 ++++++++ examples/3D_sample2/Makefile | 8 ++++++++ examples/3D_sample3/Makefile | 8 ++++++++ examples/3D_sample4/Makefile | 8 ++++++++ examples/3D_sample5/Makefile | 8 ++++++++ examples/NEED_GRRLIB_FUNCTION/Makefile | 8 ++++++++ examples/TileDemo/Makefile | 8 ++++++++ examples/bitmap_fx/Makefile | 8 ++++++++ examples/blending/Makefile | 8 ++++++++ examples/blending/source/main.c | 2 -- examples/compositing/Makefile | 8 ++++++++ examples/particle/Makefile | 8 ++++++++ examples/unlimited2d/Makefile | 8 ++++++++ examples/unlimited3d/Makefile | 8 ++++++++ 18 files changed, 136 insertions(+), 2 deletions(-) diff --git a/examples/3D_CubedTileDemo/Makefile b/examples/3D_CubedTileDemo/Makefile index a5ed35e..7e96886 100644 --- a/examples/3D_CubedTileDemo/Makefile +++ b/examples/3D_CubedTileDemo/Makefile @@ -132,6 +132,14 @@ $(OUTPUT).elf: $(OFILES) @echo $(notdir $<) $(bin2o) +#--------------------------------------------------------------------------------- +# This rule links in binary data with the .png extension +#--------------------------------------------------------------------------------- +%.png.o : %.png +#--------------------------------------------------------------------------------- + @echo $(notdir $<) + $(bin2o) + -include $(DEPENDS) #--------------------------------------------------------------------------------- diff --git a/examples/3D_Light1/Makefile b/examples/3D_Light1/Makefile index a5ed35e..7e96886 100644 --- a/examples/3D_Light1/Makefile +++ b/examples/3D_Light1/Makefile @@ -132,6 +132,14 @@ $(OUTPUT).elf: $(OFILES) @echo $(notdir $<) $(bin2o) +#--------------------------------------------------------------------------------- +# This rule links in binary data with the .png extension +#--------------------------------------------------------------------------------- +%.png.o : %.png +#--------------------------------------------------------------------------------- + @echo $(notdir $<) + $(bin2o) + -include $(DEPENDS) #--------------------------------------------------------------------------------- diff --git a/examples/3D_Light2/Makefile b/examples/3D_Light2/Makefile index a5ed35e..7e96886 100644 --- a/examples/3D_Light2/Makefile +++ b/examples/3D_Light2/Makefile @@ -132,6 +132,14 @@ $(OUTPUT).elf: $(OFILES) @echo $(notdir $<) $(bin2o) +#--------------------------------------------------------------------------------- +# This rule links in binary data with the .png extension +#--------------------------------------------------------------------------------- +%.png.o : %.png +#--------------------------------------------------------------------------------- + @echo $(notdir $<) + $(bin2o) + -include $(DEPENDS) #--------------------------------------------------------------------------------- diff --git a/examples/3D_Light3/Makefile b/examples/3D_Light3/Makefile index cfe17c0..b627ae1 100644 --- a/examples/3D_Light3/Makefile +++ b/examples/3D_Light3/Makefile @@ -132,6 +132,14 @@ $(OUTPUT).elf: $(OFILES) @echo $(notdir $<) $(bin2o) +#--------------------------------------------------------------------------------- +# This rule links in binary data with the .png extension +#--------------------------------------------------------------------------------- +%.png.o : %.png +#--------------------------------------------------------------------------------- + @echo $(notdir $<) + $(bin2o) + -include $(DEPENDS) #--------------------------------------------------------------------------------- diff --git a/examples/3D_sample1/Makefile b/examples/3D_sample1/Makefile index a5ed35e..7e96886 100644 --- a/examples/3D_sample1/Makefile +++ b/examples/3D_sample1/Makefile @@ -132,6 +132,14 @@ $(OUTPUT).elf: $(OFILES) @echo $(notdir $<) $(bin2o) +#--------------------------------------------------------------------------------- +# This rule links in binary data with the .png extension +#--------------------------------------------------------------------------------- +%.png.o : %.png +#--------------------------------------------------------------------------------- + @echo $(notdir $<) + $(bin2o) + -include $(DEPENDS) #--------------------------------------------------------------------------------- diff --git a/examples/3D_sample2/Makefile b/examples/3D_sample2/Makefile index a5ed35e..7e96886 100644 --- a/examples/3D_sample2/Makefile +++ b/examples/3D_sample2/Makefile @@ -132,6 +132,14 @@ $(OUTPUT).elf: $(OFILES) @echo $(notdir $<) $(bin2o) +#--------------------------------------------------------------------------------- +# This rule links in binary data with the .png extension +#--------------------------------------------------------------------------------- +%.png.o : %.png +#--------------------------------------------------------------------------------- + @echo $(notdir $<) + $(bin2o) + -include $(DEPENDS) #--------------------------------------------------------------------------------- diff --git a/examples/3D_sample3/Makefile b/examples/3D_sample3/Makefile index a5ed35e..7e96886 100644 --- a/examples/3D_sample3/Makefile +++ b/examples/3D_sample3/Makefile @@ -132,6 +132,14 @@ $(OUTPUT).elf: $(OFILES) @echo $(notdir $<) $(bin2o) +#--------------------------------------------------------------------------------- +# This rule links in binary data with the .png extension +#--------------------------------------------------------------------------------- +%.png.o : %.png +#--------------------------------------------------------------------------------- + @echo $(notdir $<) + $(bin2o) + -include $(DEPENDS) #--------------------------------------------------------------------------------- diff --git a/examples/3D_sample4/Makefile b/examples/3D_sample4/Makefile index a5ed35e..7e96886 100644 --- a/examples/3D_sample4/Makefile +++ b/examples/3D_sample4/Makefile @@ -132,6 +132,14 @@ $(OUTPUT).elf: $(OFILES) @echo $(notdir $<) $(bin2o) +#--------------------------------------------------------------------------------- +# This rule links in binary data with the .png extension +#--------------------------------------------------------------------------------- +%.png.o : %.png +#--------------------------------------------------------------------------------- + @echo $(notdir $<) + $(bin2o) + -include $(DEPENDS) #--------------------------------------------------------------------------------- diff --git a/examples/3D_sample5/Makefile b/examples/3D_sample5/Makefile index a5ed35e..7e96886 100644 --- a/examples/3D_sample5/Makefile +++ b/examples/3D_sample5/Makefile @@ -132,6 +132,14 @@ $(OUTPUT).elf: $(OFILES) @echo $(notdir $<) $(bin2o) +#--------------------------------------------------------------------------------- +# This rule links in binary data with the .png extension +#--------------------------------------------------------------------------------- +%.png.o : %.png +#--------------------------------------------------------------------------------- + @echo $(notdir $<) + $(bin2o) + -include $(DEPENDS) #--------------------------------------------------------------------------------- diff --git a/examples/NEED_GRRLIB_FUNCTION/Makefile b/examples/NEED_GRRLIB_FUNCTION/Makefile index cfe17c0..b627ae1 100644 --- a/examples/NEED_GRRLIB_FUNCTION/Makefile +++ b/examples/NEED_GRRLIB_FUNCTION/Makefile @@ -132,6 +132,14 @@ $(OUTPUT).elf: $(OFILES) @echo $(notdir $<) $(bin2o) +#--------------------------------------------------------------------------------- +# This rule links in binary data with the .png extension +#--------------------------------------------------------------------------------- +%.png.o : %.png +#--------------------------------------------------------------------------------- + @echo $(notdir $<) + $(bin2o) + -include $(DEPENDS) #--------------------------------------------------------------------------------- diff --git a/examples/TileDemo/Makefile b/examples/TileDemo/Makefile index a5ed35e..7e96886 100644 --- a/examples/TileDemo/Makefile +++ b/examples/TileDemo/Makefile @@ -132,6 +132,14 @@ $(OUTPUT).elf: $(OFILES) @echo $(notdir $<) $(bin2o) +#--------------------------------------------------------------------------------- +# This rule links in binary data with the .png extension +#--------------------------------------------------------------------------------- +%.png.o : %.png +#--------------------------------------------------------------------------------- + @echo $(notdir $<) + $(bin2o) + -include $(DEPENDS) #--------------------------------------------------------------------------------- diff --git a/examples/bitmap_fx/Makefile b/examples/bitmap_fx/Makefile index a5ed35e..7e96886 100644 --- a/examples/bitmap_fx/Makefile +++ b/examples/bitmap_fx/Makefile @@ -132,6 +132,14 @@ $(OUTPUT).elf: $(OFILES) @echo $(notdir $<) $(bin2o) +#--------------------------------------------------------------------------------- +# This rule links in binary data with the .png extension +#--------------------------------------------------------------------------------- +%.png.o : %.png +#--------------------------------------------------------------------------------- + @echo $(notdir $<) + $(bin2o) + -include $(DEPENDS) #--------------------------------------------------------------------------------- diff --git a/examples/blending/Makefile b/examples/blending/Makefile index a5ed35e..7e96886 100644 --- a/examples/blending/Makefile +++ b/examples/blending/Makefile @@ -132,6 +132,14 @@ $(OUTPUT).elf: $(OFILES) @echo $(notdir $<) $(bin2o) +#--------------------------------------------------------------------------------- +# This rule links in binary data with the .png extension +#--------------------------------------------------------------------------------- +%.png.o : %.png +#--------------------------------------------------------------------------------- + @echo $(notdir $<) + $(bin2o) + -include $(DEPENDS) #--------------------------------------------------------------------------------- diff --git a/examples/blending/source/main.c b/examples/blending/source/main.c index 058afc4..e2581da 100644 --- a/examples/blending/source/main.c +++ b/examples/blending/source/main.c @@ -34,7 +34,6 @@ GRRLIB_texImg *GFX_Font; int main() { // Init Variables u32 WPADKeyDown; - u32 WPADKeyHeld; short WinW, WinH; int P1MX, P1MY; @@ -70,7 +69,6 @@ int main() { while (true) { WPAD_ScanPads(); WPADKeyDown = WPAD_ButtonsDown(WPAD_CHAN_0); - WPADKeyHeld = WPAD_ButtonsHeld(WPAD_CHAN_0); WPAD_SetVRes(WPAD_CHAN_0, WinW, WinH); WPAD_IR(WPAD_CHAN_0, &P1Mote); diff --git a/examples/compositing/Makefile b/examples/compositing/Makefile index a5ed35e..7e96886 100644 --- a/examples/compositing/Makefile +++ b/examples/compositing/Makefile @@ -132,6 +132,14 @@ $(OUTPUT).elf: $(OFILES) @echo $(notdir $<) $(bin2o) +#--------------------------------------------------------------------------------- +# This rule links in binary data with the .png extension +#--------------------------------------------------------------------------------- +%.png.o : %.png +#--------------------------------------------------------------------------------- + @echo $(notdir $<) + $(bin2o) + -include $(DEPENDS) #--------------------------------------------------------------------------------- diff --git a/examples/particle/Makefile b/examples/particle/Makefile index a5ed35e..7e96886 100644 --- a/examples/particle/Makefile +++ b/examples/particle/Makefile @@ -132,6 +132,14 @@ $(OUTPUT).elf: $(OFILES) @echo $(notdir $<) $(bin2o) +#--------------------------------------------------------------------------------- +# This rule links in binary data with the .png extension +#--------------------------------------------------------------------------------- +%.png.o : %.png +#--------------------------------------------------------------------------------- + @echo $(notdir $<) + $(bin2o) + -include $(DEPENDS) #--------------------------------------------------------------------------------- diff --git a/examples/unlimited2d/Makefile b/examples/unlimited2d/Makefile index 80222d8..fadb114 100644 --- a/examples/unlimited2d/Makefile +++ b/examples/unlimited2d/Makefile @@ -133,6 +133,14 @@ $(OUTPUT).elf: $(OFILES) @echo $(notdir $<) $(bin2o) +#--------------------------------------------------------------------------------- +# This rule links in binary data with the .png extension +#--------------------------------------------------------------------------------- +%.png.o : %.png +#--------------------------------------------------------------------------------- + @echo $(notdir $<) + $(bin2o) + -include $(DEPENDS) #--------------------------------------------------------------------------------- diff --git a/examples/unlimited3d/Makefile b/examples/unlimited3d/Makefile index 80222d8..fadb114 100644 --- a/examples/unlimited3d/Makefile +++ b/examples/unlimited3d/Makefile @@ -133,6 +133,14 @@ $(OUTPUT).elf: $(OFILES) @echo $(notdir $<) $(bin2o) +#--------------------------------------------------------------------------------- +# This rule links in binary data with the .png extension +#--------------------------------------------------------------------------------- +%.png.o : %.png +#--------------------------------------------------------------------------------- + @echo $(notdir $<) + $(bin2o) + -include $(DEPENDS) #---------------------------------------------------------------------------------