diff --git a/.github/workflows/vpinball-sbc.yml b/.github/workflows/vpinball-sbc.yml index 8f08df336..40215f708 100644 --- a/.github/workflows/vpinball-sbc.yml +++ b/.github/workflows/vpinball-sbc.yml @@ -72,7 +72,7 @@ jobs: shell: /bin/bash commands: | apt-get update -y --allow-releaseinfo-change - apt-get install --no-install-recommends -y pkg-config cmake bison autoconf automake libtool zlib1g-dev libdrm-dev libgbm-dev libgles2-mesa libgles2-mesa-dev libudev-dev + apt-get install --no-install-recommends -y pkg-config cmake bison autoconf automake libtool zlib1g-dev libdrm-dev libgbm-dev libgles2-mesa libgles2-mesa-dev libudev-dev libx11-dev libxrandr-dev perl -i -pe"s/0/${{ needs.version.outputs.revision }}/g" src/core/git_version.h perl -i -pe"s/unknown/${{ needs.version.outputs.sha7 }}/g" src/core/git_version.h NUM_PROCS=$(nproc) diff --git a/standalone/README.md b/standalone/README.md index 580eaf99d..fec9931b6 100644 --- a/standalone/README.md +++ b/standalone/README.md @@ -242,7 +242,7 @@ cmake --build build -- -j$(nproc) In a terminal execute the following: ``` -sudo apt install git build-essential autoconf automake libtool cmake nasm bison curl zlib1g-dev libdrm-dev libgbm-dev libglu1-mesa-dev libegl-dev libudev-dev libx11-dev libxrandr-dev nasm +sudo apt install git build-essential autoconf automake libtool cmake nasm bison curl zlib1g-dev libdrm-dev libgbm-dev libglu1-mesa-dev libegl-dev libudev-dev libx11-dev libxrandr-dev git clone -b standalone https://github.com/vpinball/vpinball cd vpinball/standalone/linux-x64 CC=gcc-13 CXX=g++-13 ./external.sh @@ -278,7 +278,7 @@ sudo add-apt-repository ppa:liujianfeng1994/rockchip-multimedia sudo apt update sudo apt dist-upgrade sudo apt install mali-g610-firmware rockchip-multimedia-config -sudo apt-get install git pkg-config autoconf automake libtool cmake bison zlib1g-dev libdrm-dev libgbm-dev libgles2-mesa-dev libgles2-mesa libudev-dev +sudo apt-get install git pkg-config autoconf automake libtool cmake bison zlib1g-dev libdrm-dev libgbm-dev libgles2-mesa-dev libgles2-mesa libudev-dev libx11-dev libxrandr-dev git clone -b standalone https://github.com/vpinball/vpinball cd vpinball/standalone/linux-aarch64 ./external.sh @@ -292,7 +292,7 @@ cmake --build build Start with a [Raspberry Pi OS Lite (64-Bit)](https://www.raspberrypi.com/software/operating-systems/#raspberry-pi-os-64-bit) image and execute the following: ``` -sudo apt-get install git pkg-config autoconf automake libtool cmake bison zlib1g-dev libdrm-dev libgbm-dev libgles2-mesa-dev libgles2-mesa libudev-dev +sudo apt-get install git pkg-config autoconf automake libtool cmake bison zlib1g-dev libdrm-dev libgbm-dev libgles2-mesa-dev libgles2-mesa libudev-dev libx11-dev libxrandr-dev git clone -b standalone https://github.com/vpinball/vpinball cd vpinball/standalone/linux-aarch64 ./external.sh diff --git a/standalone/android-arm64-v8a/external.sh b/standalone/android-arm64-v8a/external.sh index 38c1edecb..cd8ff2e8e 100755 --- a/standalone/android-arm64-v8a/external.sh +++ b/standalone/android-arm64-v8a/external.sh @@ -101,9 +101,9 @@ cp -a ../${CACHE_DIR}/${CACHE_NAME}/lib/*.so ../external/lib # (derived from: https://github.com/AlexanderAgd/SDL2-Android) # -CACHE_NAME="SDL2-${SDL2_VERSION}" +SDL2_CACHE_NAME="SDL2-${SDL2_VERSION}" -if [ ! -f "../${CACHE_DIR}/${CACHE_NAME}.cache" ]; then +if [ ! -f "../${CACHE_DIR}/${SDL2_CACHE_NAME}.cache" ]; then curl -sL https://github.com/libsdl-org/SDL/releases/download/release-${SDL2_VERSION}/SDL2-${SDL2_VERSION}.zip -o SDL2-${SDL2_VERSION}.zip unzip SDL2-${SDL2_VERSION}.zip cd SDL2-${SDL2_VERSION} @@ -115,24 +115,24 @@ if [ ! -f "../${CACHE_DIR}/${CACHE_NAME}.cache" ]; then NDK_OUT=obj \ NDK_LIBS_OUT=libs \ -j${NUM_PROC} - mkdir -p ../../${CACHE_DIR}/${CACHE_NAME}/include - cp include/*.h ../../${CACHE_DIR}/${CACHE_NAME}/include - mkdir -p ../../${CACHE_DIR}/${CACHE_NAME}/lib - cp -a libs/arm64-v8a/*.so ../../${CACHE_DIR}/${CACHE_NAME}/lib + mkdir -p ../../${CACHE_DIR}/${SDL2_CACHE_NAME}/include + cp include/*.h ../../${CACHE_DIR}/${SDL2_CACHE_NAME}/include + mkdir -p ../../${CACHE_DIR}/${SDL2_CACHE_NAME}/lib + cp -a libs/arm64-v8a/*.so ../../${CACHE_DIR}/${SDL2_CACHE_NAME}/lib cd .. - touch "../${CACHE_DIR}/${CACHE_NAME}.cache" + touch "../${CACHE_DIR}/${SDL2_CACHE_NAME}.cache" fi mkdir -p ../external/include/SDL2 -cp -r ../${CACHE_DIR}/${CACHE_NAME}/include/* ../external/include/SDL2 -cp -a ../${CACHE_DIR}/${CACHE_NAME}/lib/*.so ../external/lib +cp -r ../${CACHE_DIR}/${SDL2_CACHE_NAME}/include/* ../external/include/SDL2 +cp -a ../${CACHE_DIR}/${SDL2_CACHE_NAME}/lib/*.so ../external/lib # # build SDL2_image and copy to external # (derived from: https://github.com/AlexanderAgd/SDL2-Android) # -CACHE_NAME="SDL2_image-${SDL2_IMAGE_VERSION}-SDL2-${SDL2_VERSION}" +CACHE_NAME="SDL2_image-${SDL2_IMAGE_VERSION}-${SDL2_CACHE_NAME}" if [ ! -f "../${CACHE_DIR}/${CACHE_NAME}.cache" ]; then curl -sL https://github.com/libsdl-org/SDL_image/releases/download/release-${SDL2_IMAGE_VERSION}/SDL2_image-${SDL2_IMAGE_VERSION}.zip -o SDL2_image-${SDL2_IMAGE_VERSION}.zip @@ -170,7 +170,7 @@ cp -a ../${CACHE_DIR}/${CACHE_NAME}/lib/*.so ../external/lib # (derived from: https://github.com/AlexanderAgd/SDL2-Android) # -CACHE_NAME="SDL2_ttf-${SDL2_TTF_VERSION}-SDL2-${SDL2_VERSION}" +CACHE_NAME="SDL2_ttf-${SDL2_TTF_VERSION}-${SDL2_CACHE_NAME}" if [ ! -f "../${CACHE_DIR}/${CACHE_NAME}.cache" ]; then curl -sL https://github.com/libsdl-org/SDL_ttf/releases/download/release-${SDL2_TTF_VERSION}/SDL2_ttf-${SDL2_TTF_VERSION}.zip -o SDL2_ttf-${SDL2_TTF_VERSION}.zip diff --git a/standalone/ios-arm64/external.sh b/standalone/ios-arm64/external.sh index 5bbc05b7c..8786366da 100755 --- a/standalone/ios-arm64/external.sh +++ b/standalone/ios-arm64/external.sh @@ -87,9 +87,9 @@ cp -r ../${CACHE_DIR}/${CACHE_NAME}/framework/*.framework ../external/framework # build SDL2 and copy to external # -CACHE_NAME="SDL2-${SDL2_VERSION}" +SDL2_CACHE_NAME="SDL2-${SDL2_VERSION}" -if [ ! -f "../${CACHE_DIR}/${CACHE_NAME}.cache" ]; then +if [ ! -f "../${CACHE_DIR}/${SDL2_CACHE_NAME}.cache" ]; then curl -sL https://github.com/libsdl-org/SDL/releases/download/release-${SDL2_VERSION}/SDL2-${SDL2_VERSION}.zip -o SDL2-${SDL2_VERSION}.zip unzip SDL2-${SDL2_VERSION}.zip cd SDL2-${SDL2_VERSION} @@ -99,23 +99,23 @@ if [ ! -f "../${CACHE_DIR}/${CACHE_NAME}.cache" ]; then -sdk iphoneos \ -configuration Release \ clean build CONFIGURATION_BUILD_DIR="$(pwd)/sdl-build" - mkdir -p ../../${CACHE_DIR}/${CACHE_NAME}/include - cp include/*.h ../../${CACHE_DIR}/${CACHE_NAME}/include - mkdir -p ../../${CACHE_DIR}/${CACHE_NAME}/lib - cp sdl-build/*.a ../../${CACHE_DIR}/${CACHE_NAME}/lib + mkdir -p ../../${CACHE_DIR}/${SDL2_CACHE_NAME}/include + cp include/*.h ../../${CACHE_DIR}/${SDL2_CACHE_NAME}/include + mkdir -p ../../${CACHE_DIR}/${SDL2_CACHE_NAME}/lib + cp sdl-build/*.a ../../${CACHE_DIR}/${SDL2_CACHE_NAME}/lib cd .. - touch "../${CACHE_DIR}/${CACHE_NAME}.cache" + touch "../${CACHE_DIR}/${SDL2_CACHE_NAME}.cache" fi mkdir -p ../external/include/SDL2 -cp -r ../${CACHE_DIR}/${CACHE_NAME}/include/* ../external/include/SDL2 -cp ../${CACHE_DIR}/${CACHE_NAME}/lib/*.a ../external/lib +cp -r ../${CACHE_DIR}/${SDL2_CACHE_NAME}/include/* ../external/include/SDL2 +cp ../${CACHE_DIR}/${SDL2_CACHE_NAME}/lib/*.a ../external/lib # # build SDL2_image and copy to external # -CACHE_NAME="SDL2_image-${SDL2_IMAGE_VERSION}-SDL2-${SDL2_VERSION}" +CACHE_NAME="SDL2_image-${SDL2_IMAGE_VERSION}-${SDL2_CACHE_NAME}" if [ ! -f "../${CACHE_DIR}/${CACHE_NAME}.cache" ]; then curl -sL https://github.com/libsdl-org/SDL_image/releases/download/release-${SDL2_IMAGE_VERSION}/SDL2_image-${SDL2_IMAGE_VERSION}.zip -o SDL2_image-${SDL2_IMAGE_VERSION}.zip @@ -141,7 +141,7 @@ cp ../${CACHE_DIR}/${CACHE_NAME}/lib/*.a ../external/lib # build SDL2_ttf and copy to external # -CACHE_NAME="SDL2_ttf-${SDL2_TTF_VERSION}-SDL2-${SDL2_VERSION}" +CACHE_NAME="SDL2_ttf-${SDL2_TTF_VERSION}-${SDL2_CACHE_NAME}" if [ ! -f "../${CACHE_DIR}/${CACHE_NAME}.cache" ]; then curl -sL https://github.com/libsdl-org/SDL_ttf/releases/download/release-${SDL2_TTF_VERSION}/SDL2_ttf-${SDL2_TTF_VERSION}.zip -o SDL2_ttf-${SDL2_TTF_VERSION}.zip diff --git a/standalone/linux-aarch64/external.sh b/standalone/linux-aarch64/external.sh index bb8da3278..bf3807ffc 100755 --- a/standalone/linux-aarch64/external.sh +++ b/standalone/linux-aarch64/external.sh @@ -86,9 +86,9 @@ cp -a ../${CACHE_DIR}/${CACHE_NAME}/lib/*.so ../external/lib # build SDL2 and copy to external # -CACHE_NAME="SDL2-${SDL2_VERSION}" +SDL2_CACHE_NAME="SDL2-${SDL2_VERSION}_001" -if [ ! -f "../${CACHE_DIR}/${CACHE_NAME}.cache" ]; then +if [ ! -f "../${CACHE_DIR}/${SDL2_CACHE_NAME}.cache" ]; then curl -sL https://github.com/libsdl-org/SDL/releases/download/release-${SDL2_VERSION}/SDL2-${SDL2_VERSION}.zip -o SDL2-${SDL2_VERSION}.zip unzip SDL2-${SDL2_VERSION}.zip cd SDL2-${SDL2_VERSION} @@ -96,7 +96,7 @@ if [ ! -f "../${CACHE_DIR}/${CACHE_NAME}.cache" ]; then -DSDL_SHARED=ON \ -DSDL_STATIC=OFF \ -DSDL_TEST=OFF \ - -DSDL_X11=OFF \ + -DSDL_X11=ON \ -DSDL_KMSDRM=ON \ -DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE \ -DCMAKE_INSTALL_RPATH="\$ORIGIN" \ @@ -105,23 +105,26 @@ if [ ! -f "../${CACHE_DIR}/${CACHE_NAME}.cache" ]; then cmake --build build -- -j${NUM_PROCS} # cmake does not make a symbolic link for libSDL2.so ln -s libSDL2-2.0.so build/libSDL2.so - mkdir -p ../../${CACHE_DIR}/${CACHE_NAME}/include - cp include/*.h ../../${CACHE_DIR}/${CACHE_NAME}/include - mkdir -p ../../${CACHE_DIR}/${CACHE_NAME}/lib - cp -a build/*.{so,so.*} ../../${CACHE_DIR}/${CACHE_NAME}/lib + mkdir -p ../../${CACHE_DIR}/${SDL2_CACHE_NAME}/include + cp include/*.h ../../${CACHE_DIR}/${SDL2_CACHE_NAME}/include + # we need the generated SDL_config.h for this platform. Backup generic one and replace with generated one + mv ../../${CACHE_DIR}/${SDL2_CACHE_NAME}/include/SDL_config.h ../../${CACHE_DIR}/${SDL2_CACHE_NAME}/include/_SDL_config.h + cp build/include-config-release/SDL2/SDL_config.h ../../${CACHE_DIR}/${SDL2_CACHE_NAME}/include + mkdir -p ../../${CACHE_DIR}/${SDL2_CACHE_NAME}/lib + cp -a build/*.{so,so.*} ../../${CACHE_DIR}/${SDL2_CACHE_NAME}/lib cd .. - touch "../${CACHE_DIR}/${CACHE_NAME}.cache" + touch "../${CACHE_DIR}/${SDL2_CACHE_NAME}.cache" fi mkdir -p ../external/include/SDL2 -cp -r ../${CACHE_DIR}/${CACHE_NAME}/include/* ../external/include/SDL2 -cp -a ../${CACHE_DIR}/${CACHE_NAME}/lib/*.{so,so.*} ../external/lib +cp -r ../${CACHE_DIR}/${SDL2_CACHE_NAME}/include/* ../external/include/SDL2 +cp -a ../${CACHE_DIR}/${SDL2_CACHE_NAME}/lib/*.{so,so.*} ../external/lib # # build SDL2_image and copy to external # -CACHE_NAME="SDL2_image-${SDL2_IMAGE_VERSION}-SDL2-${SDL2_VERSION}" +CACHE_NAME="SDL2_image-${SDL2_IMAGE_VERSION}-${SDL2_CACHE_NAME}" if [ ! -f "../${CACHE_DIR}/${CACHE_NAME}.cache" ]; then curl -sL https://github.com/libsdl-org/SDL_image/releases/download/release-${SDL2_IMAGE_VERSION}/SDL2_image-${SDL2_IMAGE_VERSION}.zip -o SDL2_image-${SDL2_IMAGE_VERSION}.zip @@ -153,7 +156,7 @@ cp -a ../${CACHE_DIR}/${CACHE_NAME}/lib/*.{so,so.*} ../external/lib # build SDL2_ttf and copy to external # -CACHE_NAME="SDL2_ttf-${SDL2_TTF_VERSION}-SDL2-${SDL2_VERSION}" +CACHE_NAME="SDL2_ttf-${SDL2_TTF_VERSION}-${SDL2_CACHE_NAME}" if [ ! -f "../${CACHE_DIR}/${CACHE_NAME}.cache" ]; then curl -sL https://github.com/libsdl-org/SDL_ttf/releases/download/release-${SDL2_TTF_VERSION}/SDL2_ttf-${SDL2_TTF_VERSION}.zip -o SDL2_ttf-${SDL2_TTF_VERSION}.zip diff --git a/standalone/linux-x64/external.sh b/standalone/linux-x64/external.sh index def7a0748..e09e83cf6 100755 --- a/standalone/linux-x64/external.sh +++ b/standalone/linux-x64/external.sh @@ -86,9 +86,9 @@ cp -a ../${CACHE_DIR}/${CACHE_NAME}/lib/*.so ../external/lib # build SDL2 and copy to external # -CACHE_NAME="SDL2-${SDL2_VERSION}" +SDL2_CACHE_NAME="SDL2-${SDL2_VERSION}_001" -if [ ! -f "../${CACHE_DIR}/${CACHE_NAME}.cache" ]; then +if [ ! -f "../${CACHE_DIR}/${SDL2_CACHE_NAME}.cache" ]; then curl -sL https://github.com/libsdl-org/SDL/releases/download/release-${SDL2_VERSION}/SDL2-${SDL2_VERSION}.zip -o SDL2-${SDL2_VERSION}.zip unzip SDL2-${SDL2_VERSION}.zip cd SDL2-${SDL2_VERSION} @@ -103,23 +103,26 @@ if [ ! -f "../${CACHE_DIR}/${CACHE_NAME}.cache" ]; then cmake --build build -- -j${NUM_PROCS} # cmake does not make a symbolic link for libSDL2.so ln -s libSDL2-2.0.so build/libSDL2.so - mkdir -p ../../${CACHE_DIR}/${CACHE_NAME}/include - cp include/*.h ../../${CACHE_DIR}/${CACHE_NAME}/include - mkdir -p ../../${CACHE_DIR}/${CACHE_NAME}/lib - cp -a build/*.{so,so.*} ../../${CACHE_DIR}/${CACHE_NAME}/lib + mkdir -p ../../${CACHE_DIR}/${SDL2_CACHE_NAME}/include + cp include/*.h ../../${CACHE_DIR}/${SDL2_CACHE_NAME}/include + # we need the generated SDL_config.h for this platform. Backup generic one and replace with generated one + mv ../../${CACHE_DIR}/${SDL2_CACHE_NAME}/include/SDL_config.h ../../${CACHE_DIR}/${SDL2_CACHE_NAME}/include/_SDL_config.h + cp build/include-config-release/SDL2/SDL_config.h ../../${CACHE_DIR}/${SDL2_CACHE_NAME}/include + mkdir -p ../../${CACHE_DIR}/${SDL2_CACHE_NAME}/lib + cp -a build/*.{so,so.*} ../../${CACHE_DIR}/${SDL2_CACHE_NAME}/lib cd .. - touch "../${CACHE_DIR}/${CACHE_NAME}.cache" + touch "../${CACHE_DIR}/${SDL2_CACHE_NAME}.cache" fi mkdir -p ../external/include/SDL2 -cp -r ../${CACHE_DIR}/${CACHE_NAME}/include/* ../external/include/SDL2 -cp -a ../${CACHE_DIR}/${CACHE_NAME}/lib/*.{so,so.*} ../external/lib +cp -r ../${CACHE_DIR}/${SDL2_CACHE_NAME}/include/* ../external/include/SDL2 +cp -a ../${CACHE_DIR}/${SDL2_CACHE_NAME}/lib/*.{so,so.*} ../external/lib # # build SDL2_image and copy to external # -CACHE_NAME="SDL2_image-${SDL2_IMAGE_VERSION}-SDL2-${SDL2_VERSION}" +CACHE_NAME="SDL2_image-${SDL2_IMAGE_VERSION}-${SDL2_CACHE_NAME}" if [ ! -f "../${CACHE_DIR}/${CACHE_NAME}.cache" ]; then curl -sL https://github.com/libsdl-org/SDL_image/releases/download/release-${SDL2_IMAGE_VERSION}/SDL2_image-${SDL2_IMAGE_VERSION}.zip -o SDL2_image-${SDL2_IMAGE_VERSION}.zip @@ -151,7 +154,7 @@ cp -a ../${CACHE_DIR}/${CACHE_NAME}/lib/*.{so,so.*} ../external/lib # build SDL2_ttf and copy to external # -CACHE_NAME="SDL2_ttf-${SDL2_TTF_VERSION}-SDL2-${SDL2_VERSION}" +CACHE_NAME="SDL2_ttf-${SDL2_TTF_VERSION}-${SDL2_CACHE_NAME}" if [ ! -f "../${CACHE_DIR}/${CACHE_NAME}.cache" ]; then curl -sL https://github.com/libsdl-org/SDL_ttf/releases/download/release-${SDL2_TTF_VERSION}/SDL2_ttf-${SDL2_TTF_VERSION}.zip -o SDL2_ttf-${SDL2_TTF_VERSION}.zip diff --git a/standalone/macos-arm64/external.sh b/standalone/macos-arm64/external.sh index 23037ec95..d654fde72 100755 --- a/standalone/macos-arm64/external.sh +++ b/standalone/macos-arm64/external.sh @@ -86,9 +86,9 @@ cp -a ../${CACHE_DIR}/${CACHE_NAME}/lib/*.dylib ../external/lib # build SDL2 and copy to external # -CACHE_NAME="SDL2-${SDL2_VERSION}" +SDL2_CACHE_NAME="SDL2-${SDL2_VERSION}" -if [ ! -f "../${CACHE_DIR}/${CACHE_NAME}.cache" ]; then +if [ ! -f "../${CACHE_DIR}/${SDL2_CACHE_NAME}.cache" ]; then curl -sL https://github.com/libsdl-org/SDL/releases/download/release-${SDL2_VERSION}/SDL2-${SDL2_VERSION}.zip -o SDL2-${SDL2_VERSION}.zip unzip SDL2-${SDL2_VERSION}.zip cd SDL2-${SDL2_VERSION} @@ -103,23 +103,23 @@ if [ ! -f "../${CACHE_DIR}/${CACHE_NAME}.cache" ]; then cmake --build build -- -j${NUM_PROCS} # cmake does not make a symbolic link for libSDL2.dylib ln -s libSDL2-2.0.0.dylib build/libSDL2.dylib - mkdir -p ../../${CACHE_DIR}/${CACHE_NAME}/include - cp include/*.h ../../${CACHE_DIR}/${CACHE_NAME}/include - mkdir -p ../../${CACHE_DIR}/${CACHE_NAME}/lib - cp -a build/*.dylib ../../${CACHE_DIR}/${CACHE_NAME}/lib + mkdir -p ../../${CACHE_DIR}/${SDL2_CACHE_NAME}/include + cp include/*.h ../../${CACHE_DIR}/${SDL2_CACHE_NAME}/include + mkdir -p ../../${CACHE_DIR}/${SDL2_CACHE_NAME}/lib + cp -a build/*.dylib ../../${CACHE_DIR}/${SDL2_CACHE_NAME}/lib cd .. - touch "../${CACHE_DIR}/${CACHE_NAME}.cache" + touch "../${CACHE_DIR}/${SDL2_CACHE_NAME}.cache" fi mkdir -p ../external/include/SDL2 -cp -r ../${CACHE_DIR}/${CACHE_NAME}/include/* ../external/include/SDL2 -cp -a ../${CACHE_DIR}/${CACHE_NAME}/lib/*.dylib ../external/lib +cp -r ../${CACHE_DIR}/${SDL2_CACHE_NAME}/include/* ../external/include/SDL2 +cp -a ../${CACHE_DIR}/${SDL2_CACHE_NAME}/lib/*.dylib ../external/lib # # build SDL2_image and copy to external # -CACHE_NAME="SDL2_image-${SDL2_IMAGE_VERSION}-SDL2-${SDL2_VERSION}" +CACHE_NAME="SDL2_image-${SDL2_IMAGE_VERSION}-${SDL2_CACHE_NAME}" if [ ! -f "../${CACHE_DIR}/${CACHE_NAME}.cache" ]; then curl -sL https://github.com/libsdl-org/SDL_image/releases/download/release-${SDL2_IMAGE_VERSION}/SDL2_image-${SDL2_IMAGE_VERSION}.zip -o SDL2_image-${SDL2_IMAGE_VERSION}.zip @@ -151,7 +151,7 @@ cp -a ../${CACHE_DIR}/${CACHE_NAME}/lib/*.dylib ../external/lib # build SDL2_ttf and copy to external # -CACHE_NAME="SDL2_ttf-${SDL2_TTF_VERSION}-SDL2-${SDL2_VERSION}" +CACHE_NAME="SDL2_ttf-${SDL2_TTF_VERSION}-${SDL2_CACHE_NAME}" if [ ! -f "../${CACHE_DIR}/${CACHE_NAME}.cache" ]; then curl -sL https://github.com/libsdl-org/SDL_ttf/releases/download/release-${SDL2_TTF_VERSION}/SDL2_ttf-${SDL2_TTF_VERSION}.zip -o SDL2_ttf-${SDL2_TTF_VERSION}.zip diff --git a/standalone/macos-x64/external.sh b/standalone/macos-x64/external.sh index 12f1deef5..50f24b4ee 100755 --- a/standalone/macos-x64/external.sh +++ b/standalone/macos-x64/external.sh @@ -86,9 +86,9 @@ cp -a ../${CACHE_DIR}/${CACHE_NAME}/lib/*.dylib ../external/lib # build SDL2 and copy to external # -CACHE_NAME="SDL2-${SDL2_VERSION}" +SDL2_CACHE_NAME="SDL2-${SDL2_VERSION}" -if [ ! -f "../${CACHE_DIR}/${CACHE_NAME}.cache" ]; then +if [ ! -f "../${CACHE_DIR}/${SDL2_CACHE_NAME}.cache" ]; then curl -sL https://github.com/libsdl-org/SDL/releases/download/release-${SDL2_VERSION}/SDL2-${SDL2_VERSION}.zip -o SDL2-${SDL2_VERSION}.zip unzip SDL2-${SDL2_VERSION}.zip cd SDL2-${SDL2_VERSION} @@ -103,23 +103,23 @@ if [ ! -f "../${CACHE_DIR}/${CACHE_NAME}.cache" ]; then cmake --build build -- -j${NUM_PROCS} # cmake does not make a symbolic link for libSDL2.dylib ln -s libSDL2-2.0.0.dylib build/libSDL2.dylib - mkdir -p ../../${CACHE_DIR}/${CACHE_NAME}/include - cp include/*.h ../../${CACHE_DIR}/${CACHE_NAME}/include - mkdir -p ../../${CACHE_DIR}/${CACHE_NAME}/lib - cp -a build/*.dylib ../../${CACHE_DIR}/${CACHE_NAME}/lib + mkdir -p ../../${CACHE_DIR}/${SDL2_CACHE_NAME}/include + cp include/*.h ../../${CACHE_DIR}/${SDL2_CACHE_NAME}/include + mkdir -p ../../${CACHE_DIR}/${SDL2_CACHE_NAME}/lib + cp -a build/*.dylib ../../${CACHE_DIR}/${SDL2_CACHE_NAME}/lib cd .. - touch "../${CACHE_DIR}/${CACHE_NAME}.cache" + touch "../${CACHE_DIR}/${SDL2_CACHE_NAME}.cache" fi mkdir -p ../external/include/SDL2 -cp -r ../${CACHE_DIR}/${CACHE_NAME}/include/* ../external/include/SDL2 -cp -a ../${CACHE_DIR}/${CACHE_NAME}/lib/*.dylib ../external/lib +cp -r ../${CACHE_DIR}/${SDL2_CACHE_NAME}/include/* ../external/include/SDL2 +cp -a ../${CACHE_DIR}/${SDL2_CACHE_NAME}/lib/*.dylib ../external/lib # # build SDL2_image and copy to external # -CACHE_NAME="SDL2_image-${SDL2_IMAGE_VERSION}-SDL2-${SDL2_VERSION}" +CACHE_NAME="SDL2_image-${SDL2_IMAGE_VERSION}-${SDL2_CACHE_NAME}" if [ ! -f "../${CACHE_DIR}/${CACHE_NAME}.cache" ]; then curl -sL https://github.com/libsdl-org/SDL_image/releases/download/release-${SDL2_IMAGE_VERSION}/SDL2_image-${SDL2_IMAGE_VERSION}.zip -o SDL2_image-${SDL2_IMAGE_VERSION}.zip @@ -151,7 +151,7 @@ cp -a ../${CACHE_DIR}/${CACHE_NAME}/lib/*.dylib ../external/lib # build SDL2_ttf and copy to external # -CACHE_NAME="SDL2_ttf-${SDL2_TTF_VERSION}-SDL2-${SDL2_VERSION}" +CACHE_NAME="SDL2_ttf-${SDL2_TTF_VERSION}-${SDL2_CACHE_NAME}" if [ ! -f "../${CACHE_DIR}/${CACHE_NAME}.cache" ]; then curl -sL https://github.com/libsdl-org/SDL_ttf/releases/download/release-${SDL2_TTF_VERSION}/SDL2_ttf-${SDL2_TTF_VERSION}.zip -o SDL2_ttf-${SDL2_TTF_VERSION}.zip diff --git a/standalone/tvos-arm64/external.sh b/standalone/tvos-arm64/external.sh index 9f018e571..f18c8a308 100755 --- a/standalone/tvos-arm64/external.sh +++ b/standalone/tvos-arm64/external.sh @@ -90,9 +90,9 @@ cp -r ../${CACHE_DIR}/${CACHE_NAME}/framework/*.framework ../external/framework # build SDL2 and copy to external # -CACHE_NAME="SDL2-${SDL2_VERSION}" +SDL2_CACHE_NAME="SDL2-${SDL2_VERSION}" -if [ ! -f "../${CACHE_DIR}/${CACHE_NAME}.cache" ]; then +if [ ! -f "../${CACHE_DIR}/${SDL2_CACHE_NAME}.cache" ]; then curl -sL https://github.com/libsdl-org/SDL/releases/download/release-${SDL2_VERSION}/SDL2-${SDL2_VERSION}.zip -o SDL2-${SDL2_VERSION}.zip unzip SDL2-${SDL2_VERSION}.zip cd SDL2-${SDL2_VERSION} @@ -102,23 +102,23 @@ if [ ! -f "../${CACHE_DIR}/${CACHE_NAME}.cache" ]; then -sdk appletvos \ -configuration Release \ clean build CONFIGURATION_BUILD_DIR="$(pwd)/sdl-build" - mkdir -p ../../${CACHE_DIR}/${CACHE_NAME}/include - cp include/*.h ../../${CACHE_DIR}/${CACHE_NAME}/include - mkdir -p ../../${CACHE_DIR}/${CACHE_NAME}/lib - cp sdl-build/*.a ../../${CACHE_DIR}/${CACHE_NAME}/lib + mkdir -p ../../${CACHE_DIR}/${SDL2_CACHE_NAME}/include + cp include/*.h ../../${CACHE_DIR}/${SDL2_CACHE_NAME}/include + mkdir -p ../../${CACHE_DIR}/${SDL2_CACHE_NAME}/lib + cp sdl-build/*.a ../../${CACHE_DIR}/${SDL2_CACHE_NAME}/lib cd .. - touch "../${CACHE_DIR}/${CACHE_NAME}.cache" + touch "../${CACHE_DIR}/${SDL2_CACHE_NAME}.cache" fi mkdir -p ../external/include/SDL2 -cp -r ../${CACHE_DIR}/${CACHE_NAME}/include/* ../external/include/SDL2 -cp ../${CACHE_DIR}/${CACHE_NAME}/lib/*.a ../external/lib +cp -r ../${CACHE_DIR}/${SDL2_CACHE_NAME}/include/* ../external/include/SDL2 +cp ../${CACHE_DIR}/${SDL2_CACHE_NAME}/lib/*.a ../external/lib # # build SDL2_image and copy to external # -CACHE_NAME="SDL2_image-${SDL2_IMAGE_VERSION}-SDL2-${SDL2_VERSION}" +CACHE_NAME="SDL2_image-${SDL2_IMAGE_VERSION}-${SDL2_CACHE_NAME}" if [ ! -f "../${CACHE_DIR}/${CACHE_NAME}.cache" ]; then curl -sL https://github.com/libsdl-org/SDL_image/releases/download/release-${SDL2_IMAGE_VERSION}/SDL2_image-${SDL2_IMAGE_VERSION}.zip -o SDL2_image-${SDL2_IMAGE_VERSION}.zip @@ -144,7 +144,7 @@ cp ../${CACHE_DIR}/${CACHE_NAME}/lib/*.a ../external/lib # build SDL2_ttf and copy to external # -CACHE_NAME="SDL2_ttf-${SDL2_TTF_VERSION}-SDL2-${SDL2_VERSION}" +CACHE_NAME="SDL2_ttf-${SDL2_TTF_VERSION}-${SDL2_CACHE_NAME}" if [ ! -f "../${CACHE_DIR}/${CACHE_NAME}.cache" ]; then curl -sL https://github.com/libsdl-org/SDL_ttf/releases/download/release-${SDL2_TTF_VERSION}/SDL2_ttf-${SDL2_TTF_VERSION}.zip -o SDL2_ttf-${SDL2_TTF_VERSION}.zip