From 54a94ca40d5f3563a64677980574cb4eb778fcfd Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Thu, 23 Feb 2017 17:10:22 -0800 Subject: [PATCH] All: Fix bad merge --- CMakeLists.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fc7f15144..a0035a723 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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})