diff options
| author | LarryIII <33021067+LarryIII@users.noreply.github.com> | 2019-04-09 09:54:47 -0700 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-04-09 09:54:47 -0700 |
| commit | 68d1d2b1ebbce02634ea82eec04c32fd6b23a7b8 (patch) | |
| tree | ed67c2b4c2d450899717e6fc150b18a2d2499fde /ports/sdl1-net | |
| parent | 0caaf64b900c623f82e2d8f3ee314f92d9fd6edb (diff) | |
| download | vcpkg-68d1d2b1ebbce02634ea82eec04c32fd6b23a7b8.tar.gz vcpkg-68d1d2b1ebbce02634ea82eec04c32fd6b23a7b8.zip | |
[sdl1]Fix sdl1 conflict with sdl2 (#6011)
Diffstat (limited to 'ports/sdl1-net')
| -rw-r--r-- | ports/sdl1-net/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | ports/sdl1-net/CONTROL | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/ports/sdl1-net/CMakeLists.txt b/ports/sdl1-net/CMakeLists.txt index 05bdac9f8..1e1f95171 100644 --- a/ports/sdl1-net/CMakeLists.txt +++ b/ports/sdl1-net/CMakeLists.txt @@ -5,8 +5,7 @@ if (MSVC) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4244 /wd4996") endif() -find_path(SDL_INCLUDE_DIR SDL.h) -find_library(SDL_LIBRARY NAMES SDLd SDL) +find_package(SDL) add_library(SDL_net SDLnet.c SDLnetselect.c SDLnetTCP.c SDLnetUDP.c version.rc) diff --git a/ports/sdl1-net/CONTROL b/ports/sdl1-net/CONTROL index ae968e581..61544abec 100644 --- a/ports/sdl1-net/CONTROL +++ b/ports/sdl1-net/CONTROL @@ -1,4 +1,4 @@ Source: sdl1-net -Version: 1.2.8-2 +Version: 1.2.8-3 Description: Networking library for SDL Build-Depends: sdl1 |