From 7a5f106f980f19222017e1e5e1e9862a9ed92127 Mon Sep 17 00:00:00 2001 From: Jacker Date: Fri, 15 Jan 2016 17:37:28 +0200 Subject: [PATCH] fixed the build on windows mingw --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 45844cb9..9261a343 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -630,7 +630,7 @@ if(BUNDLED_FREETYPE) ExternalProject_Add(bundled_freetype SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/freetype BINARY_DIR ${LIBS_BINARYDIR_DIR}/freetype - CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG} -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE} -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} -DWITH_BZip2=OFF -DWITH_PNG=OFF -DWITH_HarfBuzz=OFF + CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG} -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE} -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} -DWITH_BZip2=OFF -DWITH_PNG=OFF -DWITH_HarfBuzz=OFF -DWITH_ZLIB=OFF INSTALL_COMMAND "" ) @@ -655,7 +655,7 @@ if(BUNDLED_THEORA) "${CMAKE_CURRENT_LIST_DIR}/theora/lib/*.h" ) - # This makes the MSVC build a happier + # This makes the MSVC build a happier camper LIST(REMOVE_ITEM THEORA_SRC ${CMAKE_CURRENT_LIST_DIR}/theora/lib/encoder_disabled.c) if(32BITS)