search

Spritetm / hadbadge2019_fpgasoc

FPGA SoC code and application example for Hackaday Supercon 2019 badge
Other
159 stars 70 forks source link

Remove (now) duplicate GFXSPRITES declaration #148

Closed Roger-random closed 4 years ago

Roger-random commented 4 years ago

Remove (now) duplicate GFXSPRITES declaration to resolve #147

Previously, GFXSPRITES was manually declared in each main.c. Commit 251348f added a declaration to apps-sdk/sdk.h so the manual declaration now triggers a compiler error.

     CC main.c
/home/roger/coding/hadbadge2019_fpgasoc/app-badgetris/main.c:37:11: error: conflicting types for 'GFXSPRITES'
   37 | uint32_t *GFXSPRITES = (uint32_t *)0x5000C000;
      |           ^~~~~~~~~~
In file included from /home/roger/coding/hadbadge2019_fpgasoc/app-badgetris/main.c:7:
../apps-sdk/sdk.h:45:17: note: previous declaration of 'GFXSPRITES' was here
   45 | extern uint32_t GFXSPRITES[];
      |                 ^~~~~~~~~~
../apps-sdk/sdk.mk:82: recipe for target '/home/roger/coding/hadbadge2019_fpgasoc/app-badgetris/build/main.o' failed
make: *** [/home/roger/coding/hadbadge2019_fpgasoc/app-badgetris/build/main.o] Error 1