Pārlūkot izejas kodu

build: update to use plugin manifest

Alexandre Janniaux 5 gadi atpakaļ
vecāks
revīzija
fb554c3002
2 mainītis faili ar 3 papildinājumiem un 1 dzēšanām
  1. 2 0
      Sources/VLCLibrary.m
  2. 1 1
      compileAndBuildVLCKit.sh

+ 2 - 0
Sources/VLCLibrary.m

@@ -25,6 +25,7 @@
 
 #import "VLCLibrary.h"
 
+#define VLC_ENTRY_FUNC(entrypoint) int entrypoint();
 #if TARGET_OS_TV
 # include "vlc-plugins-AppleTV.h"
 #elif TARGET_OS_IPHONE
@@ -32,6 +33,7 @@
 #else
 # include "vlc-plugins-MacOSX.h"
 #endif
+#undef VLC_PLUGIN_ENTRY
 
 #include <vlc/vlc.h>
 

+ 1 - 1
compileAndBuildVLCKit.sh

@@ -251,7 +251,7 @@ build_universal_static_lib() {
     BUILD_KIND_AVAILABLES="os-arm64 os-armv7 simulator-x86_64 simulator-i386 -x86_64"
     for flavour in $BUILD_KIND_AVAILABLES; do
         staticlibname="${VLCROOT}/build-${OSSTYLE}${flavour}/${VLCSTATICLIBRARYNAME}"
-        modulelistname="${VLCROOT}/build-${OSSTYLE}${flavour}/static-lib/static-module-list.c"
+        modulelistname="${VLCROOT}/build-${OSSTYLE}${flavour}/static-lib/plugins.manifest.h"
         if [ -f "$staticlibname" -a -f "$modulelistname" ]; then
             VLCSTATICLIBS+=" $staticlibname"
             VLCSTATICMODULELIST="$modulelistname" # TODO: which one should we choose ?