Permalink
Browse files

Merge pull request #356 from eXpl0it3r/master

Added external libraries for MinGW x64 compilers
  • Loading branch information...
2 parents 274d316 + 4a64201 commit 4fbefe7469d8bb9c02ada77ef44788381c694b54 @LaurentGomila LaurentGomila committed Feb 19, 2013
View
BIN extlibs/libs-mingw/x64/libfreetype.a
Binary file not shown.
View
BIN extlibs/libs-mingw/x64/libglew32.a
Binary file not shown.
View
BIN extlibs/libs-mingw/x64/libjpeg.a
Binary file not shown.
View
BIN extlibs/libs-mingw/x64/libsndfile.a
Binary file not shown.
View
BIN extlibs/libs-mingw/x64/openal32.a
Binary file not shown.
View
0 extlibs/libs-mingw/libfreetype.a → extlibs/libs-mingw/x86/libfreetype.a
File renamed without changes.
View
0 extlibs/libs-mingw/libglew.a → extlibs/libs-mingw/x86/libglew.a
File renamed without changes.
View
0 extlibs/libs-mingw/libjpeg.a → extlibs/libs-mingw/x86/libjpeg.a
File renamed without changes.
View
0 extlibs/libs-mingw/libopenal32.a → extlibs/libs-mingw/x86/libopenal32.a
File renamed without changes.
View
0 extlibs/libs-mingw/libsndfile.a → extlibs/libs-mingw/x86/libsndfile.a
File renamed without changes.
View
3 src/SFML/CMakeLists.txt
@@ -6,10 +6,11 @@ include(${PROJECT_SOURCE_DIR}/cmake/Macros.cmake)
if (WINDOWS)
set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} "${PROJECT_SOURCE_DIR}/extlibs/headers")
if(COMPILER_GCC)
- set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${PROJECT_SOURCE_DIR}/extlibs/libs-mingw")
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")
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")
endif()
elseif(COMPILER_MSVC)

0 comments on commit 4fbefe7

Please sign in to comment.