Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added support for VS 2015.

Browse Source
This commit is contained in:
Lukas Dürrenberger 2015-08-12 18:33:41 +02:00
parent f80f501885
commit 6b9781475d
19 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -287,15 +287,19 @@ if(SFML_OS_WINDOWS)
# install the binaries of SFML dependencies
if(ARCH_32BITS)
install(DIRECTORY extlibs/bin/x86/ DESTINATION bin)
if(SFML_COMPILER_MSVC)
if(SFML_COMPILER_MSVC AND SFML_MSVC_VERSION LESS 14)
install(DIRECTORY extlibs/libs-msvc/x86/ DESTINATION lib)
elseif(SFML_COMPILER_MSVC)
install(DIRECTORY extlibs/libs-msvc-universal/x86/ DESTINATION lib)
else()
install(DIRECTORY extlibs/libs-mingw/x86/ DESTINATION lib)
endif()
elseif(ARCH_64BITS)
install(DIRECTORY extlibs/bin/x64/ DESTINATION bin)
if(SFML_COMPILER_MSVC)
if(SFML_COMPILER_MSVC AND SFML_MSVC_VERSION LESS 14)
install(DIRECTORY extlibs/libs-msvc/x64/ DESTINATION lib)
elseif(SFML_COMPILER_MSVC)
install(DIRECTORY extlibs/libs-msvc-universal/x64/ DESTINATION lib)
else()
install(DIRECTORY extlibs/libs-mingw/x64/ DESTINATION lib)
endif()

2
cmake/Config.cmake
View File

@ -101,6 +101,8 @@ elseif(MSVC)
set(SFML_MSVC_VERSION 11)
elseif(MSVC_VERSION EQUAL 1800)
set(SFML_MSVC_VERSION 12)
elseif(MSVC_VERSION EQUAL 1900)
set(SFML_MSVC_VERSION 14)
endif()
else()
message(FATAL_ERROR "Unsupported compiler")

BIN
extlibs/libs-msvc-universal/x64/flac.lib vendored Normal file
View File

Binary file not shown.

BIN
extlibs/libs-msvc-universal/x64/freetype.lib vendored Normal file
View File

Binary file not shown.

BIN
extlibs/libs-msvc-universal/x64/jpeg.lib vendored Normal file
View File

Binary file not shown.

BIN
extlibs/libs-msvc-universal/x64/ogg.lib vendored Normal file
View File

Binary file not shown.

BIN
extlibs/libs-msvc-universal/x64/openal32.lib vendored Normal file
View File

Binary file not shown.

BIN
extlibs/libs-msvc-universal/x64/vorbis.lib vendored Normal file
View File

Binary file not shown.

BIN
extlibs/libs-msvc-universal/x64/vorbisenc.lib vendored Normal file
View File

Binary file not shown.

BIN
extlibs/libs-msvc-universal/x64/vorbisfile.lib vendored Normal file
View File

Binary file not shown.

BIN
extlibs/libs-msvc-universal/x86/flac.lib vendored Normal file
View File

Binary file not shown.

BIN
extlibs/libs-msvc-universal/x86/freetype.lib vendored Normal file
View File

Binary file not shown.

BIN
extlibs/libs-msvc-universal/x86/jpeg.lib vendored Normal file
View File

Binary file not shown.

BIN
extlibs/libs-msvc-universal/x86/ogg.lib vendored Normal file
View File

Binary file not shown.

BIN
extlibs/libs-msvc-universal/x86/openal32.lib vendored Normal file
View File

Binary file not shown.

BIN
extlibs/libs-msvc-universal/x86/vorbis.lib vendored Normal file
View File

Binary file not shown.

BIN
extlibs/libs-msvc-universal/x86/vorbisenc.lib vendored Normal file
View File

Binary file not shown.

BIN
extlibs/libs-msvc-universal/x86/vorbisfile.lib vendored Normal file
View File

Binary file not shown.

16
src/SFML/CMakeLists.txt
View File

@ -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)