mirror of
https://github.com/clangen/musikcube.git
synced 2024-10-02 04:52:32 +00:00
Update to libcurl-8.0.1
This commit is contained in:
parent
81c5ab44f0
commit
53b2c789d0
@ -24,7 +24,4 @@ if (CMAKE_SYSTEM_NAME MATCHES "Darwin" OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR
|
|||||||
"${BSD_PATH_PREFIX}/lib"
|
"${BSD_PATH_PREFIX}/lib"
|
||||||
"${BSD_PATH_PREFIX}/opt/openssl/lib"
|
"${BSD_PATH_PREFIX}/opt/openssl/lib"
|
||||||
"${BSD_PATH_PREFIX}/opt/ncurses/lib")
|
"${BSD_PATH_PREFIX}/opt/ncurses/lib")
|
||||||
|
|
||||||
include_directories("${BSD_PATH_PREFIX}/include")
|
|
||||||
link_directories("${BSD_PATH_PREFIX}/lib")
|
|
||||||
endif ()
|
endif ()
|
@ -18,11 +18,11 @@ include(Colors)
|
|||||||
include(CMakeToolsHelpers OPTIONAL)
|
include(CMakeToolsHelpers OPTIONAL)
|
||||||
include(CheckAtomic)
|
include(CheckAtomic)
|
||||||
include(AddPlugin)
|
include(AddPlugin)
|
||||||
include(ConfigureRpath)
|
|
||||||
include(ConfigureBsdPaths)
|
|
||||||
if (${BUILD_STANDALONE} MATCHES "true")
|
if (${BUILD_STANDALONE} MATCHES "true")
|
||||||
include(ConfigureStandalone)
|
include(ConfigureStandalone)
|
||||||
endif()
|
endif()
|
||||||
|
include(ConfigureRpath)
|
||||||
|
include(ConfigureBsdPaths)
|
||||||
include(AddDarwinSystemLibs)
|
include(AddDarwinSystemLibs)
|
||||||
include(AddLinuxSystemLibs)
|
include(AddLinuxSystemLibs)
|
||||||
include(ConfigureCurses)
|
include(ConfigureCurses)
|
||||||
|
@ -28,7 +28,7 @@ OS=$(uname)
|
|||||||
ARCH=$(uname -m)
|
ARCH=$(uname -m)
|
||||||
SCRIPTDIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
|
SCRIPTDIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
|
||||||
OPENSSL_VERSION="3.1.0"
|
OPENSSL_VERSION="3.1.0"
|
||||||
CURL_VERSION="7.88.1"
|
CURL_VERSION="8.0.1"
|
||||||
LIBMICROHTTPD_VERSION="0.9.76"
|
LIBMICROHTTPD_VERSION="0.9.76"
|
||||||
FFMPEG_VERSION="6.0"
|
FFMPEG_VERSION="6.0"
|
||||||
LAME_VERSION="3.100"
|
LAME_VERSION="3.100"
|
||||||
|
@ -5,7 +5,7 @@ set (ffmpegdecoder_SOURCES
|
|||||||
add_library(ffmpegdecoder SHARED ${ffmpegdecoder_SOURCES})
|
add_library(ffmpegdecoder SHARED ${ffmpegdecoder_SOURCES})
|
||||||
|
|
||||||
if (${BUILD_STANDALONE} MATCHES "true")
|
if (${BUILD_STANDALONE} MATCHES "true")
|
||||||
include_directories(BEFORE ${VENDOR_INCLUDE_DIRECTORIES})
|
include_directories(AFTER ${VENDOR_INCLUDE_DIRECTORIES})
|
||||||
message(STATUS "[ffmpegdecoder] using include dirs: ${VENDOR_INCLUDE_DIRECTORIES}")
|
message(STATUS "[ffmpegdecoder] using include dirs: ${VENDOR_INCLUDE_DIRECTORIES}")
|
||||||
find_vendor_library(AVCODEC avcodec-musikcube)
|
find_vendor_library(AVCODEC avcodec-musikcube)
|
||||||
find_vendor_library(AVUTIL avutil-musikcube)
|
find_vendor_library(AVUTIL avutil-musikcube)
|
||||||
|
@ -9,6 +9,7 @@ if ("${LIBPORTAUDIO}" STREQUAL "LIBPORTAUDIO-NOTFOUND")
|
|||||||
disable_plugin(portaudioout)
|
disable_plugin(portaudioout)
|
||||||
else()
|
else()
|
||||||
add_library(portaudioout SHARED ${portaudioout_SOURCES})
|
add_library(portaudioout SHARED ${portaudioout_SOURCES})
|
||||||
|
include_directories("${BSD_PATH_PREFIX}/include")
|
||||||
target_link_libraries(portaudioout ${LIBPORTAUDIO})
|
target_link_libraries(portaudioout ${LIBPORTAUDIO})
|
||||||
message(STATUS "[portaudioout] using libportaudio at: ${LIBPORTAUDIO}")
|
message(STATUS "[portaudioout] using libportaudio at: ${LIBPORTAUDIO}")
|
||||||
endif()
|
endif()
|
Loading…
Reference in New Issue
Block a user