Skip to content

Fix sdl2 dependents #6199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cbezault wants to merge 1 commit into from
Closed

Fix sdl2 dependents #6199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion ports/sdl2-gfx/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@ cmake_minimum_required(VERSION 3.0)
project(SDL2_GFX C)

find_path(SDL_INCLUDE_DIR SDL2/SDL.h)
find_library(SDL_LIBRARY NAMES SDL2d SDL2)
find_library(SDL_LIBRARY_RELEASE NAMES SDL2)
find_library(SDL_LIBRARY_DEBUG NAMES SDL2d)
SET(SDL_LIBRARY
debug ${SDL_LIBRARY_DEBUG}
optimized ${SDL_LIBRARY_RELEASE}
)

# builtin formats
set(SDL_GFX_DEFINES WIN32)
Expand Down
2 changes: 1 addition & 1 deletion ports/sdl2-gfx/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Source: sdl2-gfx
Version: 1.0.4
Version: 1.0.4-1
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.
8 changes: 7 additions & 1 deletion ports/sdl2-mixer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,13 @@ cmake_minimum_required(VERSION 3.1)
project(SDL2_MIXER C)

find_path(SDL_INCLUDE_DIR SDL.h PATH_SUFFIXES SDL2)
find_library(SDL_LIBRARY NAMES SDL2d SDL2)
find_library(SDL_LIBRARY_RELEASE NAMES SDL2)
find_library(SDL_LIBRARY_DEBUG NAMES SDL2d)
set(SDL_LIBRARY
debug ${SDL_LIBRARY_DEBUG}
optimized ${SDL_LIBRARY_RELEASE}
)

set(SDL_MIXER_INCLUDES ${SDL_INCLUDE_DIR})
set(SDL_MIXER_LIBRARIES ${SDL_LIBRARY})

Expand Down
2 changes: 1 addition & 1 deletion ports/sdl2-mixer/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: sdl2-mixer
Version: 2.0.4-1
Version: 2.0.4-2
Description: Multi-channel audio mixer library for SDL.
Build-Depends: sdl2

Expand Down
7 changes: 6 additions & 1 deletion ports/sdl2-net/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@ if (MSVC)
endif()

find_path(SDL_INCLUDE_DIR SDL2/SDL.h)
find_library(SDL_LIBRARY NAMES SDL2d SDL2)
find_library(SDL_LIBRARY_RELEASE NAMES SDL2)
find_library(SDL_LIBRARY_DEBUG NAMES SDL2d)
SET(SDL_LIBRARY
debug ${SDL_LIBRARY_DEBUG}
optimized ${SDL_LIBRARY_RELEASE}
)

add_library(SDL2_net SDLnet.c SDLnetselect.c SDLnetTCP.c SDLnetUDP.c version.rc)

Expand Down
2 changes: 1 addition & 1 deletion ports/sdl2-net/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Source: sdl2-net
Version: 2.0.1-5
Version: 2.0.1-6
Description: Networking library for SDL
Build-Depends: sdl2
7 changes: 6 additions & 1 deletion ports/sdl2-ttf/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@ cmake_minimum_required(VERSION 3.0)
project(SDL2_TTF C)

find_path(SDL_INCLUDE_DIR SDL2/SDL.h)
find_library(SDL_LIBRARY NAMES SDL2d SDL2)
find_library(SDL_LIBRARY_RELEASE NAMES SDL2)
find_library(SDL_LIBRARY_DEBUG NAMES SDL2d)
SET(SDL_LIBRARY
debug ${SDL_LIBRARY_DEBUG}
optimized ${SDL_LIBRARY_RELEASE}
)
find_package(Freetype REQUIRED)

add_library(SDL2_ttf SDL_ttf.c version.rc)
Expand Down
2 changes: 1 addition & 1 deletion ports/sdl2-ttf/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Source: sdl2-ttf
Version: 2.0.15-1
Version: 2.0.15-2
Description: A library for rendering TrueType fonts with SDL
Build-Depends: sdl2, freetype
7 changes: 6 additions & 1 deletion ports/smpeg2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@ cmake_minimum_required(VERSION 2.6)
project(SMPEG2 CXX)

find_path(SDL_INCLUDE_DIR SDL2/SDL.h)
find_library(SDL_LIBRARY NAMES SDL2d SDL2)
find_library(SDL_LIBRARY_RELEASE NAMES SDL2)
find_library(SDL_LIBRARY_DEBUG NAMES SDL2d)
SET(SDL_LIBRARY
debug ${SDL_LIBRARY_DEBUG}
optimized ${SDL_LIBRARY_RELEASE}
)

include_directories(${SDL_INCLUDE_DIR})
include_directories(${SDL_INCLUDE_DIR}/SDL2)
Expand Down
2 changes: 1 addition & 1 deletion ports/smpeg2/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Source: smpeg2
Version: 2.0.0-5
Version: 2.0.0-6
Description: SDL MPEG Player Library
Build-Depends: sdl2