diff options
Diffstat (limited to 'src/SFML/CMakeLists.txt')
| -rw-r--r-- | src/SFML/CMakeLists.txt | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/SFML/CMakeLists.txt b/src/SFML/CMakeLists.txt index 392ed82..8eb334d 100644 --- a/src/SFML/CMakeLists.txt +++ b/src/SFML/CMakeLists.txt @@ -14,10 +14,18 @@ if (SFML_OS_WINDOWS) set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${PROJECT_SOURCE_DIR}/extlibs/bin/x64") endif() elseif(SFML_COMPILER_MSVC) - if(ARCH_32BITS) - set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${PROJECT_SOURCE_DIR}/extlibs/libs-msvc/x86") - elseif(ARCH_64BITS) - set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${PROJECT_SOURCE_DIR}/extlibs/libs-msvc/x64") + if(SFML_MSVC_VERSION LESS 14) + if(ARCH_32BITS) + set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${PROJECT_SOURCE_DIR}/extlibs/libs-msvc/x86") + elseif(ARCH_64BITS) + set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${PROJECT_SOURCE_DIR}/extlibs/libs-msvc/x64") + endif() + else() + if(ARCH_32BITS) + set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${PROJECT_SOURCE_DIR}/extlibs/libs-msvc-universal/x86") + elseif(ARCH_64BITS) + set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${PROJECT_SOURCE_DIR}/extlibs/libs-msvc-universal/x64") + endif() endif() endif() elseif(SFML_OS_MACOSX) |