Browse Source

xcodegen: use fileGroups instead of source

So that there is no issues with .swp files when compiling, and so as to
prevent the sources from being compiled by xcode.
Alexandre Janniaux 5 years ago
parent
commit
537d272f93
  1. 23
      extras/package/apple/xcodegen.yml
  2. 2
      modules/static.mk

23
extras/package/apple/xcodegen.yml

@ -19,6 +19,15 @@ settings:
STRIP_BITCODE_FROM_COPIED_FILES: NO
ENABLE_BITCODE: YES
BITCODE_GENERATION_MODE: full
fileGroups:
- "${VLC_SRC_DIR}/src"
- "${VLC_SRC_DIR}/include"
- "${VLC_SRC_DIR}/modules"
- "${VLC_SRC_DIR}/lib"
- "${VLC_SRC_DIR}/contrib/src"
- "${VLC_SRC_DIR}/contrib/bootstrap"
- "${VLC_SRC_DIR}/doc"
- "${VLC_SRC_DIR}/extras/package/apple/"
targets:
VLCAutomake:
type: ""
@ -27,20 +36,6 @@ targets:
toolPath: ${VLC_SRC_DIR}/extras/package/apple/xcode.sh
passSettings: true
workingDirectory: ${VLC_SRC_DIR}
sources:
- path: "${VLC_SRC_DIR}/src"
excludes: "**/Makefile.in"
- path: "${VLC_SRC_DIR}/include"
excludes: "**/Makefile.in"
- path: "${VLC_SRC_DIR}/modules"
excludes: "**/Makefile.in"
- path: "${VLC_SRC_DIR}/lib"
excludes: "**/Makefile.in"
- path: "${VLC_SRC_DIR}/contrib/src"
- path: "${VLC_SRC_DIR}/contrib/bootstrap"
- path: "${VLC_SRC_DIR}/doc"
excludes: "**/Makefile.in"
vlc_plugin:
type: "framework"
platform: ${VLC_PLATFORM}

2
modules/static.mk

@ -45,7 +45,7 @@ endif
$(AM_V_at)echo "# Generated by doltcompile, not libtool" >> $@.lo #$$($(LIBTOOL) --version | head -n1)" > .deps/$@.lo
$(AM_V_at)echo "non_pic_object=none" >> $@.lo
$(AM_V_at)echo "pic_object=.deps/$@.o" >> $@.lo
$(AM_V_at)$(LIBTOOL) --mode=link --tag=CXX c++ -Wl,-Ur -fPIC -o $@ "$@.lo" \
$(AM_V_at)$(LIBTOOL) --mode=link --tag=CXX $(CXX) $(CXXFLAGS) $(LDFLAGS) -Wl,-Ur -fPIC -o $@ "$@.lo" \
-export-symbols-regex "^vlc_entry__"
$(AM_V_GEN)dependencies=`$(top_srcdir)/extras/package/apple/dependencies.sh forward $<`; \
sed -i.orig "s,dependency_libs=.*\$$,dependency_libs=' $${dependencies}'," $@ \

Loading…
Cancel
Save