1
0

Windows: update

This commit is contained in:
Maksym H 2023-08-01 02:02:59 +03:00
parent 73680423f5
commit 8d4be71810
15 changed files with 39 additions and 34 deletions

View File

@ -221,12 +221,15 @@ jobs:
run: run:
shell: msys2 {0} shell: msys2 {0}
steps: steps:
- uses: actions/checkout@v3 - name: Checkout
- uses: msys2/setup-msys2@v2 uses: actions/checkout@v3
- name: Install MSYS2
uses: msys2/setup-msys2@v2
with: with:
msystem: MINGW64 msystem: MINGW64
update: true update: true
install: mingw-w64-x86_64-gcc mingw-w64-x86_64-cmake mingw-w64-x86_64-autotools git zip install: mingw-w64-x86_64-clang mingw-w64-x86_64-cmake mingw-w64-x86_64-autotools mingw-w64-x86_64-tcl git zip
- name: Build - name: Build
run: | run: |
@ -243,7 +246,6 @@ jobs:
cp -r ./builtin MultiCraft/ cp -r ./builtin MultiCraft/
cp -r ./client MultiCraft/ cp -r ./client MultiCraft/
cp -r ./fonts MultiCraft/ cp -r ./fonts MultiCraft/
cp -r ./games MultiCraft/
cp -r ./locale MultiCraft/ cp -r ./locale MultiCraft/
cp -r ./textures MultiCraft/ cp -r ./textures MultiCraft/
zip -r MultiCraft.zip MultiCraft zip -r MultiCraft.zip MultiCraft
@ -322,5 +324,5 @@ jobs:
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v3
with: with:
name: msvc-${{ matrix.config.arch }}-${{ matrix.type }} name: MultiCraft-msvc-${{ matrix.config.arch }}-${{ matrix.type }}
path: .\Package\ path: .\Package\

View File

@ -6,7 +6,7 @@ SDL2_VERSION=2.26.5
if [ ! -d SDL2-src ]; then if [ ! -d SDL2-src ]; then
wget https://github.com/libsdl-org/SDL/archive/release-$SDL2_VERSION.tar.gz wget https://github.com/libsdl-org/SDL/archive/release-$SDL2_VERSION.tar.gz
tar -xzvf release-$SDL2_VERSION.tar.gz tar -xzf release-$SDL2_VERSION.tar.gz
mv SDL-release-$SDL2_VERSION sdl2-src mv SDL-release-$SDL2_VERSION sdl2-src
rm release-$SDL2_VERSION.tar.gz rm release-$SDL2_VERSION.tar.gz
fi fi
@ -22,7 +22,7 @@ cmake .. \
-DSDL_SHARED=0 \ -DSDL_SHARED=0 \
-DSDL_STATIC=1 -DSDL_STATIC=1
cmake --build . -j$NPROC cmake --build . -j${NPROC}
# update `include` folder # update `include` folder
rm -rf ../../sdl2/include rm -rf ../../sdl2/include

View File

@ -1,12 +1,12 @@
#!/bin/bash -e #!/bin/bash -e
FREETYPE_VERSION=2.13.0 FREETYPE_VERSION=2.13.1
. ./sdk.sh . ./sdk.sh
if [ ! -d freetype-src ]; then if [ ! -d freetype-src ]; then
wget https://download.savannah.gnu.org/releases/freetype/freetype-$FREETYPE_VERSION.tar.gz wget https://download-mirror.savannah.gnu.org/releases/freetype/freetype-$FREETYPE_VERSION.tar.gz
tar -xzvf freetype-$FREETYPE_VERSION.tar.gz tar -xzf freetype-$FREETYPE_VERSION.tar.gz
mv freetype-$FREETYPE_VERSION freetype-src mv freetype-$FREETYPE_VERSION freetype-src
rm freetype-$FREETYPE_VERSION.tar.gz rm freetype-$FREETYPE_VERSION.tar.gz
mkdir freetype-src/build mkdir freetype-src/build
@ -23,7 +23,7 @@ cmake .. \
-DFT_DISABLE_BROTLI=TRUE \ -DFT_DISABLE_BROTLI=TRUE \
-DCMAKE_C_FLAGS_RELEASE="$CFLAGS" -DCMAKE_C_FLAGS_RELEASE="$CFLAGS"
cmake --build . -j$NPROC cmake --build . -j${NPROC}
# update `include` folder # update `include` folder
rm -rf ../../freetype/include rm -rf ../../freetype/include

