diff options
| author | Tony Theodore <tonyt@logyst.com> | 2015-09-05 08:31:54 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2015-09-05 08:31:54 (GMT) |
| commit | 3e134a29e4aa7b2f2eecfd56c5e4f965cce3e8af (patch) | |
| tree | 9cb1e229f47e1d701eeac759f8868b4b4cb2bfa5 | |
| parent | 0691f569eb5ed6f5b38d1f40df39b795ff5ae404 (diff) | |
| download | mxe-3e134a29e4aa7b2f2eecfd56c5e4f965cce3e8af.zip mxe-3e134a29e4aa7b2f2eecfd56c5e4f965cce3e8af.tar.gz mxe-3e134a29e4aa7b2f2eecfd56c5e4f965cce3e8af.tar.bz2 | |
sfml: update 2.2 -> 2.3.1 and fix external lib installation
| -rw-r--r-- | src/sfml-1-fixes-crlf.patch | 28 | ||||
| -rw-r--r-- | src/sfml.mk | 14 |
2 files changed, 10 insertions, 32 deletions
diff --git a/src/sfml-1-fixes-crlf.patch b/src/sfml-1-fixes-crlf.patch index 287dae6..2de432d 100644 --- a/src/sfml-1-fixes-crlf.patch +++ b/src/sfml-1-fixes-crlf.patch @@ -6,7 +6,7 @@ Contains ad hoc patches for cross building. From 4e522133482f3f37ee8f498a35294eb31738e307 Mon Sep 17 00:00:00 2001 From: MXE Date: Sat, 6 Jul 2013 17:55:39 +1000 -Subject: dont install dlls and fix openal static +Subject: fix openal static diff --git a/CMakeLists.txt b/CMakeLists.txt @@ -22,29 +22,3 @@ index bf5a805..78e5630 100755 # remove SL security warnings with Visual C++ -@@ -248,22 +248,6 @@ - # 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) -- install(DIRECTORY extlibs/libs-msvc/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) -- install(DIRECTORY extlibs/libs-msvc/x64/ DESTINATION lib) -- else() -- install(DIRECTORY extlibs/libs-mingw/x64/ DESTINATION lib) -- endif() -- endif() - - elseif(SFML_OS_MACOSX) - --- -1.8.2.3 - diff --git a/src/sfml.mk b/src/sfml.mk index 182a84b..8899d4b 100644 --- a/src/sfml.mk +++ b/src/sfml.mk @@ -3,8 +3,8 @@ PKG := sfml $(PKG)_IGNORE := -$(PKG)_VERSION := 2.2 -$(PKG)_CHECKSUM := b21721a3dc221a790e4b81d6ba358c16cb1c1cd3 +$(PKG)_VERSION := 2.3.1 +$(PKG)_CHECKSUM := d3dbcd92843be5c2a432f6ad17b6576a7613e7de $(PKG)_SUBDIR := SFML-$($(PKG)_VERSION) $(PKG)_FILE := SFML-$($(PKG)_VERSION)-sources.zip $(PKG)_URL := http://sfml-dev.org/download/sfml/$($(PKG)_VERSION)/$($(PKG)_FILE) @@ -20,16 +20,20 @@ define $(PKG)_BUILD mkdir '$(1)/build' cd '$(1)/build' && cmake .. \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - -DFREETYPE_INCLUDE_DIRS='$(PREFIX)/$(TARGET)/include/freetype2' + -DSFML_BUILD_EXAMPLES=FALSE \ + -DSFML_BUILD_DOC=FALSE - $(MAKE) -C '$(1)/build' -j '$(JOBS)' install VERBOSE=1 + # build and install libs + $(MAKE) -C '$(1)/build/src/SFML' -j '$(JOBS)' install VERBOSE=1 + # install headers + cmake -DCOMPONENT=devel -P '$(1)/build/cmake_install.cmake' # create pkg-config file $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib/pkgconfig' (echo 'Name: sfml'; \ echo 'Version: 0'; \ echo 'Description: sfml'; \ - echo 'Requires: freetype2 glew openal sndfile vorbisenc'; \ + echo 'Requires: freetype2 glew openal sndfile vorbisenc vorbisfile'; \ echo 'Cflags: -DSFML_STATIC'; \ echo 'Libs: -lsfml-audio-s -lsfml-network-s -lsfml-graphics-s -lsfml-window-s -lsfml-system-s'; \ echo 'Libs.private: -ljpeg -lws2_32 -lgdi32';) \ |