Merge pull request #356 from eXpl0it3r/master

Added external libraries for MinGW x64 compilers
SFML · Feb 19, 2013 · 4fbefe7 · 4fbefe7
2 parents 274d316 + 4a64201
commit 4fbefe7
Show file tree

Hide file tree

Showing 11 changed files with 2 additions and 1 deletion.
diff --git a/extlibs/libs-mingw/x64/libfreetype.a b/extlibs/libs-mingw/x64/libfreetype.a
diff --git a/extlibs/libs-mingw/x64/libglew32.a b/extlibs/libs-mingw/x64/libglew32.a
diff --git a/extlibs/libs-mingw/x64/libjpeg.a b/extlibs/libs-mingw/x64/libjpeg.a
diff --git a/extlibs/libs-mingw/x64/libsndfile.a b/extlibs/libs-mingw/x64/libsndfile.a
diff --git a/extlibs/libs-mingw/x64/openal32.a b/extlibs/libs-mingw/x64/openal32.a
diff --git a/extlibs/libs-mingw/libfreetype.a → extlibs/libs-mingw/x86/libfreetype.a b/extlibs/libs-mingw/libfreetype.a → extlibs/libs-mingw/x86/libfreetype.a
diff --git a/extlibs/libs-mingw/libglew.a → extlibs/libs-mingw/x86/libglew.a b/extlibs/libs-mingw/libglew.a → extlibs/libs-mingw/x86/libglew.a
diff --git a/extlibs/libs-mingw/libjpeg.a → extlibs/libs-mingw/x86/libjpeg.a b/extlibs/libs-mingw/libjpeg.a → extlibs/libs-mingw/x86/libjpeg.a
diff --git a/extlibs/libs-mingw/libopenal32.a → extlibs/libs-mingw/x86/libopenal32.a b/extlibs/libs-mingw/libopenal32.a → extlibs/libs-mingw/x86/libopenal32.a
diff --git a/extlibs/libs-mingw/libsndfile.a → extlibs/libs-mingw/x86/libsndfile.a b/extlibs/libs-mingw/libsndfile.a → extlibs/libs-mingw/x86/libsndfile.a
diff --git a/src/SFML/CMakeLists.txt b/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)