View File

@ -1,11 +1,11 @@
#!/bin/bash -e #!/bin/bash -e
. ./sdk.sh . ./sdk.sh
GETTEXT_VERSION=0.21.1 GETTEXT_VERSION=0.22
if [ ! -d gettext-src ]; then if [ ! -d gettext-src ]; then
wget https://ftp.gnu.org/pub/gnu/gettext/gettext-$GETTEXT_VERSION.tar.gz wget https://ftp.gnu.org/pub/gnu/gettext/gettext-$GETTEXT_VERSION.tar.gz
tar -xzvf gettext-$GETTEXT_VERSION.tar.gz tar -xzf gettext-$GETTEXT_VERSION.tar.gz
mv gettext-$GETTEXT_VERSION gettext-src mv gettext-$GETTEXT_VERSION gettext-src
rm gettext-$GETTEXT_VERSION.tar.gz rm gettext-$GETTEXT_VERSION.tar.gz
fi fi
@ -15,7 +15,7 @@ cd gettext-src/gettext-runtime
./configure CFLAGS="$CFLAGS" CPPFLAGS="$CXXFLAGS" \ ./configure CFLAGS="$CFLAGS" CPPFLAGS="$CXXFLAGS" \
--disable-shared --enable-static --disable-libasprintf --disable-shared --enable-static --disable-libasprintf
make -j$NPROC make -j${NPROC}
# update `include` folder # update `include` folder
rm -rf ../../gettext/include rm -rf ../../gettext/include

View File

@ -18,7 +18,7 @@ CPPFLAGS="$CPPFLAGS \
-I$DEPS_ROOT/libjpeg/include \ -I$DEPS_ROOT/libjpeg/include \
-I$DEPS_ROOT/libpng/include" \ -I$DEPS_ROOT/libpng/include" \
CXXFLAGS="$CXXFLAGS -std=gnu++17" \ CXXFLAGS="$CXXFLAGS -std=gnu++17" \
make staticlib_win32 -j$NPROC NDEBUG=1 make staticlib_win32 -j${NPROC} NDEBUG=1
# update `include` folder # update `include` folder
rm -rf ../../../irrlicht/include rm -rf ../../../irrlicht/include

View File

@ -1,13 +1,13 @@
#!/bin/bash -e #!/bin/bash -e
. ./sdk.sh . ./sdk.sh
CURL_VERSION=8.1.1 CURL_VERSION=8.2.1
export DEPS_ROOT=$(pwd) export DEPS_ROOT=$(pwd)
if [ ! -d libcurl-src ]; then if [ ! -d libcurl-src ]; then
wget https://curl.haxx.se/download/curl-$CURL_VERSION.tar.gz wget https://curl.haxx.se/download/curl-$CURL_VERSION.tar.gz
tar -xzvf curl-$CURL_VERSION.tar.gz tar -xzf curl-$CURL_VERSION.tar.gz
mv curl-$CURL_VERSION libcurl-src mv curl-$CURL_VERSION libcurl-src
rm curl-$CURL_VERSION.tar.gz rm curl-$CURL_VERSION.tar.gz
fi fi
@ -27,7 +27,7 @@ cd libcurl-src
--without-zstd --without-brotli --without-nghttp2 --without-libidn2 \ --without-zstd --without-brotli --without-nghttp2 --without-libidn2 \
--without-libpsl --without-libpsl
make -j$NPROC make -j${NPROC}
# update `include` folder # update `include` folder
rm -rf ../libcurl/include rm -rf ../libcurl/include

View File

