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

Merge pull request #356 from eXpl0it3r/master

Browse Source 
Added external libraries for MinGW x64 compilers
This commit is contained in:
Laurent Gomila 2013-02-19 05:19:14 -08:00
commit 4fbefe7469
11 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
extlibs/libs-mingw/x64/libfreetype.a Executable file
View File

Binary file not shown.

BIN
extlibs/libs-mingw/x64/libglew32.a Executable file
View File

Binary file not shown.

BIN
extlibs/libs-mingw/x64/libjpeg.a Executable file
View File

Binary file not shown.

BIN
extlibs/libs-mingw/x64/libsndfile.a Executable file
View File

Binary file not shown.

BIN
extlibs/libs-mingw/x64/openal32.a Executable file
View File

Binary file not shown.

0
extlibs/libs-mingw/libfreetype.a → extlibs/libs-mingw/x86/libfreetype.a
View File

0
extlibs/libs-mingw/libglew.a → extlibs/libs-mingw/x86/libglew.a
View File

0
extlibs/libs-mingw/libjpeg.a → extlibs/libs-mingw/x86/libjpeg.a
View File

0
extlibs/libs-mingw/libopenal32.a → extlibs/libs-mingw/x86/libopenal32.a
View File

0
extlibs/libs-mingw/libsndfile.a → extlibs/libs-mingw/x86/libsndfile.a
View File

3
src/SFML/CMakeLists.txt
View File

@ -6,10 +6,11 @@ include(${PROJECT_SOURCE_DIR}/cmake/Macros.cmake)
if (WINDOWS) if (WINDOWS)
set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} "${PROJECT_SOURCE_DIR}/extlibs/headers") set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} "${PROJECT_SOURCE_DIR}/extlibs/headers")
if(COMPILER_GCC) if(COMPILER_GCC)
set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${PROJECT_SOURCE_DIR}/extlibs/libs-mingw")
if(ARCH_32BITS) if(ARCH_32BITS)
set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${PROJECT_SOURCE_DIR}/extlibs/libs-mingw/x86")
set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${PROJECT_SOURCE_DIR}/extlibs/bin/x86") set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${PROJECT_SOURCE_DIR}/extlibs/bin/x86")
elseif(ARCH_64BITS) elseif(ARCH_64BITS)
set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${PROJECT_SOURCE_DIR}/extlibs/libs-mingw/x64")
set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${PROJECT_SOURCE_DIR}/extlibs/bin/x64") set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${PROJECT_SOURCE_DIR}/extlibs/bin/x64")
endif() endif()
elseif(COMPILER_MSVC) elseif(COMPILER_MSVC)