Skip to content
This repository has been archived by the owner on Mar 24, 2024. It is now read-only.

Commit

Permalink
makefile: Remove redundant defines and includes
Browse files Browse the repository at this point in the history
Also update vscode project to match default config
  • Loading branch information
kbeckmann committed Dec 4, 2021
1 parent a482568 commit 522f034
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 17 deletions.
16 changes: 9 additions & 7 deletions .vscode/c_cpp_properties.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"includePath": [
"${workspaceFolder}/**",
"${workspaceFolder}/Core/Inc",
"${workspaceFolder}/Core/Inc",
"${workspaceFolder}/Core/Inc/porting",
"${workspaceFolder}/Core/Inc/porting/gb",
"${workspaceFolder}/Core/Inc/porting/nes",
"${workspaceFolder}/Core/Inc/porting/pce",
"${workspaceFolder}/Core/Inc/porting/smsplusgx",
"${workspaceFolder}/Core/Inc/porting/gw",
"${workspaceFolder}/Core/Inc/retro-go",
"${workspaceFolder}/Core/Src/porting/lib",
"${workspaceFolder}/Drivers/CMSIS/Device/ST/STM32H7xx/Include",
Expand All @@ -30,16 +30,18 @@
"${workspaceFolder}/retro-go-stm32/smsplusgx-go/components/smsplus/sound"
],
"defines": [
"IS_LITTLE_ENDIAN",
"DISABLE_AHBRAM_DCACHE",
"MINIZ_NO_MALLOC",
"MINIZ_NO_ZLIB_AP",
"INTFLASH_BANK=1",
"EXTFLASH_FORCE_SPI=0",
"USE_HAL_DRIVER",
"STM32H7B0xx",
"VECT_TAB_ITCM",
"IS_LITTLE_ENDIAN",
"MINIZ_NO_MALLOC",
"MINIZ_NO_ZLIB_APIS",
"DEBUG_RG_ALLOC",
"MINIZ_NO_TI"
"STATE_SAVING=1",
"ENABLE_SCREENSHOT=1",
"GNW_TARGET_MARIO=1",
"GNW_TARGET_ZELDA=0"
],
"compilerPath": "/usr/bin/clang",
"cStandard": "c17",
Expand Down
7 changes: 0 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -164,13 +164,6 @@ C_INCLUDES += \
-ILCD-Game-Emulator/src/cpus \
-ILCD-Game-Emulator/src/gw_sys

C_DEFS += \
-DIS_LITTLE_ENDIAN \
-DDISABLE_AHBRAM_DCACHE \
-DMINIZ_NO_MALLOC \
-DMINIZ_NO_ZLIB_APIS


include Makefile.common


Expand Down
5 changes: 2 additions & 3 deletions Makefile.common
Original file line number Diff line number Diff line change
Expand Up @@ -271,10 +271,10 @@ C_DEFS += \
-DEXTFLASH_FORCE_SPI=$(EXTFLASH_FORCE_SPI) \
-DUSE_HAL_DRIVER \
-DSTM32H7B0xx \
-DVECT_TAB_ITCM \
-DIS_LITTLE_ENDIAN \
-DMINIZ_NO_MALLOC \
-DMINIZ_NO_ZLIB_APIS \
-DDEBUG_RG_ALLOC \
-DMINIZ_NO_TIME \
-DSTATE_SAVING=$(STATE_SAVING) \
-DENABLE_SCREENSHOT=$(ENABLE_SCREENSHOT) \
-DGNW_TARGET_MARIO=$(GNW_TARGET_MARIO) \
Expand All @@ -297,7 +297,6 @@ C_INCLUDES += \
-IDrivers/STM32H7xx_HAL_Driver/Inc/Legacy \
-IDrivers/CMSIS/Device/ST/STM32H7xx/Include \
-IDrivers/CMSIS/Include \
-Iretro-go-stm32/components/miniz \
-Iretro-go-stm32/components/lupng \

# Force include the configuration
Expand Down

0 comments on commit 522f034

Please sign in to comment.