@ -1,11 +1,11 @@
#!/bin/bash -e #!/bin/bash -e
. ./sdk.sh . ./sdk.sh
JPEG_VERSION=2.1.5.1 JPEG_VERSION=3.0.0
if [ ! -d libjpeg-src ]; then if [ ! -d libjpeg-src ]; then
wget https://download.sourceforge.net/libjpeg-turbo/libjpeg-turbo-$JPEG_VERSION.tar.gz wget https://download.sourceforge.net/libjpeg-turbo/libjpeg-turbo-$JPEG_VERSION.tar.gz
tar -xzvf libjpeg-turbo-$JPEG_VERSION.tar.gz tar -xzf libjpeg-turbo-$JPEG_VERSION.tar.gz
mv libjpeg-turbo-$JPEG_VERSION libjpeg-src mv libjpeg-turbo-$JPEG_VERSION libjpeg-src
rm libjpeg-turbo-$JPEG_VERSION.tar.gz rm libjpeg-turbo-$JPEG_VERSION.tar.gz
mkdir libjpeg-src/build mkdir libjpeg-src/build
@ -18,7 +18,7 @@ cmake .. \
-DENABLE_SHARED=OFF \ -DENABLE_SHARED=OFF \
-DCMAKE_C_FLAGS_RELEASE="$CFLAGS" -DCMAKE_C_FLAGS_RELEASE="$CFLAGS"
cmake --build . -j$NPROC cmake --build . -j${NPROC}
# update `include` folder # update `include` folder
rm -rf ../../libjpeg/include rm -rf ../../libjpeg/include

View File

@ -15,7 +15,7 @@ cmake .. \
-DCMAKE_C_FLAGS_RELEASE="$CFLAGS" \ -DCMAKE_C_FLAGS_RELEASE="$CFLAGS" \
-DCMAKE_CXX_FLAGS="$CXXFLAGS -fPIC" -DCMAKE_CXX_FLAGS="$CXXFLAGS -fPIC"
cmake --build . -j$NPROC cmake --build . -j${NPROC}
# update `include` folder # update `include` folder
rm -rf ../../libogg/include rm -rf ../../libogg/include

View File

@ -1,13 +1,13 @@
#!/bin/bash -e #!/bin/bash -e
. ./sdk.sh . ./sdk.sh
PNG_VERSION=1.6.39 PNG_VERSION=1.6.40
export DEPS_ROOT=$(pwd) export DEPS_ROOT=$(pwd)
if [ ! -d libpng-src ]; then if [ ! -d libpng-src ]; then
wget https://download.sourceforge.net/libpng/libpng-$PNG_VERSION.tar.gz wget https://download.sourceforge.net/libpng/libpng-$PNG_VERSION.tar.gz
tar -xzvf libpng-$PNG_VERSION.tar.gz tar -xzf libpng-$PNG_VERSION.tar.gz
mv libpng-$PNG_VERSION libpng-src mv libpng-$PNG_VERSION libpng-src
rm libpng-$PNG_VERSION.tar.gz rm libpng-$PNG_VERSION.tar.gz
mkdir libpng-src/build mkdir libpng-src/build
@ -24,7 +24,7 @@ cmake .. \
-DZLIB_INCLUDE_DIRS="$DEPS_ROOT/zlib/include" \ -DZLIB_INCLUDE_DIRS="$DEPS_ROOT/zlib/include" \
-DCMAKE_C_FLAGS_RELEASE="$CFLAGS" -DCMAKE_C_FLAGS_RELEASE="$CFLAGS"
cmake --build . -j$NPROC cmake --build . -j${NPROC}
# update `include` folder # update `include` folder
rm -rf ../../libpng/include rm -rf ../../libpng/include

View File

@ -6,14 +6,14 @@ LUAJIT_VERSION=2.1
if [ ! -d luajit-src ]; then if [ ! -d luajit-src ]; then
wget https://github.com/LuaJIT/LuaJIT/archive/v$LUAJIT_VERSION.tar.gz wget https://github.com/LuaJIT/LuaJIT/archive/v$LUAJIT_VERSION.tar.gz
tar -xzvf v$LUAJIT_VERSION.tar.gz tar -xzf v$LUAJIT_VERSION.tar.gz
mv LuaJIT-$LUAJIT_VERSION luajit-src mv LuaJIT-$LUAJIT_VERSION luajit-src
rm v$LUAJIT_VERSION.tar.gz rm v$LUAJIT_VERSION.tar.gz
fi fi
cd luajit-src cd luajit-src
make amalg -j$NPROC BUILDMODE=static make amalg -j${NPROC} BUILDMODE=static
# update `include` folder # update `include` folder
rm -rf ../luajit/include rm -rf ../luajit/include

