diff options
| author | inmarket <inmarket@ugfx.io> | 2017-06-30 19:43:51 +1000 |
|---|---|---|
| committer | inmarket <inmarket@ugfx.io> | 2017-06-30 19:43:51 +1000 |
| commit | 9b7318710025ae85af714bb0b5f390db84ae2cd0 (patch) | |
| tree | f7b1849a40c0019d048761f9493f6d15695703cd /demos/games/tetris | |
| parent | e5497f2ac058acb427b6fcdd15db6adeddd7bc55 (diff) | |
| download | uGFX-9b7318710025ae85af714bb0b5f390db84ae2cd0.tar.gz uGFX-9b7318710025ae85af714bb0b5f390db84ae2cd0.tar.bz2 uGFX-9b7318710025ae85af714bb0b5f390db84ae2cd0.zip | |
Add compatibility with Visual Studio and make compile warning capabilities more cross platform
Diffstat (limited to 'demos/games/tetris')
| -rw-r--r-- | demos/games/tetris/Example_Makefiles/stm32f4/board_SSD1289.h | 6 | ||||
| -rw-r--r-- | demos/games/tetris/Example_Makefiles/stm32f4_chibios_3.x/board_SSD1289.h | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/demos/games/tetris/Example_Makefiles/stm32f4/board_SSD1289.h b/demos/games/tetris/Example_Makefiles/stm32f4/board_SSD1289.h index ba51f0cc..833ebdb4 100644 --- a/demos/games/tetris/Example_Makefiles/stm32f4/board_SSD1289.h +++ b/demos/games/tetris/Example_Makefiles/stm32f4/board_SSD1289.h @@ -69,7 +69,11 @@ static GFXINLINE void init_board(GDisplay *g) { dmaStreamSetMemory0(GDISP_DMA_STREAM, &GDISP_RAM); dmaStreamSetMode(GDISP_DMA_STREAM, STM32_DMA_CR_PL(0) | STM32_DMA_CR_PSIZE_HWORD | STM32_DMA_CR_MSIZE_HWORD | STM32_DMA_CR_DIR_M2M); #else - #warning "GDISP: SSD1289 - DMA is supported for F2/F4 Devices. Define GDISP_USE_DMA in your gfxconf.h to turn this on for better performance." + #if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT + #warning "GDISP: SSD1289 - DMA is supported for F2/F4 Devices. Define GDISP_USE_DMA in your gfxconf.h to turn this on for better performance." + #elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO + COMPILER_WARNING("GDISP: SSD1289 - DMA is supported for F2/F4 Devices. Define GDISP_USE_DMA in your gfxconf.h to turn this on for better performance.") + #endif #endif #else #error "GDISP: SSD1289 - FSMC not implemented for this device" diff --git a/demos/games/tetris/Example_Makefiles/stm32f4_chibios_3.x/board_SSD1289.h b/demos/games/tetris/Example_Makefiles/stm32f4_chibios_3.x/board_SSD1289.h index b1f2a8b5..a74507e5 100644 --- a/demos/games/tetris/Example_Makefiles/stm32f4_chibios_3.x/board_SSD1289.h +++ b/demos/games/tetris/Example_Makefiles/stm32f4_chibios_3.x/board_SSD1289.h @@ -69,7 +69,11 @@ static GFXINLINE void init_board(GDisplay *g) { dmaStreamSetMemory0(GDISP_DMA_STREAM, &GDISP_RAM); dmaStreamSetMode(GDISP_DMA_STREAM, STM32_DMA_CR_PL(0) | STM32_DMA_CR_PSIZE_HWORD | STM32_DMA_CR_MSIZE_HWORD | STM32_DMA_CR_DIR_M2M); #else - #warning "GDISP: SSD1289 - DMA is supported for F2/F4 Devices. Define GDISP_USE_DMA in your gfxconf.h to turn this on for better performance." + #if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT + #warning "GDISP: SSD1289 - DMA is supported for F2/F4 Devices. Define GDISP_USE_DMA in your gfxconf.h to turn this on for better performance." + #elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO + COMPILER_WARNING("GDISP: SSD1289 - DMA is supported for F2/F4 Devices. Define GDISP_USE_DMA in your gfxconf.h to turn this on for better performance.") + #endif #endif #else #error "GDISP: SSD1289 - FSMC not implemented for this device" |