diff options
| author | Ryan Cheung <ryancheung.go@gmail.com> | 2018-05-18 23:15:52 +0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-05-18 08:15:52 -0700 |
| commit | 7ad1fcc376024b442baa67db6c1f2d10932a657b (patch) | |
| tree | 9050210588cb049de7f9014fdd9538ad3cba8589 /ports/sdl2-mixer | |
| parent | 5fe458d22e7a00422a518467f8060025d1d331b0 (diff) | |
| download | vcpkg-7ad1fcc376024b442baa67db6c1f2d10932a657b.tar.gz vcpkg-7ad1fcc376024b442baa67db6c1f2d10932a657b.zip | |
Package sdl2pp (#3430)
* Fix mpg123 build in macOS and Linux, fix sdl2-mixer find mpg123 libarry
* Add package sdl2pp
* [mpg123] Use Windows logic in Windows Desktop
* [sdl2-mixer] Bump package version
* [sdl2pp] Use patch instead of replacing CMakeLists.txt. Use vcpkg_from_github()
Diffstat (limited to 'ports/sdl2-mixer')
| -rw-r--r-- | ports/sdl2-mixer/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | ports/sdl2-mixer/CONTROL | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ports/sdl2-mixer/CMakeLists.txt b/ports/sdl2-mixer/CMakeLists.txt index 1df35c44a..6992521b1 100644 --- a/ports/sdl2-mixer/CMakeLists.txt +++ b/ports/sdl2-mixer/CMakeLists.txt @@ -7,14 +7,14 @@ set(SDL_MIXER_INCLUDES ${SDL_INCLUDE_DIR}) set(SDL_MIXER_LIBRARIES ${SDL_LIBRARY}) # builtin formats -set(SDL_MIXER_DEFINES +set(SDL_MIXER_DEFINES MUSIC_WAV MUSIC_MID_NATIVE) # MP3 support if(SDL_MIXER_ENABLE_MP3) find_path(MPG123_INCLUDE_DIR mpg123.h) - find_library(MPG123_LIBRARY libmpg123) + find_library(MPG123_LIBRARY NAMES libmpg123 mpg123) list(APPEND SDL_MIXER_INCLUDES ${MPG123_INCLUDE_DIR}) list(APPEND SDL_MIXER_LIBRARIES ${MPG123_LIBRARY}) list(APPEND SDL_MIXER_DEFINES MUSIC_MP3_MPG123) @@ -47,7 +47,7 @@ if(SDL_MIXER_ENABLE_OGGVORBIS) list(APPEND SDL_MIXER_DEFINES MUSIC_OGG) endif() -add_library(SDL2_mixer +add_library(SDL2_mixer effect_position.c effect_stereoreverse.c effects_internal.c diff --git a/ports/sdl2-mixer/CONTROL b/ports/sdl2-mixer/CONTROL index e66081fc7..7f953a2f9 100644 --- a/ports/sdl2-mixer/CONTROL +++ b/ports/sdl2-mixer/CONTROL @@ -1,4 +1,4 @@ Source: sdl2-mixer -Version: 2.0.2-2 +Version: 2.0.2-4 Description: Multi-channel audio mixer library for SDL. Build-Depends: sdl2, libflac, mpg123, libmodplug, libvorbis |