diff --git a/SourcesAndScripts/Scripts/SDL2_build b/SourcesAndScripts/Scripts/SDL2_build index 4f7f720f..aba9d0eb 100755 --- a/SourcesAndScripts/Scripts/SDL2_build +++ b/SourcesAndScripts/Scripts/SDL2_build @@ -136,68 +136,6 @@ install_name_tool -id "@rpath/libSDL2_mixer-2.0.0.dylib" "${LIBS_PATH}/libSDL2_m ln -s "libSDL2_mixer-2.0.0.dylib" "${LIBS_PATH}/libSDL2_mixer.dylib" cp -rf "${SOURCES_PATH}/SDL2/SDL2_mixer/include/SDL_mixer.h" "${HEADERS_PATH}/SDL2/SDL_mixer.h" -cd "${SOURCES_PATH}/SDL2" - -get_src_and_verify_checksum "SDL2_net-${SDL2_NET_VERSION}.tar.gz" "${SDL2_NET_SHA256}" "https://www.libsdl.org/projects/SDL_net/release/SDL2_net-${SDL2_NET_VERSION}.tar.gz" -tar xf "${SOURCES_PATH}/archives/SDL2_net-${SDL2_NET_VERSION}.tar.gz" -C . -cp -R "SDL2_net-${SDL2_NET_VERSION}" "SDL2_net-${SDL2_NET_VERSION}-arm64" -mv "SDL2_net-${SDL2_NET_VERSION}" "SDL2_net-${SDL2_NET_VERSION}-x86_64" -ln -s "SDL2_net-${SDL2_NET_VERSION}-x86_64" "SDL2_net" -cd "SDL2_net" -# Build x86_64 -mkdir "tmp" -cp "${SOURCES_PATH}/SDL2/SDL2-${SDL2_VERSION}-x86_64/build/.libs/libSDL2_test.a" "tmp/" -source "${MY_PATH}/env" -export LDFLAGS="${LDFLAGS_X86_64} -L${SOURCES_PATH}/SDL2/SDL2_net-${SDL2_NET_VERSION}-x86_64/tmp" -export CFLAGS="${CFLAGS_X86_64}" -export CXXFLAGS="${CXXFLAGS_X86_64}" -./configure --disable-dependency-tracking --enable-shared --host=x86_64-apple-darwin -make -# Build arm64 -cd "${SOURCES_PATH}/SDL2/SDL2_net-${SDL2_NET_VERSION}-arm64" -mkdir "tmp" -cp "${SOURCES_PATH}/SDL2/SDL2-${SDL2_VERSION}-arm64/build/.libs/libSDL2_test.a" "tmp/" -source "${MY_PATH}/env" -export LDFLAGS="${LDFLAGS_ARM64} -L${SOURCES_PATH}/SDL2/SDL2_net-${SDL2_NET_VERSION}-arm64/tmp" -export CFLAGS="${CFLAGS_ARM64}" -export CXXFLAGS="${CXXFLAGS_ARM64}" -./configure --disable-dependency-tracking --enable-shared --host=aarch64-apple-darwin -make -rm -rf "${LIBS_PATH}/libSDL2_net-2.0.0.dylib" "${LIBS_PATH}/libSDL2_net.dylib" -lipo -create "${SOURCES_PATH}/SDL2/SDL2_net-${SDL2_NET_VERSION}-arm64/.libs/libSDL2_net-2.0.0.dylib" "${SOURCES_PATH}/SDL2/SDL2_net-${SDL2_NET_VERSION}-x86_64/.libs/libSDL2_net-2.0.0.dylib" -output "${LIBS_PATH}/libSDL2_net-2.0.0.dylib" -install_name_tool -id "@rpath/libSDL2_net-2.0.0.dylib" "${LIBS_PATH}/libSDL2_net-2.0.0.dylib" -ln -s "libSDL2_net-2.0.0.dylib" "${LIBS_PATH}/libSDL2_net.dylib" -cp -rf "${SOURCES_PATH}/SDL2/SDL2_net/SDL_net.h" "${HEADERS_PATH}/SDL2/SDL_net.h" - -cd "${SOURCES_PATH}/SDL2" - -get_src_and_verify_checksum "SDL2_ttf-${SDL2_TTF_VERSION}.tar.gz" "${SDL2_TTF_SHA256}" "https://github.com/libsdl-org/SDL_ttf/releases/download/release-${SDL2_TTF_VERSION}/SDL2_ttf-${SDL2_TTF_VERSION}.tar.gz" -tar xf "${SOURCES_PATH}/archives/SDL2_ttf-${SDL2_TTF_VERSION}.tar.gz" -C . -cp -R "SDL2_ttf-${SDL2_TTF_VERSION}" "SDL2_ttf-${SDL2_TTF_VERSION}-arm64" -mv "SDL2_ttf-${SDL2_TTF_VERSION}" "SDL2_ttf-${SDL2_TTF_VERSION}-x86_64" -ln -s "SDL2_ttf-${SDL2_TTF_VERSION}-x86_64" "SDL2_ttf" -cd "SDL2_ttf" -# Build x86_64 -source "${MY_PATH}/env" -export LDFLAGS="${LDFLAGS_X86_64}" -export CFLAGS="${CFLAGS_X86_64}" -export CXXFLAGS="${CXXFLAGS_X86_64}" -./configure --disable-dependency-tracking --enable-shared --host=x86_64-apple-darwin -make -# Build arm64 -cd "${SOURCES_PATH}/SDL2/SDL2_ttf-${SDL2_TTF_VERSION}-arm64" -source "${MY_PATH}/env" -export LDFLAGS="${LDFLAGS_ARM64}" -export CFLAGS="${CFLAGS_ARM64}" -export CXXFLAGS="${CXXFLAGS_ARM64}" -./configure --disable-dependency-tracking --enable-shared --host=aarch64-apple-darwin -make -rm -rf "${LIBS_PATH}/libSDL2_ttf-2.0.0.dylib" "${LIBS_PATH}/libSDL2_ttf.dylib" -lipo -create "${SOURCES_PATH}/SDL2/SDL2_ttf-${SDL2_TTF_VERSION}-arm64/.libs/libSDL2_ttf-2.0.0.dylib" "${SOURCES_PATH}/SDL2/SDL2_ttf-${SDL2_TTF_VERSION}-x86_64/.libs/libSDL2_ttf-2.0.0.dylib" -output "${LIBS_PATH}/libSDL2_ttf-2.0.0.dylib" -install_name_tool -id "@rpath/libSDL2_ttf-2.0.0.dylib" "${LIBS_PATH}/libSDL2_ttf-2.0.0.dylib" -ln -s "libSDL2_ttf-2.0.0.dylib" "${LIBS_PATH}/libSDL2_ttf.dylib" -cp -rf "${SOURCES_PATH}/SDL2/SDL2_ttf/SDL_ttf.h" "${HEADERS_PATH}/SDL2/SDL_ttf.h" - echo "==> DONE ..." echo "" time_interval_to_string "${starttimestamp}" "$(date +%s)"