kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

CMake: Fix errors building by MinGW

Browse Source 
Some libraries are nto updated for MinGW hence build system
needs some exceptions for this compiler.
This commit is contained in:
Sergey Sharybin 2015-12-26 20:01:17 +05:00
parent 4332a56742
commit 4415e52009
2 changed files with 40 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -1585,8 +1585,13 @@ elseif(WIN32)
if(WITH_SDL)
set(SDL ${LIBDIR}/sdl)
set(SDL_INCLUDE_DIR ${SDL}/include)
set(SDL_LIBRARY SDL2)
set(SDL_LIBPATH ${SDL}/lib)
# MinGW TODO: Update MinGW to SDL2
if(NOT CMAKE_COMPILER_IS_GNUCC)
set(SDL_LIBRARY SDL2)
else()
set(SDL_LIBRARY SDL)
endif()
endif()
# Audio IO

48
source/creator/CMakeLists.txt
View File

@ -623,17 +623,20 @@ elseif(WIN32)
if(WITH_PYTHON)
string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
install(
FILES ${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}.dll ${LIBDIR}/python/lib/sqlite3.dll
DESTINATION "."
CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
)
# MinGW TODO: This bit of Python configuration diverges from MSVC
if(NOT CMAKE_COMPILER_IS_GNUCC)
install(
FILES ${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}.dll ${LIBDIR}/python/lib/sqlite3.dll
DESTINATION "."
CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
)
install(
FILES ${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}_d.dll ${LIBDIR}/python/lib/sqlite3_d.dll
DESTINATION "."
CONFIGURATIONS Debug
)
install(
FILES ${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}_d.dll ${LIBDIR}/python/lib/sqlite3_d.dll
DESTINATION "."
CONFIGURATIONS Debug
)
endif()
if(WITH_PYTHON_INSTALL)
# note, as far as python is concerned 'RelWithDebInfo' is not debug since its without debug flags.
@ -793,13 +796,30 @@ elseif(WIN32)
${LIBDIR}/openal/lib/OpenAL32.dll
DESTINATION "."
)
# MinGW TODO: Need to update to a newer OpenAL version
# which does not depend on wrap_oal.dll
if(CMAKE_COMPILER_IS_GNUCC)
install(
FILES
${LIBDIR}/openal/lib/wrap_oal.dll
DESTINATION "."
)
endif()
endif()
if(WITH_SDL)
install(
FILES ${LIBDIR}/sdl/lib/SDL2.dll
DESTINATION "."
)
#MinGW TODO: Update to SDL2
if(NOT CMAKE_COMPILER_IS_GNUCC)
install(
FILES ${LIBDIR}/sdl/lib/SDL2.dll
DESTINATION "."
)
else()
install(
FILES ${LIBDIR}/sdl/lib/SDL.dll
DESTINATION "."
)
endif()
endif()
if(WITH_SYSTEM_AUDASPACE)