fixed the build on windows mingw

This commit is contained in:
Jacker 2016-01-15 17:37:28 +02:00
parent 15713713c9
commit 7a5f106f98

View file

@ -630,7 +630,7 @@ if(BUNDLED_FREETYPE)
ExternalProject_Add(bundled_freetype ExternalProject_Add(bundled_freetype
SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/freetype SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/freetype
BINARY_DIR ${LIBS_BINARYDIR_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 "" INSTALL_COMMAND ""
) )
@ -655,7 +655,7 @@ if(BUNDLED_THEORA)
"${CMAKE_CURRENT_LIST_DIR}/theora/lib/*.h" "${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) LIST(REMOVE_ITEM THEORA_SRC ${CMAKE_CURRENT_LIST_DIR}/theora/lib/encoder_disabled.c)
if(32BITS) if(32BITS)