diff options
Diffstat (limited to 'media-libs/libsfml/files/libsfml-2.4.2-no-install-extlibs-mingw.patch')
| -rw-r--r-- | media-libs/libsfml/files/libsfml-2.4.2-no-install-extlibs-mingw.patch | 74 |
1 files changed, 0 insertions, 74 deletions
diff --git a/media-libs/libsfml/files/libsfml-2.4.2-no-install-extlibs-mingw.patch b/media-libs/libsfml/files/libsfml-2.4.2-no-install-extlibs-mingw.patch deleted file mode 100644 index b45063160e73..000000000000 --- a/media-libs/libsfml/files/libsfml-2.4.2-no-install-extlibs-mingw.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- SFML-2.4.2/CMakeLists.txt 2017-02-08 05:29:16.000000000 -0600 -+++ SFML-2.4.2.new/CMakeLists.txt 2017-06-05 22:12:39.166300154 -0500 -@@ -305,24 +305,26 @@ - # install 3rd-party libraries and tools - if(SFML_OS_WINDOWS) - -- # install the binaries of SFML dependencies -- if(ARCH_32BITS) -- install(DIRECTORY extlibs/bin/x86/ DESTINATION bin) -- if(SFML_COMPILER_MSVC AND SFML_MSVC_VERSION LESS 14) -- install(DIRECTORY extlibs/libs-msvc/x86/ DESTINATION lib) -- elseif(SFML_COMPILER_MSVC) -- install(DIRECTORY extlibs/libs-msvc-universal/x86/ DESTINATION lib) -- else() -- install(DIRECTORY extlibs/libs-mingw/x86/ DESTINATION lib) -- endif() -- elseif(ARCH_64BITS) -- install(DIRECTORY extlibs/bin/x64/ DESTINATION bin) -- if(SFML_COMPILER_MSVC AND SFML_MSVC_VERSION LESS 14) -- install(DIRECTORY extlibs/libs-msvc/x64/ DESTINATION lib) -- elseif(SFML_COMPILER_MSVC) -- install(DIRECTORY extlibs/libs-msvc-universal/x64/ DESTINATION lib) -- else() -- install(DIRECTORY extlibs/libs-mingw/x64/ DESTINATION lib) -+ if(NOT SFML_USE_SYSTEM_DEPS) -+ # install the binaries of SFML dependencies -+ if(ARCH_32BITS) -+ install(DIRECTORY extlibs/bin/x86/ DESTINATION bin) -+ if(SFML_COMPILER_MSVC AND SFML_MSVC_VERSION LESS 14) -+ install(DIRECTORY extlibs/libs-msvc/x86/ DESTINATION lib) -+ elseif(SFML_COMPILER_MSVC) -+ install(DIRECTORY extlibs/libs-msvc-universal/x86/ DESTINATION lib) -+ else() -+ install(DIRECTORY extlibs/libs-mingw/x86/ DESTINATION lib) -+ endif() -+ elseif(ARCH_64BITS) -+ install(DIRECTORY extlibs/bin/x64/ DESTINATION bin) -+ if(SFML_COMPILER_MSVC AND SFML_MSVC_VERSION LESS 14) -+ install(DIRECTORY extlibs/libs-msvc/x64/ DESTINATION lib) -+ elseif(SFML_COMPILER_MSVC) -+ install(DIRECTORY extlibs/libs-msvc-universal/x64/ DESTINATION lib) -+ else() -+ install(DIRECTORY extlibs/libs-mingw/x64/ DESTINATION lib) -+ endif() - endif() - endif() - -@@ -379,9 +381,11 @@ - install(DIRECTORY "${CMAKE_BINARY_DIR}/lib/\$ENV{CONFIGURATION}/" DESTINATION lib${LIB_SUFFIX}) - endif() - -- # since the iOS libraries are built as static, we must install the SFML dependencies -- # too so that the end user can easily link them to its final application -- install(FILES extlibs/libs-ios/libfreetype.a extlibs/libs-ios/libjpeg.a DESTINATION lib) -+ if(NOT SFML_USE_SYSTEM_DEPS) -+ # since the iOS libraries are built as static, we must install the SFML dependencies -+ # too so that the end user can easily link them to its final application -+ install(FILES extlibs/libs-ios/libfreetype.a extlibs/libs-ios/libjpeg.a DESTINATION lib) -+ endif() - - elseif(SFML_OS_ANDROID) - -@@ -389,7 +393,9 @@ - install(DIRECTORY extlibs/libs-android/${ANDROID_ABI} DESTINATION extlibs/lib) - install(FILES extlibs/Android.mk DESTINATION extlibs) - -- # install Android.mk so the NDK knows how to set up SFML -- install(FILES src/SFML/Android.mk DESTINATION .) -+ if(NOT SFML_USE_SYSTEM_DEPS) -+ # install Android.mk so the NDK knows how to set up SFML -+ install(FILES src/SFML/Android.mk DESTINATION .) -+ endif() - - endif() |