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 | |
| parent | 0caaf64b900c623f82e2d8f3ee314f92d9fd6edb (diff) | |
| download | vcpkg-68d1d2b1ebbce02634ea82eec04c32fd6b23a7b8.tar.gz vcpkg-68d1d2b1ebbce02634ea82eec04c32fd6b23a7b8.zip | |
[sdl1]Fix sdl1 conflict with sdl2 (#6011)
| -rw-r--r-- | ports/sdl1-net/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | ports/sdl1-net/CONTROL | 2 | ||||
| -rw-r--r-- | ports/sdl1/CONTROL | 2 | ||||
| -rw-r--r-- | ports/sdl1/portfile.cmake | 8 |
4 files changed, 10 insertions, 5 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 diff --git a/ports/sdl1/CONTROL b/ports/sdl1/CONTROL index 9d9e856f6..ce37bc05d 100644 --- a/ports/sdl1/CONTROL +++ b/ports/sdl1/CONTROL @@ -1,3 +1,3 @@ Source: sdl1 -Version: 1.2.15-4 +Version: 1.2.15-5 Description: Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D. diff --git a/ports/sdl1/portfile.cmake b/ports/sdl1/portfile.cmake index c3e580fbb..2cbdfc42c 100644 --- a/ports/sdl1/portfile.cmake +++ b/ports/sdl1/portfile.cmake @@ -34,7 +34,13 @@ vcpkg_install_msbuild( ALLOW_ROOT_INCLUDES ) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/doxyfile) +#Take all the fils into include/SDL to sovle conflict with SDL2 port +file(GLOB files ${CURRENT_PACKAGES_DIR}/include/*) +foreach(file ${files}) + file(COPY ${file} DESTINATION ${CURRENT_PACKAGES_DIR}/include/SDL) + file(REMOVE ${file}) +endforeach() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/SDL/doxyfile) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link) |