teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Fix shlwapi include case and add the lib for linking when building for windows

Browse source
This commit is contained in:
k1ll 2013-06-22 11:33:22 +02:00
parent 31db37afd4
commit 00b7712a59
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
components/CMakeLists.txt
View file

@ -170,6 +170,10 @@ if (GIT_CHECKOUT)
add_dependencies (components git-version) add_dependencies (components git-version)
endif (GIT_CHECKOUT) endif (GIT_CHECKOUT)
if (WIN32)
target_link_libraries(components shlwapi)
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
if (UNIX AND NOT APPLE) if (UNIX AND NOT APPLE)
target_link_libraries(components ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(components ${CMAKE_THREAD_LIBS_INIT})

4
components/files/windowspath.cpp
View file

@ -6,9 +6,7 @@
#include <windows.h> #include <windows.h>
#include <shlobj.h> #include <shlobj.h>
#include <Shlwapi.h> #include <shlwapi.h>
#pragma comment(lib, "Shlwapi.lib")
#include <boost/locale.hpp> #include <boost/locale.hpp>
namespace bconv = boost::locale::conv; namespace bconv = boost::locale::conv;