mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-27 12:49:44 +08:00
7ad1fcc376
* 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()
55 lines
1.7 KiB
Diff
55 lines
1.7 KiB
Diff
diff --git a/cmake/FindSDL2.cmake b/cmake/FindSDL2.cmake
|
|
index 8b2addb..4def5f3 100644
|
|
--- a/cmake/FindSDL2.cmake
|
|
+++ b/cmake/FindSDL2.cmake
|
|
@@ -8,8 +8,8 @@
|
|
|
|
FIND_PATH(SDL2_INCLUDE_DIR NAMES SDL.h PATH_SUFFIXES SDL2)
|
|
|
|
-FIND_LIBRARY(SDL2_LIBRARY NAMES SDL2)
|
|
-FIND_LIBRARY(SDL2MAIN_LIBRARY NAMES SDL2main)
|
|
+FIND_LIBRARY(SDL2_LIBRARY NAMES SDL2d SDL2)
|
|
+FIND_LIBRARY(SDL2MAIN_LIBRARY NAMES SDL2maind SDL2main)
|
|
|
|
INCLUDE(FindPackageHandleStandardArgs)
|
|
|
|
diff --git a/cmake/FindSDL2_image.cmake b/cmake/FindSDL2_image.cmake
|
|
index 88adb3f..d6e829d 100644
|
|
--- a/cmake/FindSDL2_image.cmake
|
|
+++ b/cmake/FindSDL2_image.cmake
|
|
@@ -8,7 +8,7 @@
|
|
|
|
FIND_PATH(SDL2_IMAGE_INCLUDE_DIR NAMES SDL_image.h PATH_SUFFIXES SDL2)
|
|
|
|
-FIND_LIBRARY(SDL2_IMAGE_LIBRARY NAMES SDL2_image)
|
|
+FIND_LIBRARY(SDL2_IMAGE_LIBRARY NAMES SDL2_imaged SDL2_image)
|
|
|
|
INCLUDE(FindPackageHandleStandardArgs)
|
|
|
|
diff --git a/cmake/FindSDL2_mixer.cmake b/cmake/FindSDL2_mixer.cmake
|
|
index ef5748b..c2dbbde 100644
|
|
--- a/cmake/FindSDL2_mixer.cmake
|
|
+++ b/cmake/FindSDL2_mixer.cmake
|
|
@@ -8,7 +8,7 @@
|
|
|
|
FIND_PATH(SDL2_MIXER_INCLUDE_DIR NAMES SDL_mixer.h PATH_SUFFIXES SDL2)
|
|
|
|
-FIND_LIBRARY(SDL2_MIXER_LIBRARY NAMES SDL2_mixer)
|
|
+FIND_LIBRARY(SDL2_MIXER_LIBRARY NAMES SDL2_mixerd SDL2_mixer)
|
|
|
|
INCLUDE(FindPackageHandleStandardArgs)
|
|
|
|
diff --git a/cmake/FindSDL2_ttf.cmake b/cmake/FindSDL2_ttf.cmake
|
|
index b480d55..9fb65b9 100644
|
|
--- a/cmake/FindSDL2_ttf.cmake
|
|
+++ b/cmake/FindSDL2_ttf.cmake
|
|
@@ -8,7 +8,7 @@
|
|
|
|
FIND_PATH(SDL2_TTF_INCLUDE_DIR NAMES SDL_ttf.h PATH_SUFFIXES SDL2)
|
|
|
|
-FIND_LIBRARY(SDL2_TTF_LIBRARY NAMES SDL2_ttf)
|
|
+FIND_LIBRARY(SDL2_TTF_LIBRARY NAMES SDL2_ttfd SDL2_ttf)
|
|
|
|
INCLUDE(FindPackageHandleStandardArgs)
|
|
|