mirrors/vlc
0
0
Fork 0
mirror of https://github.com/videolan/vlc.git synced 2024-11-27 11:57:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

libvlc: always include the libvlc version header from vlc.h

Browse Source 
Just like the other libvlc headers.
This commit is contained in:
Steve Lhomme 2022-11-24 17:34:02 +01:00
parent 6aab42ab61
commit 8c2b60de03
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/libvlc/CMakeLists.txt
View File

@ -19,7 +19,7 @@ project("libvlc samples")
# define the libvlc external build # define the libvlc external build
add_library(libvlc SHARED IMPORTED GLOBAL) add_library(libvlc SHARED IMPORTED GLOBAL)
target_include_directories(libvlc INTERFACE "${LIBVLC_SDK_INC}") target_include_directories(libvlc INTERFACE ${LIBVLC_SDK_INC})
if (MSVC) if (MSVC)
set_target_properties(libvlc PROPERTIES IMPORTED_IMPLIB "${LIBVLC_SDK_LIB}/libvlc.lib") set_target_properties(libvlc PROPERTIES IMPORTED_IMPLIB "${LIBVLC_SDK_LIB}/libvlc.lib")
else () else ()

2
extras/ci/gitlab-ci.yml
View File

@ -146,7 +146,7 @@ variables:
fi fi
extras/package/win32/build.sh -a $HOST_ARCH $EXTRA_BUILD_FLAGS $LIBVLC_EXTRA_BUILD_FLAGS $UWP_EXTRA_BUILD_FLAGS extras/package/win32/build.sh -a $HOST_ARCH $EXTRA_BUILD_FLAGS $LIBVLC_EXTRA_BUILD_FLAGS $UWP_EXTRA_BUILD_FLAGS
if [ "${CI_JOB_NAME}" = "win64" ]; then if [ "${CI_JOB_NAME}" = "win64" ]; then
cmake -DLIBVLC_SDK_INC:STRING=${CI_PROJECT_DIR}/include -DLIBVLC_SDK_LIB:STRING=${CI_PROJECT_DIR}/${VLCARCH}/lib/.libs -H${CI_PROJECT_DIR}/doc/libvlc -B${CI_PROJECT_DIR}/doc/libvlc/build \ cmake -DLIBVLC_SDK_INC:STRING="${CI_PROJECT_DIR}/include;${CI_PROJECT_DIR}/${VLCARCH}/include" -DLIBVLC_SDK_LIB:STRING=${CI_PROJECT_DIR}/${VLCARCH}/lib/.libs -H${CI_PROJECT_DIR}/doc/libvlc -B${CI_PROJECT_DIR}/doc/libvlc/build \
-G Ninja -DCMAKE_C_COMPILER=${TRIPLET}-gcc -DCMAKE_CXX_COMPILER=${TRIPLET}-g++ -DCMAKE_SYSTEM_NAME=Windows -G Ninja -DCMAKE_C_COMPILER=${TRIPLET}-gcc -DCMAKE_CXX_COMPILER=${TRIPLET}-g++ -DCMAKE_SYSTEM_NAME=Windows
cmake --build ${CI_PROJECT_DIR}/doc/libvlc/build cmake --build ${CI_PROJECT_DIR}/doc/libvlc/build
fi fi

1
include/vlc/vlc.h
View File

@ -46,6 +46,7 @@ extern "C" {
#include <vlc/libvlc_media_discoverer.h> #include <vlc/libvlc_media_discoverer.h>
#include <vlc/libvlc_events.h> #include <vlc/libvlc_events.h>
#include <vlc/libvlc_dialog.h> #include <vlc/libvlc_dialog.h>
#include <vlc/libvlc_version.h>
#include <vlc/deprecated.h> #include <vlc/deprecated.h>
# ifdef __cplusplus # ifdef __cplusplus