From 6dd606fc2f2e7a6bef7d7ac772c7f97a35f8a61b Mon Sep 17 00:00:00 2001
From: inmarket <andrewh@inmarket.com.au>
Date: Wed, 19 Feb 2014 00:19:38 +1000
Subject: Add demo makefiles and update example master makefiles to match.
---
boards/base/Linux/example/Makefile | 8 ++-
.../Mikromedia-STM32-M4-ILI9341/example/Makefile | 7 ++-
boards/base/Olimex-SAM7EX256-GE8/example/Makefile | 7 ++-
boards/base/Win32/example/Makefile | 7 ++-
demos/3rdparty/bubbles/demo.mk | 3 +
demos/3rdparty/doom/demo.mk | 65 ++++++++++++++++++++++
demos/3rdparty/notepad-2/demo.mk | 5 ++
demos/applications/mandelbrot/demo.mk | 3 +
demos/applications/notepad/demo.mk | 3 +
demos/benchmarks/demo.mk | 3 +
demos/modules/gadc/demo.mk | 3 +
demos/modules/gaudin/demo.mk | 3 +
demos/modules/gdisp/basics/demo.mk | 3 +
demos/modules/gdisp/circles/demo.mk | 3 +
demos/modules/gdisp/fonts/demo.mk | 3 +
demos/modules/gdisp/fonts_cyrillic/demo.mk | 3 +
demos/modules/gdisp/images/demo.mk | 3 +
demos/modules/gdisp/images_animated/demo.mk | 3 +
demos/modules/gdisp/multiple_displays/demo.mk | 3 +
demos/modules/gdisp/streaming/demo.mk | 3 +
demos/modules/gtimer/demo.mk | 3 +
demos/modules/gwin/basic/demo.mk | 3 +
demos/modules/gwin/button/demo.mk | 3 +
demos/modules/gwin/checkbox/demo.mk | 3 +
demos/modules/gwin/console/demo.mk | 3 +
demos/modules/gwin/graph/demo.mk | 3 +
demos/modules/gwin/list/demo.mk | 3 +
demos/modules/gwin/progressbar/demo.mk | 3 +
demos/modules/gwin/radio/demo.mk | 3 +
demos/modules/gwin/slider/demo.mk | 3 +
demos/modules/gwin/widgets/demo.mk | 3 +
31 files changed, 165 insertions(+), 9 deletions(-)
create mode 100644 demos/3rdparty/bubbles/demo.mk
create mode 100644 demos/3rdparty/doom/demo.mk
create mode 100644 demos/3rdparty/notepad-2/demo.mk
create mode 100644 demos/applications/mandelbrot/demo.mk
create mode 100644 demos/applications/notepad/demo.mk
create mode 100644 demos/benchmarks/demo.mk
create mode 100644 demos/modules/gadc/demo.mk
create mode 100644 demos/modules/gaudin/demo.mk
create mode 100644 demos/modules/gdisp/basics/demo.mk
create mode 100644 demos/modules/gdisp/circles/demo.mk
create mode 100644 demos/modules/gdisp/fonts/demo.mk
create mode 100644 demos/modules/gdisp/fonts_cyrillic/demo.mk
create mode 100644 demos/modules/gdisp/images/demo.mk
create mode 100644 demos/modules/gdisp/images_animated/demo.mk
create mode 100644 demos/modules/gdisp/multiple_displays/demo.mk
create mode 100644 demos/modules/gdisp/streaming/demo.mk
create mode 100644 demos/modules/gtimer/demo.mk
create mode 100644 demos/modules/gwin/basic/demo.mk
create mode 100644 demos/modules/gwin/button/demo.mk
create mode 100644 demos/modules/gwin/checkbox/demo.mk
create mode 100644 demos/modules/gwin/console/demo.mk
create mode 100644 demos/modules/gwin/graph/demo.mk
create mode 100644 demos/modules/gwin/list/demo.mk
create mode 100644 demos/modules/gwin/progressbar/demo.mk
create mode 100644 demos/modules/gwin/radio/demo.mk
create mode 100644 demos/modules/gwin/slider/demo.mk
create mode 100644 demos/modules/gwin/widgets/demo.mk
diff --git a/boards/base/Linux/example/Makefile b/boards/base/Linux/example/Makefile
index 1d59fe43..e454a811 100644
--- a/boards/base/Linux/example/Makefile
+++ b/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)
diff --git a/boards/base/Mikromedia-STM32-M4-ILI9341/example/Makefile b/boards/base/Mikromedia-STM32-M4-ILI9341/example/Makefile
index c5f88f61..1c314543 100644
--- a/boards/base/Mikromedia-STM32-M4-ILI9341/example/Makefile
+++ b/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.
diff --git a/boards/base/Olimex-SAM7EX256-GE8/example/Makefile b/boards/base/Olimex-SAM7EX256-GE8/example/Makefile
index d6161d5e..b7b4da1c 100644
--- a/boards/base/Olimex-SAM7EX256-GE8/example/Makefile
+++ b/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.
diff --git a/boards/base/Win32/example/Makefile b/boards/base/Win32/example/Makefile
index 5badd338..94a99caf 100644
--- a/boards/base/Win32/example/Makefile
+++ b/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} \
diff --git a/demos/3rdparty/bubbles/demo.mk b/demos/3rdparty/bubbles/demo.mk
new file mode 100644
index 00000000..ca577508
--- /dev/null
+++ b/demos/3rdparty/bubbles/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/3rdparty/bubbles
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
diff --git a/demos/3rdparty/doom/demo.mk b/demos/3rdparty/doom/demo.mk
new file mode 100644
index 00000000..78faf4c2
--- /dev/null
+++ b/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
diff --git a/demos/3rdparty/notepad-2/demo.mk b/demos/3rdparty/notepad-2/demo.mk
new file mode 100644
index 00000000..4fd08c23
--- /dev/null
+++ b/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
diff --git a/demos/applications/mandelbrot/demo.mk b/demos/applications/mandelbrot/demo.mk
new file mode 100644
index 00000000..e2be68d3
--- /dev/null
+++ b/demos/applications/mandelbrot/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/applications/mandelbrot
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
diff --git a/demos/applications/notepad/demo.mk b/demos/applications/notepad/demo.mk
new file mode 100644
index 00000000..06c7808d
--- /dev/null
+++ b/demos/applications/notepad/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/applications/notepad
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
diff --git a/demos/benchmarks/demo.mk b/demos/benchmarks/demo.mk
new file mode 100644
index 00000000..d6589586
--- /dev/null
+++ b/demos/benchmarks/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/benchmarks
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
diff --git a/demos/modules/gadc/demo.mk b/demos/modules/gadc/demo.mk
new file mode 100644
index 00000000..d66445af
--- /dev/null
+++ b/demos/modules/gadc/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gadc
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c $(DEMODIR)/gwinosc.c
diff --git a/demos/modules/gaudin/demo.mk b/demos/modules/gaudin/demo.mk
new file mode 100644
index 00000000..1b57f289
--- /dev/null
+++ b/demos/modules/gaudin/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gaudin
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c $(DEMODIR)/gwinosc.c
diff --git a/demos/modules/gdisp/basics/demo.mk b/demos/modules/gdisp/basics/demo.mk
new file mode 100644
index 00000000..1d62403e
--- /dev/null
+++ b/demos/modules/gdisp/basics/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gdisp/basics
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
diff --git a/demos/modules/gdisp/circles/demo.mk b/demos/modules/gdisp/circles/demo.mk
new file mode 100644
index 00000000..89fb5e33
--- /dev/null
+++ b/demos/modules/gdisp/circles/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gdisp/circles
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
diff --git a/demos/modules/gdisp/fonts/demo.mk b/demos/modules/gdisp/fonts/demo.mk
new file mode 100644
index 00000000..5422c3d8
--- /dev/null
+++ b/demos/modules/gdisp/fonts/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gdisp/fonts
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
diff --git a/demos/modules/gdisp/fonts_cyrillic/demo.mk b/demos/modules/gdisp/fonts_cyrillic/demo.mk
new file mode 100644
index 00000000..84f9a1fc
--- /dev/null
+++ b/demos/modules/gdisp/fonts_cyrillic/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gdisp/fonts_cyrillic
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
diff --git a/demos/modules/gdisp/images/demo.mk b/demos/modules/gdisp/images/demo.mk
new file mode 100644
index 00000000..afa8001b
--- /dev/null
+++ b/demos/modules/gdisp/images/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gdisp/images
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
diff --git a/demos/modules/gdisp/images_animated/demo.mk b/demos/modules/gdisp/images_animated/demo.mk
new file mode 100644
index 00000000..7a478617
--- /dev/null
+++ b/demos/modules/gdisp/images_animated/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gdisp/images_animated
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
diff --git a/demos/modules/gdisp/multiple_displays/demo.mk b/demos/modules/gdisp/multiple_displays/demo.mk
new file mode 100644
index 00000000..a8ebf468
--- /dev/null
+++ b/demos/modules/gdisp/multiple_displays/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gdisp/multiple_displays
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
diff --git a/demos/modules/gdisp/streaming/demo.mk b/demos/modules/gdisp/streaming/demo.mk
new file mode 100644
index 00000000..b1c124fe
--- /dev/null
+++ b/demos/modules/gdisp/streaming/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gdisp/streaming
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
diff --git a/demos/modules/gtimer/demo.mk b/demos/modules/gtimer/demo.mk
new file mode 100644
index 00000000..6eebe93f
--- /dev/null
+++ b/demos/modules/gtimer/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gtimer
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
diff --git a/demos/modules/gwin/basic/demo.mk b/demos/modules/gwin/basic/demo.mk
new file mode 100644
index 00000000..a5b7a8f2
--- /dev/null
+++ b/demos/modules/gwin/basic/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gwin/basic
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
diff --git a/demos/modules/gwin/button/demo.mk b/demos/modules/gwin/button/demo.mk
new file mode 100644
index 00000000..5b8cd2a5
--- /dev/null
+++ b/demos/modules/gwin/button/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gwin/button
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
diff --git a/demos/modules/gwin/checkbox/demo.mk b/demos/modules/gwin/checkbox/demo.mk
new file mode 100644
index 00000000..8e6edf46
--- /dev/null
+++ b/demos/modules/gwin/checkbox/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gwin/checkbox
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
diff --git a/demos/modules/gwin/console/demo.mk b/demos/modules/gwin/console/demo.mk
new file mode 100644
index 00000000..09851d35
--- /dev/null
+++ b/demos/modules/gwin/console/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gwin/console
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
diff --git a/demos/modules/gwin/graph/demo.mk b/demos/modules/gwin/graph/demo.mk
new file mode 100644
index 00000000..c602c83e
--- /dev/null
+++ b/demos/modules/gwin/graph/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gwin/graph
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
diff --git a/demos/modules/gwin/list/demo.mk b/demos/modules/gwin/list/demo.mk
new file mode 100644
index 00000000..22b06b09
--- /dev/null
+++ b/demos/modules/gwin/list/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gwin/list
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
diff --git a/demos/modules/gwin/progressbar/demo.mk b/demos/modules/gwin/progressbar/demo.mk
new file mode 100644
index 00000000..dffd40d7
--- /dev/null
+++ b/demos/modules/gwin/progressbar/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gwin/progressbar
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
diff --git a/demos/modules/gwin/radio/demo.mk b/demos/modules/gwin/radio/demo.mk
new file mode 100644
index 00000000..e9e61456
--- /dev/null
+++ b/demos/modules/gwin/radio/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gwin/radio
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
diff --git a/demos/modules/gwin/slider/demo.mk b/demos/modules/gwin/slider/demo.mk
new file mode 100644
index 00000000..3e358dfa
--- /dev/null
+++ b/demos/modules/gwin/slider/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gwin/slider
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
diff --git a/demos/modules/gwin/widgets/demo.mk b/demos/modules/gwin/widgets/demo.mk
new file mode 100644
index 00000000..2e70fa4d
--- /dev/null
+++ b/demos/modules/gwin/widgets/demo.mk
@@ -0,0 +1,3 @@
+DEMODIR = $(GFXLIB)/demos/modules/gwin/widgets
+GFXINC += $(DEMODIR)
+GFXSRC += $(DEMODIR)/main.c
--
cgit v1.2.3