aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-10-19 19:24:49 -0700
committerRobert Schumacher <roschuma@microsoft.com>2017-10-19 19:24:49 -0700
commitdeee8c1743af2d851d48d42b7ac91558c8fefb5a (patch)
treee73db0d4cc152de8e7e2cc84928c1e9a6cb03f1e
parentb3172b1784ed15d4c310793474e285222fc669a4 (diff)
downloadvcpkg-deee8c1743af2d851d48d42b7ac91558c8fefb5a.tar.gz
vcpkg-deee8c1743af2d851d48d42b7ac91558c8fefb5a.zip
[sdl2-gfx][sdl2-image][sdl2-mixer][sdl2-net][sdl2-ttf] Fix accidental link of release libs in debug mode.
-rw-r--r--ports/sdl2-gfx/CMakeLists.txt2
-rw-r--r--ports/sdl2-gfx/CONTROL2
-rw-r--r--ports/sdl2-image/CMakeLists.txt2
-rw-r--r--ports/sdl2-image/CONTROL2
-rw-r--r--ports/sdl2-mixer/CMakeLists.txt2
-rw-r--r--ports/sdl2-mixer/CONTROL2
-rw-r--r--ports/sdl2-net/CMakeLists.txt2
-rw-r--r--ports/sdl2-net/CONTROL2
-rw-r--r--ports/sdl2-ttf/CMakeLists.txt2
-rw-r--r--ports/sdl2-ttf/CONTROL2
10 files changed, 10 insertions, 10 deletions
diff --git a/ports/sdl2-gfx/CMakeLists.txt b/ports/sdl2-gfx/CMakeLists.txt
index d0a9f0c82..6a0ecf24e 100644
--- a/ports/sdl2-gfx/CMakeLists.txt
+++ b/ports/sdl2-gfx/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0)
project(SDL2_GFX C)
find_path(SDL_INCLUDE_DIR SDL2/SDL.h)
-find_library(SDL_LIBRARY SDL2)
+find_library(SDL_LIBRARY NAMES SDL2d SDL2)
# builtin formats
set(SDL_GFX_DEFINES WIN32)
diff --git a/ports/sdl2-gfx/CONTROL b/ports/sdl2-gfx/CONTROL
index 0e0b71aec..a06c8abcb 100644
--- a/ports/sdl2-gfx/CONTROL
+++ b/ports/sdl2-gfx/CONTROL
@@ -1,4 +1,4 @@
Source: sdl2-gfx
-Version: 1.0.3-2
+Version: 1.0.3-3
Build-Depends: sdl2
Description: Graphics primitives (line, circle, rectangle etc.) with AA support, rotozoomer and other drawing related support functions wrapped up in a C based add-on library for the Simple Direct Media (SDL) cross-platform API layer.
diff --git a/ports/sdl2-image/CMakeLists.txt b/ports/sdl2-image/CMakeLists.txt
index 8b5f7131f..d04b3f7b6 100644
--- a/ports/sdl2-image/CMakeLists.txt
+++ b/ports/sdl2-image/CMakeLists.txt
@@ -51,7 +51,7 @@ endforeach(FORMAT)
# SDL
find_path(SDL_INCLUDE_DIR SDL2/SDL.h)
-find_library(SDL_LIBRARY SDL2)
+find_library(SDL_LIBRARY NAMES SDL2d SDL2)
include_directories(${SDL_INCLUDE_DIR})
include_directories(${SDL_INCLUDE_DIR}/SDL2)
diff --git a/ports/sdl2-image/CONTROL b/ports/sdl2-image/CONTROL
index a5c41a334..aff048d9a 100644
--- a/ports/sdl2-image/CONTROL
+++ b/ports/sdl2-image/CONTROL
@@ -1,5 +1,5 @@
Source: sdl2-image
-Version: 2.0.1-2
+Version: 2.0.1-3
Build-Depends: sdl2, libpng, libjpeg-turbo, tiff, libwebp
Description: SDL_image is an image file loading library. It loads images as SDL surfaces and textures, and supports the following formats: BMP, GIF, JPEG, LBM, PCX, PNG, PNM, TGA, TIFF, WEBP, XCF, XPM, XV
diff --git a/ports/sdl2-mixer/CMakeLists.txt b/ports/sdl2-mixer/CMakeLists.txt
index 6d1cb28c0..014923628 100644
--- a/ports/sdl2-mixer/CMakeLists.txt
+++ b/ports/sdl2-mixer/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0)
project(SDL2_MIXER C)
find_path(SDL_INCLUDE_DIR SDL.h PATH_SUFFIXES SDL2)
-find_library(SDL_LIBRARY SDL2)
+find_library(SDL_LIBRARY NAMES SDL2d SDL2)
set(SDL_MIXER_INCLUDES ${SDL_INCLUDE_DIR})
set(SDL_MIXER_LIBRARIES ${SDL_LIBRARY})
diff --git a/ports/sdl2-mixer/CONTROL b/ports/sdl2-mixer/CONTROL
index 756a7380d..f0ef29fbd 100644
--- a/ports/sdl2-mixer/CONTROL
+++ b/ports/sdl2-mixer/CONTROL
@@ -1,4 +1,4 @@
Source: sdl2-mixer
-Version: 2.0.1-2
+Version: 2.0.1-3
Description: Multi-channel audio mixer library for SDL.
Build-Depends: sdl2, libflac, smpeg2, libmodplug, libvorbis
diff --git a/ports/sdl2-net/CMakeLists.txt b/ports/sdl2-net/CMakeLists.txt
index 9b81f8d42..4127262d7 100644
--- a/ports/sdl2-net/CMakeLists.txt
+++ b/ports/sdl2-net/CMakeLists.txt
@@ -4,7 +4,7 @@ project(SDL2_NET C)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4244 /wd4996")
find_path(SDL_INCLUDE_DIR SDL2/SDL.h)
-find_library(SDL_LIBRARY SDL2)
+find_library(SDL_LIBRARY NAMES SDL2d SDL2)
add_library(SDL2_net SDLnet.c SDLnetselect.c SDLnetTCP.c SDLnetUDP.c)
diff --git a/ports/sdl2-net/CONTROL b/ports/sdl2-net/CONTROL
index e64277b39..6b2793449 100644
--- a/ports/sdl2-net/CONTROL
+++ b/ports/sdl2-net/CONTROL
@@ -1,4 +1,4 @@
Source: sdl2-net
-Version: 2.0.1-2
+Version: 2.0.1-3
Description: Networking library for SDL
Build-Depends: sdl2
diff --git a/ports/sdl2-ttf/CMakeLists.txt b/ports/sdl2-ttf/CMakeLists.txt
index 133616479..7e3a180f9 100644
--- a/ports/sdl2-ttf/CMakeLists.txt
+++ b/ports/sdl2-ttf/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0)
project(SDL2_TTF C)
find_path(SDL_INCLUDE_DIR SDL2/SDL.h)
-find_library(SDL_LIBRARY SDL2)
+find_library(SDL_LIBRARY NAMES SDL2d SDL2)
find_package(FreeType REQUIRED)
add_library(SDL2_ttf SDL_ttf.c)
diff --git a/ports/sdl2-ttf/CONTROL b/ports/sdl2-ttf/CONTROL
index 7dbe06367..18773dd21 100644
--- a/ports/sdl2-ttf/CONTROL
+++ b/ports/sdl2-ttf/CONTROL
@@ -1,4 +1,4 @@
Source: sdl2-ttf
-Version: 2.0.14-2
+Version: 2.0.14-3
Description: A library for rendering TrueType fonts with SDL
Build-Depends: sdl2, freetype