ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

All: Fix bad merge

This commit is contained in:
Vicki Pfau 2017-02-23 17:10:22 -08:00
parent 3a888f6a36
commit 54a94ca40d
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
CMakeLists.txt
View File

@ -628,15 +628,6 @@ if(M_CORE_GBA)
endif()
endif()
if(USE_DEBUGGERS)
list(APPEND FEATURE_SRC ${DEBUGGER_SRC})
list(APPEND FEATURES DEBUGGERS)
endif()
foreach(FEATURE IN LISTS FEATURES)
list(APPEND FEATURE_DEFINES "USE_${FEATURE}")
endforeach()
if(M_CORE_DS)
add_definitions(-DM_CORE_DS)
list(APPEND CORE_SRC
@ -650,6 +641,15 @@ if(M_CORE_DS)
${CMAKE_CURRENT_SOURCE_DIR}/src/ds/extra/cli.c)
endif()
if(USE_DEBUGGERS)
list(APPEND FEATURE_SRC ${DEBUGGER_SRC})
list(APPEND FEATURES DEBUGGERS)
endif()
foreach(FEATURE IN LISTS FEATURES)
list(APPEND FEATURE_DEFINES "USE_${FEATURE}")
endforeach()
source_group("Virtual files" FILES ${CORE_VFS_SRC} ${VFS_SRC})
source_group("Extra features" FILES ${FEATURE_SRC})
source_group("Third-party code" FILES ${THIRD_PARTY_SRC})