mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-03-03 21:19:40 +00:00
Merge branch 'mingw' into 'master'
Fix mingw Windows build See merge request OpenMW/openmw!213
This commit is contained in:
commit
1724099d34
2 changed files with 4 additions and 4 deletions
|
@ -304,7 +304,10 @@ endif()
|
|||
|
||||
set(BOOST_COMPONENTS system filesystem program_options iostreams)
|
||||
if(WIN32)
|
||||
set(BOOST_COMPONENTS ${BOOST_COMPONENTS} locale zlib)
|
||||
set(BOOST_COMPONENTS ${BOOST_COMPONENTS} locale)
|
||||
if(MSVC)
|
||||
set(BOOST_COMPONENTS ${BOOST_COMPONENTS} zlib)
|
||||
endif(MSVC)
|
||||
endif(WIN32)
|
||||
|
||||
IF(BOOST_STATIC)
|
||||
|
|
|
@ -267,9 +267,6 @@ endif (GIT_CHECKOUT)
|
|||
|
||||
if (WIN32)
|
||||
target_link_libraries(components shlwapi)
|
||||
if(MINGW)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOGDI")
|
||||
endif(MINGW)
|
||||
endif()
|
||||
|
||||
# Fix for not visible pthreads functions for linker with glibc 2.15
|
||||
|
|
Loading…
Reference in a new issue