View File

@ -20,7 +20,7 @@ cmake .. \
-DCMAKE_C_FLAGS="$CFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \
-DCMAKE_CXX_FLAGS="$CXXFLAGS -fPIC" -DCMAKE_CXX_FLAGS="$CXXFLAGS -fPIC"
cmake --build . -j$NPROC cmake --build . -j${NPROC}
# update `include` folder # update `include` folder
rm -rf ../../openal/include rm -rf ../../openal/include

View File

@ -1,6 +1,9 @@
#!/bin/bash -e #!/bin/bash -e
export CC=clang
export CXX=clang++
export CFLAGS="-fvisibility=hidden -fexceptions -O3" export CFLAGS="-fvisibility=hidden -fexceptions -O3"
export CXXFLAGS="$CFLAGS -frtti -O3" export CXXFLAGS="$CFLAGS -frtti -O3"
export NPROC=`nproc` export NPROC=$(( $(nproc) + 1 ))

View File

@ -6,7 +6,7 @@ SQLITE_VERSION=3.42.0
if [ ! -d sqlite-src ]; then if [ ! -d sqlite-src ]; then
wget https://www.sqlite.org/src/tarball/sqlite.tar.gz?r=version-$SQLITE_VERSION wget https://www.sqlite.org/src/tarball/sqlite.tar.gz?r=version-$SQLITE_VERSION
tar -xzvf sqlite.tar.gz?r=version-$SQLITE_VERSION tar -xzf sqlite.tar.gz?r=version-$SQLITE_VERSION
mv sqlite sqlite-src mv sqlite sqlite-src
rm sqlite.tar.gz?r=version-$SQLITE_VERSION rm sqlite.tar.gz?r=version-$SQLITE_VERSION
mkdir sqlite-src/build mkdir sqlite-src/build
@ -18,7 +18,7 @@ cd sqlite-src/build
--enable-shared \ --enable-shared \
--enable-static --enable-static
make -j$NPROC make -j${NPROC}
# update `include` folder # update `include` folder
rm -rf ../../sqlite/include rm -rf ../../sqlite/include

View File

@ -17,7 +17,7 @@ cmake .. \
-DCMAKE_C_FLAGS_RELEASE="$CFLAGS" \ -DCMAKE_C_FLAGS_RELEASE="$CFLAGS" \
-DCMAKE_CXX_FLAGS="$CXXFLAGS -fPIC" -DCMAKE_CXX_FLAGS="$CXXFLAGS -fPIC"
cmake --build . -j$NPROC cmake --build . -j${NPROC}
# update `include` folder # update `include` folder
rm -rf ../../libvorbis/include rm -rf ../../libvorbis/include

View File

@ -6,7 +6,7 @@ ZLIB_VERSION=1.2.13
if [ ! -d zlib-src ]; then if [ ! -d zlib-src ]; then
wget https://github.com/madler/zlib/archive/v$ZLIB_VERSION.tar.gz wget https://github.com/madler/zlib/archive/v$ZLIB_VERSION.tar.gz
tar -xzvf v$ZLIB_VERSION.tar.gz tar -xzf v$ZLIB_VERSION.tar.gz
mv zlib-$ZLIB_VERSION zlib-src mv zlib-$ZLIB_VERSION zlib-src
rm v$ZLIB_VERSION.tar.gz rm v$ZLIB_VERSION.tar.gz
fi fi
@ -19,7 +19,7 @@ cmake .. \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_C_FLAGS="$CFLAGS" -DCMAKE_C_FLAGS="$CFLAGS"
cmake --build . -j$NPROC cmake --build . -j${NPROC}
# update `include` folder # update `include` folder
rm -rf ../../zlib/include rm -rf ../../zlib/include