diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml index a5e875598..6aaf459c9 100644 --- a/.github/workflows/debug.yml +++ b/.github/workflows/debug.yml @@ -19,6 +19,9 @@ jobs: uses: actions/checkout@v2 with: submodules: recursive + - name: Unpack libraries + run: > + cd ThirdParty && tar xvf libraries.tar.xz - name: Run xcodebuild run: > xcodebuild diff --git a/.gitignore b/.gitignore index 2b4667dca..5cab3101e 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,35 @@ xcuserdata Xcode-config/DEVELOPMENT_TEAM.xcconfig Cog.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved + +# Unpack these before building +/ThirdParty/BASS/libbass.dylib +/ThirdParty/BASS/libbassflac.dylib +/ThirdParty/BASS/libbassmidi.dylib +/ThirdParty/BASS/libbassopus.dylib +/ThirdParty/BASS/libbasswv.dylib +/ThirdParty/avif/lib/libaom.a +/ThirdParty/avif/lib/libavif.a +/ThirdParty/fdk-aac/lib/libfdk-aac.2.dylib +/ThirdParty/fdk-aac/lib/libfdk-aac.a +/ThirdParty/fdk-aac/lib/libfdk-aac.dylib +/ThirdParty/fdk-aac/lib/libfdk-aac.la +/ThirdParty/fdk-aac/lib/pkgconfig/ +/ThirdParty/fdk-aac/lib/pkgconfig/fdk-aac.pc +/ThirdParty/ffmpeg/lib/libavcodec.59.dylib +/ThirdParty/ffmpeg/lib/libavformat.59.dylib +/ThirdParty/ffmpeg/lib/libavutil.57.dylib +/ThirdParty/ffmpeg/lib/libswresample.4.dylib +/ThirdParty/flac/lib/libFLAC.8.dylib +/ThirdParty/libid3tag/lib/libid3tag.a +/ThirdParty/libmad/lib/libmad.a +/ThirdParty/libopenmpt/lib/libopenmpt.a +/ThirdParty/libopenmpt_old/lib/libopenmpt.old.a +/ThirdParty/libvgm/lib/libvgm-emu.a +/ThirdParty/libvgm/lib/libvgm-player.a +/ThirdParty/libvgm/lib/libvgm-utils.a +/ThirdParty/mpg123/lib/libmpg123.0.dylib +/ThirdParty/ogg/lib/libogg.0.dylib +/ThirdParty/opus/lib/libopus.0.dylib +/ThirdParty/opusfile/lib/libopusfile.0.dylib +/ThirdParty/speex/libspeex.a diff --git a/README.md b/README.md index fb7cac1c2..e1db3d9e7 100644 --- a/README.md +++ b/README.md @@ -65,6 +65,13 @@ Setup your `DEVELOPMENT_TEAM` like described in [Xcode-config/Shared.xcconfig](h git config core.hooksPath .githooks ``` +(Add 2022-06-24) Also, you need to unpack the static and dynamic library dependencies, and update them any time the library path changes: + +``` +cd ThirdParty +tar xvf libraries.tar.xz +``` + # Screenshots ## Main window and Info Inspector diff --git a/ThirdParty/BASS/libbass.dylib b/ThirdParty/BASS/libbass.dylib deleted file mode 100644 index 2ecaed427..000000000 Binary files a/ThirdParty/BASS/libbass.dylib and /dev/null differ diff --git a/ThirdParty/BASS/libbassflac.dylib b/ThirdParty/BASS/libbassflac.dylib deleted file mode 100644 index 3c93974f1..000000000 Binary files a/ThirdParty/BASS/libbassflac.dylib and /dev/null differ diff --git a/ThirdParty/BASS/libbassmidi.dylib b/ThirdParty/BASS/libbassmidi.dylib deleted file mode 100644 index f00663447..000000000 Binary files a/ThirdParty/BASS/libbassmidi.dylib and /dev/null differ diff --git a/ThirdParty/BASS/libbassopus.dylib b/ThirdParty/BASS/libbassopus.dylib deleted file mode 100644 index 2fc85d547..000000000 Binary files a/ThirdParty/BASS/libbassopus.dylib and /dev/null differ diff --git a/ThirdParty/BASS/libbasswv.dylib b/ThirdParty/BASS/libbasswv.dylib deleted file mode 100644 index bee77f154..000000000 Binary files a/ThirdParty/BASS/libbasswv.dylib and /dev/null differ diff --git a/ThirdParty/avif/lib/libaom.a b/ThirdParty/avif/lib/libaom.a deleted file mode 100644 index 334643df1..000000000 Binary files a/ThirdParty/avif/lib/libaom.a and /dev/null differ diff --git a/ThirdParty/avif/lib/libavif.a b/ThirdParty/avif/lib/libavif.a deleted file mode 100644 index 97efb1b8b..000000000 Binary files a/ThirdParty/avif/lib/libavif.a and /dev/null differ diff --git a/ThirdParty/fdk-aac/lib/libfdk-aac.2.dylib b/ThirdParty/fdk-aac/lib/libfdk-aac.2.dylib deleted file mode 100755 index d34276079..000000000 Binary files a/ThirdParty/fdk-aac/lib/libfdk-aac.2.dylib and /dev/null differ diff --git a/ThirdParty/fdk-aac/lib/libfdk-aac.a b/ThirdParty/fdk-aac/lib/libfdk-aac.a deleted file mode 100644 index a3621dcbe..000000000 Binary files a/ThirdParty/fdk-aac/lib/libfdk-aac.a and /dev/null differ diff --git a/ThirdParty/fdk-aac/lib/libfdk-aac.dylib b/ThirdParty/fdk-aac/lib/libfdk-aac.dylib deleted file mode 120000 index 00ba0bae8..000000000 --- a/ThirdParty/fdk-aac/lib/libfdk-aac.dylib +++ /dev/null @@ -1 +0,0 @@ -libfdk-aac.2.dylib \ No newline at end of file diff --git a/ThirdParty/fdk-aac/lib/libfdk-aac.la b/ThirdParty/fdk-aac/lib/libfdk-aac.la deleted file mode 100755 index fd76cea61..000000000 --- a/ThirdParty/fdk-aac/lib/libfdk-aac.la +++ /dev/null @@ -1,41 +0,0 @@ -# libfdk-aac.la - a libtool library file -# Generated by libtool (GNU libtool) 2.4.6 -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='libfdk-aac.2.dylib' - -# Names of this library. -library_names='libfdk-aac.2.dylib libfdk-aac.dylib' - -# The name of the static archive. -old_library='libfdk-aac.a' - -# Linker flags that cannot go in dependency_libs. -inherited_linker_flags=' ' - -# Libraries that this one depends upon. -dependency_libs='' - -# Names of additional weak libraries provided by this library -weak_library_names='' - -# Version information for libfdk-aac. -current=2 -age=0 -revision=2 - -# Is this an already installed library? -installed=yes - -# Should we warn about portability when linking against -modules? -shouldnotlink=no - -# Files to dlopen/dlpreopen -dlopen='' -dlpreopen='' - -# Directory that this library needs to be installed in: -libdir='/Users/chris/Source/Repos/cog/ThirdParty/fdk-aac/lib' diff --git a/ThirdParty/fdk-aac/lib/pkgconfig/fdk-aac.pc b/ThirdParty/fdk-aac/lib/pkgconfig/fdk-aac.pc deleted file mode 100644 index 5fe804fee..000000000 --- a/ThirdParty/fdk-aac/lib/pkgconfig/fdk-aac.pc +++ /dev/null @@ -1,11 +0,0 @@ -prefix=/Users/chris/Source/Repos/cog/ThirdParty/fdk-aac -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: Fraunhofer FDK AAC Codec Library -Description: AAC codec library -Version: 2.0.2 -Libs: -L${libdir} -lfdk-aac -Libs.private: -Cflags: -I${includedir} diff --git a/ThirdParty/ffmpeg/lib/libavcodec.59.dylib b/ThirdParty/ffmpeg/lib/libavcodec.59.dylib deleted file mode 100755 index 5df48d335..000000000 Binary files a/ThirdParty/ffmpeg/lib/libavcodec.59.dylib and /dev/null differ diff --git a/ThirdParty/ffmpeg/lib/libavutil.57.dylib b/ThirdParty/ffmpeg/lib/libavutil.57.dylib deleted file mode 100755 index a454e4ab3..000000000 Binary files a/ThirdParty/ffmpeg/lib/libavutil.57.dylib and /dev/null differ diff --git a/ThirdParty/ffmpeg/lib/libswresample.4.dylib b/ThirdParty/ffmpeg/lib/libswresample.4.dylib deleted file mode 100755 index d5d753185..000000000 Binary files a/ThirdParty/ffmpeg/lib/libswresample.4.dylib and /dev/null differ diff --git a/ThirdParty/flac/lib/libFLAC.8.dylib b/ThirdParty/flac/lib/libFLAC.8.dylib deleted file mode 100755 index 0ac06a14c..000000000 Binary files a/ThirdParty/flac/lib/libFLAC.8.dylib and /dev/null differ diff --git a/ThirdParty/libid3tag/lib/libid3tag.a b/ThirdParty/libid3tag/lib/libid3tag.a deleted file mode 100644 index 040ae74dd..000000000 Binary files a/ThirdParty/libid3tag/lib/libid3tag.a and /dev/null differ diff --git a/ThirdParty/libmad/lib/libmad.a b/ThirdParty/libmad/lib/libmad.a deleted file mode 100644 index 4122a9d1d..000000000 Binary files a/ThirdParty/libmad/lib/libmad.a and /dev/null differ diff --git a/ThirdParty/libraries.tar.xz b/ThirdParty/libraries.tar.xz new file mode 100644 index 000000000..1c100dd39 Binary files /dev/null and b/ThirdParty/libraries.tar.xz differ diff --git a/ThirdParty/libvgm/lib/libvgm-emu.a b/ThirdParty/libvgm/lib/libvgm-emu.a deleted file mode 100644 index 7c927bc94..000000000 Binary files a/ThirdParty/libvgm/lib/libvgm-emu.a and /dev/null differ diff --git a/ThirdParty/libvgm/lib/libvgm-player.a b/ThirdParty/libvgm/lib/libvgm-player.a deleted file mode 100644 index fa5a0241d..000000000 Binary files a/ThirdParty/libvgm/lib/libvgm-player.a and /dev/null differ diff --git a/ThirdParty/libvgm/lib/libvgm-utils.a b/ThirdParty/libvgm/lib/libvgm-utils.a deleted file mode 100644 index 2f61cc191..000000000 Binary files a/ThirdParty/libvgm/lib/libvgm-utils.a and /dev/null differ diff --git a/ThirdParty/mpg123/lib/libmpg123.0.dylib b/ThirdParty/mpg123/lib/libmpg123.0.dylib deleted file mode 100755 index 8fb42aafd..000000000 Binary files a/ThirdParty/mpg123/lib/libmpg123.0.dylib and /dev/null differ diff --git a/ThirdParty/ogg/lib/libogg.0.dylib b/ThirdParty/ogg/lib/libogg.0.dylib deleted file mode 100755 index f16aac7d7..000000000 Binary files a/ThirdParty/ogg/lib/libogg.0.dylib and /dev/null differ diff --git a/ThirdParty/opus/lib/libopus.0.dylib b/ThirdParty/opus/lib/libopus.0.dylib deleted file mode 100755 index caa3c2295..000000000 Binary files a/ThirdParty/opus/lib/libopus.0.dylib and /dev/null differ diff --git a/ThirdParty/opusfile/lib/libopusfile.0.dylib b/ThirdParty/opusfile/lib/libopusfile.0.dylib deleted file mode 100755 index 86ad042e7..000000000 Binary files a/ThirdParty/opusfile/lib/libopusfile.0.dylib and /dev/null differ diff --git a/ThirdParty/speex/libspeex.a b/ThirdParty/speex/libspeex.a deleted file mode 100644 index 8764eb98a..000000000 Binary files a/ThirdParty/speex/libspeex.a and /dev/null differ