all repos — mgba @ ffea8201481aedfc1a9ca991d5a3bb1976547265

mGBA Game Boy Advance Emulator

Remove some redundant flags
Jeffrey Pfau jeffrey@endrift.com
Wed, 23 Apr 2014 02:09:06 -0700
commit

ffea8201481aedfc1a9ca991d5a3bb1976547265

parent

0ab39aa6bd54dbcfaa986258c0b0684f66953964

1 files changed, 2 insertions(+), 4 deletions(-)

jump to
M src/platform/sdl/CMakeLists.txtsrc/platform/sdl/CMakeLists.txt

@@ -16,7 +16,7 @@ endif()

file(GLOB PLATFORM_SRC ${CMAKE_SOURCE_DIR}/src/platform/sdl/sdl-*.c) set(PLATFORM_LIBRARY "${SDL_LIBRARY};${SDLMAIN_LIBRARY}") -include_directories(${CMAKE_SOURCE_DIR}/src/platform/sdl) +include_directories(${CMAKE_SOURCE_DIR}/src/platform/sdl ${SDL_INCLUDE_DIR}) if(BUILD_RASPI) add_definitions(-DBUILD_RASPI)

@@ -27,13 +27,11 @@ target_link_libraries(${BINARY_NAME}-rpi ${BINARY_NAME} ${PLATFORM_LIBRARY} ${EGL_LIBRARY})

endif() if(BUILD_BBB OR BUILD_RASPI) - enable_language(ASM) - add_definitions(-DCOLOR_16_BIT -DCOLOR_5_6_5) set(MAIN_SRC ${CMAKE_SOURCE_DIR}/src/platform/sdl/sw-main.c) else() set(MAIN_SRC ${CMAKE_SOURCE_DIR}/src/platform/sdl/gl-main.c) find_package(OpenGL REQUIRED) - include_directories(${SDL_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR}) + include_directories(${OPENGL_INCLUDE_DIR}) endif() add_executable(${BINARY_NAME}-sdl WIN32 ${PLATFORM_SRC} ${MAIN_SRC})