mirror of https://git.wownero.com/dsc/mxe.git
sfml: updated (including patch modifications)
This commit is contained in:
parent
8100a43f39
commit
5187f11165
|
@ -9,15 +9,14 @@ Subject: fix openal static
|
|||
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index bf5a805..78e5630 100755
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -87,6 +87,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++
|
||||
index 1111111..2222222 100644
|
||||
--- a/cmake/Macros.cmake
|
||||
+++ b/cmake/Macros.cmake
|
||||
@@ -173,6 +173,7 @@
|
||||
# define SFML_STATIC if the build type is not set to 'shared'
|
||||
if(NOT BUILD_SHARED_LIBS)
|
||||
target_compile_definitions(${target} PUBLIC "SFML_STATIC")
|
||||
+ target_compile_definitions(${target} PUBLIC "AL_LIBTYPE_STATIC")
|
||||
endif()
|
||||
|
||||
endmacro()
|
||||
|
|
18
src/sfml.mk
18
src/sfml.mk
|
@ -4,8 +4,8 @@ PKG := sfml
|
|||
$(PKG)_WEBSITE := https://www.sfml-dev.org/
|
||||
$(PKG)_DESCR := SFML
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION := 2.4.2
|
||||
$(PKG)_CHECKSUM := cf268fb487e4048c85e5b2f53d62596854762c98cba1c1b61ccd91f78253ef4b
|
||||
$(PKG)_VERSION := 2.5.0
|
||||
$(PKG)_CHECKSUM := 4bc5ed0b6658f73a31bfb8b36878d71fe1678e6e95e4f20834ab589a1bdc7ef4
|
||||
$(PKG)_GH_CONF := SFML/SFML/tags
|
||||
$(PKG)_DEPS := cc freetype glew jpeg libsndfile openal
|
||||
|
||||
|
@ -22,18 +22,22 @@ define $(PKG)_BUILD
|
|||
# create pkg-config file
|
||||
$(INSTALL) -d '$(PREFIX)/$(TARGET)/lib/pkgconfig'
|
||||
(echo 'Name: sfml'; \
|
||||
echo 'Version: 0'; \
|
||||
echo 'Version: $($(PKG)_VERSION)'; \
|
||||
echo 'Description: sfml'; \
|
||||
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'; \
|
||||
$(if $(findstring static,$(TARGET)), \
|
||||
echo 'Cflags: -DSFML_STATIC'; \
|
||||
echo 'Libs: -lsfml-audio-s -lsfml-network-s -lsfml-graphics-s -lsfml-window-s -lsfml-system-s'; \
|
||||
$(else), \
|
||||
echo 'Cflags: -DSFML_SHARED'; \
|
||||
echo 'Libs: -lsfml-audio -lsfml-network -lsfml-graphics -lsfml-window -lsfml-system'; \
|
||||
) \
|
||||
echo 'Libs.private: -ljpeg -lws2_32 -lgdi32';) \
|
||||
> '$(PREFIX)/$(TARGET)/lib/pkgconfig/sfml.pc'
|
||||
cat '$(PREFIX)/$(TARGET)/lib/pkgconfig/sfml.pc'
|
||||
|
||||
'$(TARGET)-g++' \
|
||||
-W -Wall -Werror -ansi -pedantic \
|
||||
'$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-sfml.exe' \
|
||||
`$(TARGET)-pkg-config --cflags --libs sfml`
|
||||
endef
|
||||
|
||||
$(PKG)_BUILD_SHARED =
|
||||
|
|
Loading…
Reference in New Issue