Add demo makefiles and update example master makefiles to match.

boards/base/Linux/example/Makefile

@@ -52,9 +52,11 @@ include ${GFXLIB}/gfx.mk
 include ${GFXLIB}/boards/base/Linux/board.mk
 
 # Where is our source code - alter these for your project.
-MYFILES = $(GFXLIB)/demos/modules/gdisp/basics
-MYCSRC  = $(MYFILES)/main.c
-MYDEFS  =
+# Either just include the demo makefile or add your own definitions
+include $(GFXLIB)/demos/modules/gdisp/basics/demo.mk
+#MYFILES = my-project-directory
+#MYCSRC  = $(MYFILES)/main.c
+#MYDEFS  =
 
 # List all user C define here, like -D_DEBUG=1
 UDEFS = $(MYDEFS) $(GFXDEFS)

boards/base/Mikromedia-STM32-M4-ILI9341/example/Makefile

@@ -82,8 +82,11 @@ include $(GFXLIB)/boards/base/Mikromedia-STM32-M4-ILI9341/ChibiOS_Board/board.mk
 include $(GFXLIB)/gfx.mk
 
 # Where is our source code - alter these for your project.
-MYFILES = $(GFXLIB)/demos/modules/gdisp/basics
-MYCSRC  = $(MYFILES)/main.c
+# Either just include the demo makefile or add your own definitions
+include $(GFXLIB)/demos/modules/gdisp/basics/demo.mk
+#MYFILES = my-project-directory
+#MYCSRC  = $(MYFILES)/main.c
+#MYDEFS  =
 
 # C sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.

boards/base/Olimex-SAM7EX256-GE8/example/Makefile

@@ -64,8 +64,11 @@ include $(GFXLIB)/gfx.mk
 include $(GFXLIB)/boards/base/Olimex-SAM7EX256-GE8/board.mk
 
 # Where is our source code - alter these for your project.
-MYFILES = $(GFXLIB)/demos/modules/gdisp/basics
-MYCSRC  = $(MYFILES)/main.c
+# Either just include the demo makefile or add your own definitions
+include $(GFXLIB)/demos/modules/gdisp/basics/demo.mk
+#MYFILES = my-project-directory
+#MYCSRC  = $(MYFILES)/main.c
+#MYDEFS  =
 
 # C sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.

boards/base/Win32/example/Makefile

@@ -76,8 +76,11 @@ else
 endif
 
 # Where is our source code - alter these for your project.
-MYFILES = $(GFXLIB)/demos/modules/gdisp/basics
-MYCSRC  = $(MYFILES)/main.c
+# Either just include the demo makefile or add your own definitions
+include $(GFXLIB)/demos/modules/gdisp/basics/demo.mk
+#MYFILES = my-project-directory
+#MYCSRC  = $(MYFILES)/main.c
+#MYDEFS  =
 
 # List C source files here
 SRC  += ${GFXSRC} \

demos/3rdparty/bubbles/demo.mk

@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/3rdparty/bubbles
+GFXINC +=   $(DEMODIR)
+GFXSRC +=	$(DEMODIR)/main.c

demos/3rdparty/doom/demo.mk

@@ -0,0 +1,65 @@
+DEMODIR = $(GFXLIB)/demos/3rdparty/doom
+GFXINC +=   $(DEMODIR)
+GFXSRC +=	\
+		$(DEMODIR)/d_main.c			\
+		$(DEMODIR)/i_main.c			\
+		$(DEMODIR)/i_system.c		\
+		$(DEMODIR)/i_sound.c		\
+		$(DEMODIR)/i_video.c		\
+		$(DEMODIR)/i_net.c			\
+		$(DEMODIR)/doomdef.c		\
+		$(DEMODIR)/doomstat.c		\
+		$(DEMODIR)/dstrings.c		\
+		$(DEMODIR)/tables.c			\
+		$(DEMODIR)/f_finale.c		\
+		$(DEMODIR)/f_wipe.c 		\
+		$(DEMODIR)/d_net.c			\
+		$(DEMODIR)/d_items.c		\
+		$(DEMODIR)/g_game.c			\
+		$(DEMODIR)/m_menu.c			\
+		$(DEMODIR)/m_misc.c			\
+		$(DEMODIR)/m_argv.c  		\
+		$(DEMODIR)/m_bbox.c			\
+		$(DEMODIR)/m_fixed.c		\
+		$(DEMODIR)/m_swap.c			\
+		$(DEMODIR)/m_cheat.c		\
+		$(DEMODIR)/m_random.c		\
+		$(DEMODIR)/am_map.c			\
+		$(DEMODIR)/p_ceilng.c		\
+		$(DEMODIR)/p_doors.c		\
+		$(DEMODIR)/p_enemy.c		\
+		$(DEMODIR)/p_floor.c		\
+		$(DEMODIR)/p_inter.c		\
+		$(DEMODIR)/p_lights.c		\
+		$(DEMODIR)/p_map.c			\
+		$(DEMODIR)/p_maputl.c		\
+		$(DEMODIR)/p_plats.c		\
+		$(DEMODIR)/p_pspr.c			\
+		$(DEMODIR)/p_setup.c		\
+		$(DEMODIR)/p_sight.c		\
+		$(DEMODIR)/p_spec.c			\
+		$(DEMODIR)/p_switch.c		\
+		$(DEMODIR)/p_mobj.c			\
+		$(DEMODIR)/p_telept.c		\
+		$(DEMODIR)/p_tick.c			\
+		$(DEMODIR)/p_saveg.c		\
+		$(DEMODIR)/p_user.c			\
+		$(DEMODIR)/r_bsp.c			\
+		$(DEMODIR)/r_data.c			\
+		$(DEMODIR)/r_draw.c			\
+		$(DEMODIR)/r_main.c			\
+		$(DEMODIR)/r_plane.c		\
+		$(DEMODIR)/r_segs.c			\
+		$(DEMODIR)/r_sky.c			\
+		$(DEMODIR)/r_things.c		\
+		$(DEMODIR)/w_wad.c			\
+		$(DEMODIR)/wi_stuff.c		\
+		$(DEMODIR)/v_video.c		\
+		$(DEMODIR)/st_lib.c			\
+		$(DEMODIR)/st_stuff.c		\
+		$(DEMODIR)/hu_stuff.c		\
+		$(DEMODIR)/hu_lib.c			\
+		$(DEMODIR)/s_sound.c		\
+		$(DEMODIR)/z_zone.c			\
+		$(DEMODIR)/info.c			\
+		$(DEMODIR)/sounds.c

