diff options
| author | inmarket <andrewh@inmarket.com.au> | 2014-02-19 07:45:47 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2014-02-19 07:45:47 +1000 |
| commit | 6d372f13528f44919ec193d03248d55a53484968 (patch) | |
| tree | 66f6ba33c6bcfed2b5b3846cf1f309e9b7e715e6 /boards/base | |
| parent | 03914d2d2b438062d3062e2c3a588d53d3040cff (diff) | |
| parent | 37966ff16d923bbca53c9464815cb49cbd7fc3be (diff) | |
| download | uGFX-6d372f13528f44919ec193d03248d55a53484968.tar.gz uGFX-6d372f13528f44919ec193d03248d55a53484968.tar.bz2 uGFX-6d372f13528f44919ec193d03248d55a53484968.zip | |
Merge branch 'master' into freertos
Diffstat (limited to 'boards/base')
| -rw-r--r-- | boards/base/Linux/example/Makefile | 8 | ||||
| -rw-r--r-- | boards/base/Mikromedia-STM32-M4-ILI9341/example/Makefile | 7 | ||||
| -rw-r--r-- | boards/base/Olimex-SAM7EX256-GE8/example/Makefile | 7 | ||||
| -rw-r--r-- | boards/base/Win32/example/Makefile | 7 |
4 files changed, 20 insertions, 9 deletions
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} \ |