aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Karatarakis <alex@karatarakis.com>2018-01-10 12:27:59 -0800
committerGitHub <noreply@github.com>2018-01-10 12:27:59 -0800
commit005b7d940f007b607cb1626130a2c8f3e55fd6c9 (patch)
treee48c5c94eaf75cf16262093cb8b056bf027c4658
parent5e12b19f6bd8e44cb46a9e0ecd947e7a66c19f80 (diff)
parent2ad118a2532e99a78c41dffa1b9648e7eca20a95 (diff)
downloadvcpkg-005b7d940f007b607cb1626130a2c8f3e55fd6c9.tar.gz
vcpkg-005b7d940f007b607cb1626130a2c8f3e55fd6c9.zip
Merge pull request #2539 from procxx/missing_version_rc
Add missing version.rc file to sdl2 libraries.
-rw-r--r--ports/sdl2-image/CMakeLists.txt1
-rw-r--r--ports/sdl2-image/CONTROL2
-rw-r--r--ports/sdl2-mixer/CMakeLists.txt3
-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
8 files changed, 9 insertions, 7 deletions
diff --git a/ports/sdl2-image/CMakeLists.txt b/ports/sdl2-image/CMakeLists.txt
index e950e16df..0df7e7d36 100644
--- a/ports/sdl2-image/CMakeLists.txt
+++ b/ports/sdl2-image/CMakeLists.txt
@@ -42,6 +42,7 @@ add_library(SDL2_image
IMG_xpm.c
IMG_xv.c
IMG_xxx.c
+ version.rc
)
set_target_properties(SDL2_image PROPERTIES DEFINE_SYMBOL SDL2_EXPORTS)
diff --git a/ports/sdl2-image/CONTROL b/ports/sdl2-image/CONTROL
index 21e22f872..f9d5e14ed 100644
--- a/ports/sdl2-image/CONTROL
+++ b/ports/sdl2-image/CONTROL
@@ -1,5 +1,5 @@
Source: sdl2-image
-Version: 2.0.2
+Version: 2.0.2-1
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 3a2aa0780..1df35c44a 100644
--- a/ports/sdl2-mixer/CMakeLists.txt
+++ b/ports/sdl2-mixer/CMakeLists.txt
@@ -68,7 +68,8 @@ add_library(SDL2_mixer
music_timidity.c
music_wav.c
native_midi/native_midi_common.c
- native_midi/native_midi_win32.c)
+ native_midi/native_midi_win32.c
+ version.rc)
set_target_properties(SDL2_mixer PROPERTIES DEFINE_SYMBOL SDL2_EXPORTS)
target_compile_definitions(SDL2_mixer PRIVATE ${SDL_MIXER_DEFINES})
diff --git a/ports/sdl2-mixer/CONTROL b/ports/sdl2-mixer/CONTROL
index 978b87d13..e66081fc7 100644
--- a/ports/sdl2-mixer/CONTROL
+++ b/ports/sdl2-mixer/CONTROL
@@ -1,4 +1,4 @@
Source: sdl2-mixer
-Version: 2.0.2-1
+Version: 2.0.2-2
Description: Multi-channel audio mixer library for SDL.
Build-Depends: sdl2, libflac, mpg123, libmodplug, libvorbis
diff --git a/ports/sdl2-net/CMakeLists.txt b/ports/sdl2-net/CMakeLists.txt
index 4127262d7..aea5f005e 100644
--- a/ports/sdl2-net/CMakeLists.txt
+++ b/ports/sdl2-net/CMakeLists.txt
@@ -6,7 +6,7 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4244 /wd4996")
find_path(SDL_INCLUDE_DIR SDL2/SDL.h)
find_library(SDL_LIBRARY NAMES SDL2d SDL2)
-add_library(SDL2_net SDLnet.c SDLnetselect.c SDLnetTCP.c SDLnetUDP.c)
+add_library(SDL2_net SDLnet.c SDLnetselect.c SDLnetTCP.c SDLnetUDP.c version.rc)
set_target_properties(SDL2_net PROPERTIES DEFINE_SYMBOL SDL2_EXPORTS)
target_compile_definitions(SDL2_net PRIVATE _WINSOCK_DEPRECATED_NO_WARNINGS)
diff --git a/ports/sdl2-net/CONTROL b/ports/sdl2-net/CONTROL
index 6b2793449..ff239d5a4 100644
--- a/ports/sdl2-net/CONTROL
+++ b/ports/sdl2-net/CONTROL
@@ -1,4 +1,4 @@
Source: sdl2-net
-Version: 2.0.1-3
+Version: 2.0.1-4
Description: Networking library for SDL
Build-Depends: sdl2
diff --git a/ports/sdl2-ttf/CMakeLists.txt b/ports/sdl2-ttf/CMakeLists.txt
index 7e3a180f9..7c3e8fc77 100644
--- a/ports/sdl2-ttf/CMakeLists.txt
+++ b/ports/sdl2-ttf/CMakeLists.txt
@@ -5,7 +5,7 @@ find_path(SDL_INCLUDE_DIR SDL2/SDL.h)
find_library(SDL_LIBRARY NAMES SDL2d SDL2)
find_package(FreeType REQUIRED)
-add_library(SDL2_ttf SDL_ttf.c)
+add_library(SDL2_ttf SDL_ttf.c version.rc)
set_target_properties(SDL2_ttf PROPERTIES DEFINE_SYMBOL SDL2_EXPORTS)
target_include_directories(SDL2_ttf PRIVATE ${SDL_INCLUDE_DIR}/SDL2 ${FREETYPE_INCLUDE_DIR_ft2build})
diff --git a/ports/sdl2-ttf/CONTROL b/ports/sdl2-ttf/CONTROL
index 18773dd21..362daf221 100644
--- a/ports/sdl2-ttf/CONTROL
+++ b/ports/sdl2-ttf/CONTROL
@@ -1,4 +1,4 @@
Source: sdl2-ttf
-Version: 2.0.14-3
+Version: 2.0.14-4
Description: A library for rendering TrueType fonts with SDL
Build-Depends: sdl2, freetype