all repos — mgba @ f77cdf4eda898e60cab85d8055b5115801daa7fe

mGBA Game Boy Advance Emulator

All: Fix some WANT_PNG build
Jeffrey Pfau jeffrey@endrift.com
Mon, 31 Aug 2015 01:26:35 -0700
commit

f77cdf4eda898e60cab85d8055b5115801daa7fe

parent

81a52403a3583039f4e571f1516cd0efe4872c4b

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

jump to
M CMakeLists.txtCMakeLists.txt

@@ -148,6 +148,7 @@ list(APPEND VFS_SRC ${CMAKE_SOURCE_DIR}/src/util/vfs/vfs-fd.c ${CMAKE_SOURCE_DIR}/src/util/vfs/vfs-dirent.c)

file(GLOB OS_SRC ${CMAKE_SOURCE_DIR}/src/platform/posix/*.c) source_group("POSIX-specific code" FILES ${OS_SRC}) elseif(WII) + set(M_LIBRARY m) list(APPEND VFS_SRC ${CMAKE_SOURCE_DIR}/src/util/vfs/vfs-file.c ${CMAKE_SOURCE_DIR}/src/util/vfs/vfs-dirent.c) add_definitions(-DCOLOR_16_BIT -DCOLOR_5_6_5 -DUSE_VFS_FILE) include_directories(${CMAKE_BINARY_DIR})

@@ -397,6 +398,7 @@ if(WANT_PNG AND USE_ZLIB AND NOT USE_PNG)

set(PNG_STATIC ON CACHE BOOL "" FORCE) set(PNG_SHARED OFF CACHE BOOL "" FORCE) set(PNG_TESTS OFF CACHE BOOL "" FORCE) + set(SKIP_INSTALL_ALL ON) set(CMAKE_C_FLAGS_RELEASE_OLD "${CMAKE_C_FLAGS_RELEASE}") set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-lto") add_subdirectory(${CMAKE_SOURCE_DIR}/src/third-party/libpng libpng)