parent
4102203a15
commit
b2bef6b006
@ -0,0 +1,2 @@
|
|||||||
|
*crlf.patch -text
|
||||||
|
|
@ -1,32 +0,0 @@
|
|||||||
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 "")
|
|
@ -1,14 +0,0 @@
|
|||||||
This file is part of MXE.
|
|
||||||
See index.html for further information.
|
|
||||||
|
|
||||||
diff -urN SFML-2.0.orig/CMakeLists.txt SFML-2.0/CMakeLists.txt
|
|
||||||
--- SFML-2.0.orig/CMakeLists.txt 2013-02-25 20:16:00.000000000 -0300
|
|
||||||
+++ SFML-2.0/CMakeLists.txt 2013-06-24 10:39:42.514647661 -0300
|
|
||||||
@@ -51,6 +51,7 @@
|
|
||||||
# define SFML_STATIC if the build type is not set to 'shared'
|
|
||||||
if(NOT BUILD_SHARED_LIBS)
|
|
||||||
add_definitions(-DSFML_STATIC)
|
|
||||||
+ add_definitions(-DAL_LIBTYPE_STATIC)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# remove SL security warnings with Visual C++
|
|
@ -1,25 +0,0 @@
|
|||||||
This file is part of MXE.
|
|
||||||
See index.html for further information.
|
|
||||||
|
|
||||||
diff -urN SFML-2.0.orig/CMakeLists.txt SFML-2.0/CMakeLists.txt
|
|
||||||
--- SFML-2.0.orig/CMakeLists.txt 2013-06-24 10:56:39.114645000 -0300
|
|
||||||
+++ SFML-2.0/CMakeLists.txt 2013-06-24 10:58:33.294645192 -0300
|
|
||||||
@@ -187,18 +187,7 @@
|
|
||||||
COMPONENT devel)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
-install(FILES cmake/Modules/FindSFML.cmake DESTINATION ${INSTALL_MISC_DIR}/cmake/Modules)
|
|
||||||
-install(FILES license.txt DESTINATION ${INSTALL_MISC_DIR})
|
|
||||||
-install(FILES readme.txt DESTINATION ${INSTALL_MISC_DIR})
|
|
||||||
-
|
|
||||||
if(WINDOWS)
|
|
||||||
- if(ARCH_32BITS)
|
|
||||||
- install(FILES extlibs/bin/x86/libsndfile-1.dll DESTINATION bin)
|
|
||||||
- install(FILES extlibs/bin/x86/openal32.dll DESTINATION bin)
|
|
||||||
- elseif(ARCH_64BITS)
|
|
||||||
- install(FILES extlibs/bin/x64/libsndfile-1.dll DESTINATION bin)
|
|
||||||
- install(FILES extlibs/bin/x64/openal32.dll DESTINATION bin)
|
|
||||||
- endif()
|
|
||||||
elseif(MACOSX)
|
|
||||||
install(DIRECTORY extlibs/libs-osx/Frameworks/sndfile.framework DESTINATION ${CMAKE_INSTALL_FRAMEWORK_PREFIX})
|
|
||||||
install(DIRECTORY extlibs/libs-osx/Frameworks/freetype.framework DESTINATION ${CMAKE_INSTALL_FRAMEWORK_PREFIX})
|
|
Loading…
Reference in new issue