mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-21 13:23:52 +00:00
Code Issues Releases Wiki Activity

Merge branch 'mingw' into 'master'

Browse source 
Fix mingw Windows build

See merge request OpenMW/openmw!213
This commit is contained in:
psi29a 2020-06-17 09:19:02 +00:00
commit 1724099d34
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -304,7 +304,10 @@ endif()
set(BOOST_COMPONENTS system filesystem program_options iostreams) set(BOOST_COMPONENTS system filesystem program_options iostreams)
if(WIN32) 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) endif(WIN32)
IF(BOOST_STATIC) IF(BOOST_STATIC)

3
components/CMakeLists.txt
View file

@ -267,9 +267,6 @@ endif (GIT_CHECKOUT)
if (WIN32) if (WIN32)
target_link_libraries(components shlwapi) target_link_libraries(components shlwapi)
if(MINGW)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOGDI")
endif(MINGW)
endif() endif()
# Fix for not visible pthreads functions for linker with glibc 2.15 # Fix for not visible pthreads functions for linker with glibc 2.15