demos/3rdparty/notepad-2/demo.mk

@@ -0,0 +1,5 @@
+DEMODIR = $(GFXLIB)/demos/3rdparty/notepad-2
+GFXINC +=   $(DEMODIR)
+GFXSRC +=	$(DEMODIR)/main.c \
+			$(DEMODIR)/notepadApp.c \
+			$(DEMODIR)/notepadCore.c

demos/applications/mandelbrot/demo.mk

@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/applications/mandelbrot
+GFXINC +=   $(DEMODIR)
+GFXSRC +=	$(DEMODIR)/main.c

demos/applications/notepad/demo.mk

@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/applications/notepad
+GFXINC +=   $(DEMODIR)
+GFXSRC +=	$(DEMODIR)/main.c

demos/benchmarks/demo.mk

@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/benchmarks
+GFXINC +=   $(DEMODIR)
+GFXSRC +=	$(DEMODIR)/main.c

demos/modules/gadc/demo.mk

@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gadc
+GFXINC +=   $(DEMODIR)
+GFXSRC +=	$(DEMODIR)/main.c $(DEMODIR)/gwinosc.c

demos/modules/gaudin/demo.mk

@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gaudin
+GFXINC +=   $(DEMODIR)
+GFXSRC +=	$(DEMODIR)/main.c $(DEMODIR)/gwinosc.c

demos/modules/gdisp/basics/demo.mk

@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gdisp/basics
+GFXINC +=   $(DEMODIR)
+GFXSRC +=	$(DEMODIR)/main.c

demos/modules/gdisp/circles/demo.mk

@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gdisp/circles
+GFXINC +=   $(DEMODIR)
+GFXSRC +=	$(DEMODIR)/main.c

demos/modules/gdisp/fonts/demo.mk

@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gdisp/fonts
+GFXINC +=   $(DEMODIR)
+GFXSRC +=	$(DEMODIR)/main.c

demos/modules/gdisp/fonts_cyrillic/demo.mk

@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gdisp/fonts_cyrillic
+GFXINC +=   $(DEMODIR)
+GFXSRC +=	$(DEMODIR)/main.c

demos/modules/gdisp/images/demo.mk

@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gdisp/images
+GFXINC +=   $(DEMODIR)
+GFXSRC +=	$(DEMODIR)/main.c

demos/modules/gdisp/images_animated/demo.mk

@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gdisp/images_animated
+GFXINC +=   $(DEMODIR)
+GFXSRC +=	$(DEMODIR)/main.c

demos/modules/gdisp/multiple_displays/demo.mk

@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gdisp/multiple_displays
+GFXINC +=   $(DEMODIR)
+GFXSRC +=	$(DEMODIR)/main.c

demos/modules/gdisp/streaming/demo.mk

@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gdisp/streaming
+GFXINC +=   $(DEMODIR)
+GFXSRC +=	$(DEMODIR)/main.c

demos/modules/gtimer/demo.mk

@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gtimer
+GFXINC +=   $(DEMODIR)
+GFXSRC +=	$(DEMODIR)/main.c

demos/modules/gwin/basic/demo.mk

@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gwin/basic
+GFXINC +=   $(DEMODIR)
+GFXSRC +=	$(DEMODIR)/main.c

demos/modules/gwin/button/demo.mk

@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gwin/button
+GFXINC +=   $(DEMODIR)
+GFXSRC +=	$(DEMODIR)/main.c

demos/modules/gwin/checkbox/demo.mk

@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gwin/checkbox
+GFXINC +=   $(DEMODIR)
+GFXSRC +=	$(DEMODIR)/main.c

demos/modules/gwin/console/demo.mk

@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gwin/console
+GFXINC +=   $(DEMODIR)
+GFXSRC +=	$(DEMODIR)/main.c

demos/modules/gwin/graph/demo.mk

@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gwin/graph
+GFXINC +=   $(DEMODIR)
+GFXSRC +=	$(DEMODIR)/main.c

demos/modules/gwin/list/demo.mk

@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gwin/list
+GFXINC +=   $(DEMODIR)
+GFXSRC +=	$(DEMODIR)/main.c

demos/modules/gwin/progressbar/demo.mk

@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gwin/progressbar
+GFXINC +=   $(DEMODIR)
+GFXSRC +=	$(DEMODIR)/main.c

demos/modules/gwin/radio/demo.mk

@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gwin/radio
+GFXINC +=   $(DEMODIR)
+GFXSRC +=	$(DEMODIR)/main.c

demos/modules/gwin/slider/demo.mk

@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gwin/slider
+GFXINC +=   $(DEMODIR)
+GFXSRC +=	$(DEMODIR)/main.c

demos/modules/gwin/widgets/demo.mk

@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gwin/widgets
+GFXINC +=   $(DEMODIR)
+GFXSRC +=	$(DEMODIR)/main.c