uGFX
/
ugfx
2
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Restore library locations to what is used in all other example makefiles

ugfx_release_2.6
inmarket 2014-05-12 09:26:36 +10:00
parent 2b01f18b03
commit 38fb787cbd
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_2.x/Makefile
View File

@ -67,7 +67,7 @@ SW = ..
PROJECT = ch
# Imported source files and paths
CHIBIOS = ../../../../../ChibiOS_2.6.4
CHIBIOS = ../ChibiOS
#include $(CHIBIOS)/boards/MIKROMEDIA_STM32_M4/board.mk # Not a standard ChibiOS supported board
include $(CHIBIOS)/os/hal/platforms/STM32F4xx/platform.mk
include $(CHIBIOS)/os/hal/hal.mk
@ -76,7 +76,7 @@ include $(CHIBIOS)/os/kernel/kernel.mk
LDSCRIPT= $(PORTLD)/STM32F407xG.ld
# Imported source files and paths for uGFX
GFXLIB = ../../../../
GFXLIB = ../ugfx
include $(GFXLIB)/boards/base/Mikromedia-STM32-M4-ILI9341/board.mk
include $(GFXLIB)/boards/base/Mikromedia-STM32-M4-ILI9341/ChibiOS_Board/board.mk # The replacement ChibiOS board files
include $(GFXLIB)/gfx.mk

4
boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_3.x/Makefile
View File

@ -83,7 +83,7 @@ SW = ..
PROJECT = ch
# Imported source files and paths
CHIBIOS = ../../../../../ChibiOS
CHIBIOS = ../ChibiOS
#include $(CHIBIOS)/boards/MIKROMEDIA_STM32_M4/board.mk # Not a standard ChibiOS supported board
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk
@ -93,7 +93,7 @@ include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk
LDSCRIPT= $(PORTLD)/STM32F407xG.ld
# Imported source files and paths for uGFX
GFXLIB = ../../../../
GFXLIB = ../ugfx
include $(GFXLIB)/boards/base/Mikromedia-STM32-M4-ILI9341/board.mk
include $(GFXLIB)/boards/base/Mikromedia-STM32-M4-ILI9341/ChibiOS_Board/board.mk # The replacement ChibiOS board files
include $(GFXLIB)/gfx.mk