3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-26 17:41:09 +08:00
Code Issues Projects Releases Wiki Activity

[sdl1]Fix sdl1 conflict with sdl2 (#6011)

Browse Source
This commit is contained in:
LarryIII 2019-04-09 09:54:47 -07:00 committed by Phil Christensen
parent 0caaf64b90
commit 68d1d2b1eb
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ports/sdl1-net/CMakeLists.txt
View File

@ -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)

2
ports/sdl1-net/CONTROL
View File

@ -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

2
ports/sdl1/CONTROL
View File

@ -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.

8
ports/sdl1/portfile.cmake
View File

@ -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)