mxe/src/sfml-1-disable-merge-libs.p...

33 lines
1.4 KiB
Diff

This file is part of MXE.
See index.html for further information.
diff -urN SFML-2.0.orig/cmake/Macros.cmake SFML-2.0/cmake/Macros.cmake
--- SFML-2.0.orig/cmake/Macros.cmake 2013-04-06 10:17:56.000000000 -0300
+++ SFML-2.0/cmake/Macros.cmake 2013-06-24 09:45:56.694654704 -0300
@@ -11,25 +11,6 @@
# out-of-the-box (CMake forwards the dependencies automatically)
macro(sfml_static_add_libraries target)
if(WINDOWS AND COMPILER_GCC)
- # Windows - gcc
- foreach(lib ${ARGN})
- if(NOT ${lib} MATCHES ".*/.*")
- string(REGEX REPLACE "(.*)/bin/.*\\.exe" "\\1" STANDARD_LIBS_PATH "${CMAKE_CXX_COMPILER}")
- if(COMPILER_GCC_W64)
- set(lib "${STANDARD_LIBS_PATH}/${GCC_MACHINE}/lib/lib${lib}.a")
- else()
- set(lib "${STANDARD_LIBS_PATH}/lib/lib${lib}.a")
- endif()
- endif()
- string(TOUPPER ${CMAKE_BUILD_TYPE} BUILD_TYPE)
- get_target_property(TARGET_FILENAME ${target} ${BUILD_TYPE}_LOCATION)
- add_custom_command(TARGET ${target}
- POST_BUILD
- COMMAND ${CMAKE_AR} x ${lib}
- COMMAND ${CMAKE_AR} rcs ${TARGET_FILENAME} *.o
- COMMAND del *.o /f /q
- VERBATIM)
- endforeach()
elseif(MSVC)
# Visual C++
set(LIBRARIES "")