Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-22 06:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(macOS) Updated the build scripts to work on the M1 architecture.

Browse source 
Also improved the in-tree build to not needing to install any libraries during dependencies compilation.
This commit is contained in:
Leon Styhre 2022-02-02 18:05:49 +01:00
parent bc8c23d642
commit 455e7fb13a
2 changed files with 42 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
tools/macOS_dependencies_build.sh
View file

@ -31,10 +31,16 @@ fi
echo "Building all dependencies in the ./external directory...\n"
export PKG_CONFIG_PATH=$(pwd)/../local_install/lib/pkgconfig
echo "Building libpng"
cd libpng
rm -f CMakeCache.txt
cmake -DPNG_SHARED=off .
if [ $(uname -m) == "arm64" ]; then
cmake -DPNG_SHARED=off -DPNG_ARM_NEON=off -DCMAKE_INSTALL_PREFIX=$(pwd)/../local_install .
else
cmake -DPNG_SHARED=off -DCMAKE_INSTALL_PREFIX=$(pwd)/../local_install .
fi
make clean
make -j${JOBS}
make install
@ -43,7 +49,7 @@ cd ..
echo "\nBuilding FreeType"
cd freetype/build
rm -f CMakeCache.txt
cmake -DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=on -DBUILD_SHARED_LIBS=on -DCMAKE_MACOSX_RPATH=on -S .. -B .
cmake -DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=on -DBUILD_SHARED_LIBS=on -DCMAKE_MACOSX_RPATH=on -DCMAKE_INSTALL_PREFIX=$(pwd)/../../local_install -S .. -B .
make clean
make -j${JOBS}
cp libfreetype.6.18.0.dylib ../../../libfreetype.6.dylib
@ -77,7 +83,7 @@ cd ../..
echo "\nBuilding FDK AAC"
cd fdk-aac
rm -f CMakeCache.txt
cmake .
cmake -DCMAKE_INSTALL_PREFIX=$(pwd)/../local_install .
make clean
make -j${JOBS}
make install
@ -86,7 +92,7 @@ cd ..
echo "\nBuilding libvpx"
cd libvpx
./configure --disable-examples --disable-docs --enable-pic --enable-vp9-highbitdepth
./configure --disable-examples --disable-docs --enable-pic --enable-vp9-highbitdepth --prefix=$(pwd)/../local_install
make clean
make -j${JOBS}
make install
@ -95,7 +101,7 @@ cd ..
echo "\nBuilding Ogg"
cd ogg
rm -f CMakeCache.txt
cmake .
cmake -DCMAKE_INSTALL_PREFIX=$(pwd)/../local_install .
make clean
make -j${JOBS}
make install
@ -104,18 +110,18 @@ cd ..
echo "\nBuilding Vorbis"
cd vorbis
rm -f CMakeCache.txt
cmake -DBUILD_SHARED_LIBS=on -DCMAKE_MACOSX_RPATH=on .
cmake -DBUILD_SHARED_LIBS=on -DCMAKE_MACOSX_RPATH=on -DCMAKE_INSTALL_PREFIX=$(pwd)/../local_install .
make clean
make -j${JOBS}
make install
cp /usr/local/lib/libvorbisenc.2.0.12.dylib ../..
cp /usr/local/lib/libvorbis.0.4.9.dylib ../..
cp lib/libvorbisenc.2.0.12.dylib ../..
cp lib/libvorbis.0.4.9.dylib ../..
cd ..
echo "\nBuilding Opus"
cd opus
rm -f CMakeCache.txt
cmake .
cmake -DCMAKE_INSTALL_PREFIX=$(pwd)/../local_install .
make clean
make -j${JOBS}
make install
@ -123,7 +129,7 @@ cd ..
echo "\nBuilding FFmpeg"
cd FFmpeg
./configure --prefix=/usr/local --enable-rpath --install-name-dir=@rpath --disable-doc --enable-gpl --enable-nonfree --enable-shared --enable-libvorbis --enable-libopus --enable-libfdk-aac --enable-libvpx --enable-postproc
PKG_CONFIG_PATH=$(pwd)/../local_install/lib/pkgconfig ./configure --prefix=/usr/local --enable-rpath --install-name-dir=@rpath --disable-doc --enable-gpl --enable-nonfree --enable-shared --enable-libvorbis --enable-libopus --enable-libfdk-aac --enable-libvpx --enable-postproc
make clean
make -j${JOBS}
install_name_tool -rpath /usr/local/lib @executable_path libavcodec/libavcodec.58.dylib
@ -140,3 +146,5 @@ install_name_tool -rpath /usr/local/lib @executable_path libswresample/libswresa
cp libswresample/libswresample.3.dylib ../..
install_name_tool -rpath /usr/local/lib @executable_path libswscale/libswscale.5.dylib
cp libswscale/libswscale.5.dylib ../..
unset PKG_CONFIG_PATH

25
tools/macOS_dependencies_setup.sh
View file

@ -18,6 +18,8 @@ fi
echo "Setting up dependencies in the ./external directory...\n"
cd external
rm -rf local_install
mkdir local_install
echo "Setting up libpng"
rm -rf libpng
@ -108,9 +110,29 @@ cat << EOF | patch Source/LibJXR/image/decode/segdec.c
}
EOF
if [ $(uname -m) == "arm64" ]; then
cat << EOF | patch Makefile.osx -
--- Makefile.osx 2022-02-02 11:09:46.000000000 +0100
+++ Makefile.osx_ARM64 2022-02-02 11:08:42.000000000 +0100
@@ -15,9 +15,9 @@
CPP_I386 = \$(shell xcrun -find clang++)
CPP_X86_64 = \$(shell xcrun -find clang++)
MACOSX_DEPLOY = -mmacosx-version-min=\$(MACOSX_DEPLOYMENT_TARGET)
-COMPILERFLAGS = -Os -fexceptions -fvisibility=hidden -DNO_LCMS -D__ANSI__
+COMPILERFLAGS = -Os -fexceptions -fvisibility=hidden -DNO_LCMS -D__ANSI__ -DHAVE_UNISTD_H -DDISABLE_PERF_MEASUREMENT -DPNG_ARM_NEON_OPT=0
COMPILERFLAGS_I386 = -arch i386
-COMPILERFLAGS_X86_64 = -arch x86_64
+COMPILERFLAGS_X86_64 = -arch arm64
COMPILERPPFLAGS = -Wno-ctor-dtor-privacy -D__ANSI__ -std=c++11 -stdlib=libc++ -Wc++11-narrowing
INCLUDE +=
INCLUDE_I386 = -isysroot \$(MACOSX_SYSROOT)
EOF
cat Makefile.osx | sed s/"arch_only x86_64"/"arch_only arm64"/g > Makefile.osx_TEMP
mv Makefile.osx_TEMP Makefile.osx
else
cat << EOF | patch Makefile.osx -
--- Makefile.osx 2021-11-30 15:06:53.000000000 +0100
+++ Makefile.osx_macOS 2021-11-30 15:07:23.000000000 +0100
+++ Makefile.osx_X86 2021-11-30 15:07:23.000000000 +0100
@@ -15,7 +15,7 @@
CPP_I386 = \$(shell xcrun -find clang++)
CPP_X86_64 = \$(shell xcrun -find clang++)
@ -121,6 +143,7 @@ cat << EOF | patch Makefile.osx -
COMPILERFLAGS_X86_64 = -arch x86_64
COMPILERPPFLAGS = -Wno-ctor-dtor-privacy -D__ANSI__ -std=c++11 -stdlib=libc++ -Wc++11-narrowing
EOF
fi
cd ../..
echo "\nSetting up pugixml"