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

Clean up list usage in CMakeLists

This commit is contained in:
Jeffrey Pfau 2014-08-12 22:06:03 -07:00
parent e88aed2597
commit 09c49d5f3b
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeLists.txt
View File

@ -12,7 +12,7 @@ file(GLOB GBA_SRC ${CMAKE_SOURCE_DIR}/src/gba/*.c)
file(GLOB UTIL_SRC ${CMAKE_SOURCE_DIR}/src/util/*.[cS]) file(GLOB UTIL_SRC ${CMAKE_SOURCE_DIR}/src/util/*.[cS])
file(GLOB VFS_SRC ${CMAKE_SOURCE_DIR}/src/util/vfs/*.c) file(GLOB VFS_SRC ${CMAKE_SOURCE_DIR}/src/util/vfs/*.c)
file(GLOB RENDERER_SRC ${CMAKE_SOURCE_DIR}/src/gba/renderers/video-software.c) file(GLOB RENDERER_SRC ${CMAKE_SOURCE_DIR}/src/gba/renderers/video-software.c)
set(UTIL_SRC ${UTIL_SRC};${CMAKE_SOURCE_DIR}/src/platform/commandline.c) list(APPEND UTIL_SRC ${CMAKE_SOURCE_DIR}/src/platform/commandline.c)
source_group("ARM core" FILES ${ARM_SRC}) source_group("ARM core" FILES ${ARM_SRC})
source_group("GBA board" FILES ${GBA_SRC} ${RENDERER_SRC}) source_group("GBA board" FILES ${GBA_SRC} ${RENDERER_SRC})
source_group("Utilities" FILES ${UTIL_SRC} ${VFS_SRC}}) source_group("Utilities" FILES ${UTIL_SRC} ${VFS_SRC}})
@ -51,12 +51,12 @@ endif()
if(WIN32) if(WIN32)
add_definitions(-D_WIN32_WINNT=0x0600) add_definitions(-D_WIN32_WINNT=0x0600)
set(OS_LIB "${OS_LIB};Ws2_32") list(APPEND OS_LIB Ws2_32)
file(GLOB OS_SRC ${CMAKE_SOURCE_DIR}/src/platform/windows/*.c) file(GLOB OS_SRC ${CMAKE_SOURCE_DIR}/src/platform/windows/*.c)
source_group("Windows-specific code" FILES ${OS_SRC}) source_group("Windows-specific code" FILES ${OS_SRC})
else() else()
add_definitions(-DUSE_PTHREADS) add_definitions(-DUSE_PTHREADS)
set(OS_LIB "${OS_LIB};pthread") list(APPEND OS_LIB pthread)
file(GLOB OS_SRC ${CMAKE_SOURCE_DIR}/src/platform/posix/*.c) file(GLOB OS_SRC ${CMAKE_SOURCE_DIR}/src/platform/posix/*.c)
source_group("POSIX-specific code" FILES ${OS_SRC}) source_group("POSIX-specific code" FILES ${OS_SRC})
endif() endif()
@ -68,14 +68,14 @@ if(BUILD_BBB OR BUILD_RASPI)
endif() endif()
endif() endif()
set(DEBUGGER_SRC "${CMAKE_SOURCE_DIR}/src/debugger/debugger.c;${CMAKE_SOURCE_DIR}/src/debugger/memory-debugger.c") set(DEBUGGER_SRC ${CMAKE_SOURCE_DIR}/src/debugger/debugger.c ${CMAKE_SOURCE_DIR}/src/debugger/memory-debugger.c)
if(USE_CLI_DEBUGGER) if(USE_CLI_DEBUGGER)
pkg_search_module(EDIT libedit) pkg_search_module(EDIT libedit)
if(EDIT_FOUND) if(EDIT_FOUND)
add_definitions(-DUSE_CLI_DEBUGGER) add_definitions(-DUSE_CLI_DEBUGGER)
list(APPEND DEBUGGER_SRC "${CMAKE_SOURCE_DIR}/src/debugger/cli-debugger.c") list(APPEND DEBUGGER_SRC ${CMAKE_SOURCE_DIR}/src/debugger/cli-debugger.c)
list(APPEND DEBUGGER_SRC "${CMAKE_SOURCE_DIR}/src/debugger/parser.c") list(APPEND DEBUGGER_SRC ${CMAKE_SOURCE_DIR}/src/debugger/parser.c)
set(DEBUGGER_LIB ${EDIT_LIBRARIES}) set(DEBUGGER_LIB ${EDIT_LIBRARIES})
else() else()
message(WARNING "Could not find libedit for CLI debugger support") message(WARNING "Could not find libedit for CLI debugger support")
@ -87,7 +87,7 @@ endif()
if(USE_GDB_STUB) if(USE_GDB_STUB)
add_definitions(-DUSE_GDB_STUB) add_definitions(-DUSE_GDB_STUB)
set(DEBUGGER_SRC "${DEBUGGER_SRC};${CMAKE_SOURCE_DIR}/src/debugger/gdb-stub.c") list(APPEND DEBUGGER_SRC ${CMAKE_SOURCE_DIR}/src/debugger/gdb-stub.c)
endif() endif()
source_group("ARM debugger" FILES ${DEBUGGER_SRC}) source_group("ARM debugger" FILES ${DEBUGGER_SRC})
@ -105,7 +105,7 @@ endif()
if(BUILD_PERF) if(BUILD_PERF)
set(PERF_SRC ${CMAKE_SOURCE_DIR}/src/platform/perf-main.c) set(PERF_SRC ${CMAKE_SOURCE_DIR}/src/platform/perf-main.c)
if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE)
set(PERF_LIB "${PERF_LIB};rt") list(APPEND PERF_LIB rt)
endif() endif()
add_executable(${BINARY_NAME}-perf ${PERF_SRC}) add_executable(${BINARY_NAME}-perf ${PERF_SRC})

2
src/platform/sdl/CMakeLists.txt
View File

@ -17,7 +17,7 @@ if(SDL_VERSION EQUAL "1.2" OR NOT SDL2_FOUND)
endif() endif()
file(GLOB PLATFORM_SRC ${CMAKE_SOURCE_DIR}/src/platform/sdl/sdl-*.c) file(GLOB PLATFORM_SRC ${CMAKE_SOURCE_DIR}/src/platform/sdl/sdl-*.c)
set(PLATFORM_LIBRARY "${SDL_LIBRARY};${SDLMAIN_LIBRARY}") set(PLATFORM_LIBRARY ${SDL_LIBRARY} ${SDLMAIN_LIBRARY})
include_directories(${CMAKE_SOURCE_DIR}/src/platform/sdl ${SDL_INCLUDE_DIR}) include_directories(${CMAKE_SOURCE_DIR}/src/platform/sdl ${SDL_INCLUDE_DIR})
if(BUILD_RASPI) if(BUILD_RASPI)