mirror of
https://github.com/cemu-project/vcpkg.git
synced 2025-02-23 02:57:09 +01:00
Merge pull request #1677 from JesseTG/jtg/allegro5-pkgconfig
Update allegro5
This commit is contained in:
commit
ae869a2886
@ -1,4 +1,4 @@
|
||||
Source: allegro5
|
||||
Version: 5.2.1.0
|
||||
Version: 5.2.2.0
|
||||
Description: Allegro is a cross-platform library mainly aimed at video game and multimedia programming. It handles common, low-level tasks such as creating windows, accepting user input, loading data, drawing images, playing sounds, etc. and generally abstracting away the underlying platform. However, Allegro is not a game engine: you are free to design and structure your program as you like.
|
||||
Build-Depends: opengl, zlib, freetype, libogg, libvorbis, libflac, openal-soft, libpng, bzip2, physfs, libtheora
|
||||
Build-Depends: opengl, zlib, freetype, libogg, libvorbis, libflac, openal-soft, libpng, bzip2, physfs, libtheora, opus, opusfile
|
@ -1,3 +1,24 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 72348fe..c6fbecb 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1010,14 +1010,9 @@ else()
|
||||
set(PKG_CONFIG_FILES allegro ${ADDON_PKG_CONFIG_FILES})
|
||||
endif(WANT_MONOLITH)
|
||||
|
||||
-# Install pkg-config files on Unix, and when cross-compiling on Unix.
|
||||
+# Install pkg-config files
|
||||
|
||||
-if(UNIX AND NOT WANT_FRAMEWORKS AND NOT IPHONE)
|
||||
- set(INSTALL_PKG_CONFIG_FILES true)
|
||||
-endif()
|
||||
-if(CMAKE_CROSSCOMPILING AND CMAKE_HOST_UNIX)
|
||||
- set(INSTALL_PKG_CONFIG_FILES true)
|
||||
-endif()
|
||||
+set(INSTALL_PKG_CONFIG_FILES true)
|
||||
|
||||
if(INSTALL_PKG_CONFIG_FILES)
|
||||
append_lib_type_suffix(lib_type)
|
||||
diff --git a/cmake/Common.cmake b/cmake/Common.cmake
|
||||
index 782196f..de29535 100644
|
||||
--- a/cmake/Common.cmake
|
||||
|
@ -11,19 +11,19 @@
|
||||
#
|
||||
|
||||
include(vcpkg_common_functions)
|
||||
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/allegro5-7d8892a9278c57f2d8bb1e555f9ec59cf9ed4f73)
|
||||
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/allegro5-e8b209bc20a60224859eb8a0cae082bd20d32ed1)
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH ${SOURCE_PATH}
|
||||
REPO liballeg/allegro5
|
||||
REF 7d8892a9278c57f2d8bb1e555f9ec59cf9ed4f73
|
||||
SHA512 b1531fa2f22023ecd4e053d03d1c54bf0b94aa3af004a3a06245c4d8278fea64e9d354467873ebd665301903d954795fed88e2467c88441f39c273e7e0d87d6e
|
||||
REF e8b209bc20a60224859eb8a0cae082bd20d32ed1
|
||||
SHA512 50b30d4b539bd4a2488d2b33e9fbfc6fdfd340039d9086993a5719bab3cb020ee6fe7f6d3578755a52c8aab9816d25cd74710ce93b0b374a2f97620b6138419d
|
||||
HEAD_REF master
|
||||
)
|
||||
|
||||
if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
|
||||
set(ALLEGRO_USE_STATIC -DSHARED=ON)
|
||||
set(ALLEGRO_USE_STATIC ON)
|
||||
else()
|
||||
set(ALLEGRO_USE_STATIC -DSHARED=OFF)
|
||||
set(ALLEGRO_USE_STATIC OFF)
|
||||
endif()
|
||||
|
||||
vcpkg_apply_patches(
|
||||
@ -39,7 +39,7 @@ vcpkg_configure_cmake(
|
||||
-DWANT_DOCS=OFF
|
||||
-DALLEGRO_SDL=OFF
|
||||
-DWANT_DEMO=OFF
|
||||
${ALLEGRO_USE_STATIC}
|
||||
-DSHARED=${ALLEGRO_USE_STATIC}
|
||||
-DWANT_EXAMPLES=OFF
|
||||
-DWANT_CURL_EXAMPLE=OFF
|
||||
-DWANT_TESTS=OFF
|
||||
@ -63,7 +63,7 @@ vcpkg_configure_cmake(
|
||||
-DWANT_OPENAL=ON
|
||||
-DWANT_OPENGL=ON
|
||||
-DWANT_OPENSL=OFF # Not yet available on vcpkg
|
||||
-DWANT_OPUS=OFF # opus is available on vcpkg, but opusfile isn't
|
||||
-DWANT_OPUS=ON
|
||||
-DWANT_PHYSFS=ON
|
||||
-DWANT_POPUP_EXAMPLES=OFF
|
||||
-DWANT_PRIMITIVES=ON
|
||||
|
Loading…
x
Reference in New Issue
Block a user