Compare commits
5 Commits
074e6a67de
...
83a7b48bb1
| Author | SHA1 | Date |
|---|---|---|
sfan5
|
83a7b48bb1 | |
Wuzzy
|
228f1c6770 | |
|
sfan5
|
734fb2c811 | |
|
sfan5
|
9660ae288a | |
|
Wuzzy
|
776015c350 |
|
|
@ -171,10 +171,10 @@ build:fedora-28:
|
|||
##
|
||||
|
||||
.generic_win_template:
|
||||
image: ubuntu:bionic
|
||||
image: ubuntu:focal
|
||||
before_script:
|
||||
- apt-get update
|
||||
- apt-get install -y wget xz-utils unzip git cmake gettext
|
||||
- DEBIAN_FRONTEND=noninteractive apt-get install -y wget xz-utils unzip git cmake gettext
|
||||
- wget -nv http://minetest.kitsunemimi.pw/mingw-w64-${WIN_ARCH}_9.2.0_ubuntu18.04.tar.xz -O mingw.tar.xz
|
||||
- tar -xaf mingw.tar.xz -C /usr
|
||||
|
||||
|
|
@ -184,13 +184,13 @@ build:fedora-28:
|
|||
artifacts:
|
||||
expire_in: 1h
|
||||
paths:
|
||||
- _build/*
|
||||
- build/build/*.zip
|
||||
|
||||
.package_win_template:
|
||||
extends: .generic_win_template
|
||||
stage: package
|
||||
script:
|
||||
- unzip _build/minetest-*.zip
|
||||
- unzip build/build/*.zip
|
||||
- cp -p /usr/${WIN_ARCH}-w64-mingw32/bin/libgcc*.dll minetest-*-win*/bin/
|
||||
- cp -p /usr/${WIN_ARCH}-w64-mingw32/bin/libstdc++*.dll minetest-*-win*/bin/
|
||||
- cp -p /usr/${WIN_ARCH}-w64-mingw32/bin/libwinpthread*.dll minetest-*-win*/bin/
|
||||
|
|
|
|||
|
|
@ -60,9 +60,9 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
|
|||
# This is done here so that relative search paths are more reasonable
|
||||
find_package(Irrlicht)
|
||||
if(BUILD_CLIENT AND NOT IRRLICHT_FOUND)
|
||||
message(FATAL_ERROR "Irrlicht is required to build the client, but it was not found.")
|
||||
message(FATAL_ERROR "IrrlichtMt is required to build the client, but it was not found.")
|
||||
elseif(NOT IRRLICHT_INCLUDE_DIR)
|
||||
message(FATAL_ERROR "Irrlicht headers are required to build the server, but none found.")
|
||||
message(FATAL_ERROR "Irrlicht or IrrlichtMt headers are required to build the server, but none found.")
|
||||
endif()
|
||||
|
||||
include(CheckSymbolExists)
|
||||
|
|
@ -71,7 +71,7 @@ unset(HAS_FORKED_IRRLICHT CACHE)
|
|||
check_symbol_exists(IRRLICHT_VERSION_MT "IrrCompileConfig.h" HAS_FORKED_IRRLICHT)
|
||||
if(NOT HAS_FORKED_IRRLICHT)
|
||||
string(CONCAT EXPLANATION_MSG
|
||||
"Irrlicht found, but it is not Minetest's Irrlicht fork. "
|
||||
"Irrlicht found, but it is not IrrlichtMt (Minetest's Irrlicht fork). "
|
||||
"The Minetest team has forked Irrlicht to make their own customizations. "
|
||||
"It can be found here: https://github.com/minetest/irrlicht")
|
||||
if(BUILD_CLIENT)
|
||||
|
|
|
|||
|
|
@ -87,7 +87,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
Irrlicht
|
||||
---------------
|
||||
|
||||
This program uses the Irrlicht Engine. http://irrlicht.sourceforge.net/
|
||||
This program uses IrrlichtMt, Minetest's fork of
|
||||
the Irrlicht Engine. http://irrlicht.sourceforge.net/
|
||||
|
||||
The Irrlicht Engine License
|
||||
|
||||
|
|
|
|||
|
|
@ -134,7 +134,7 @@ Compiling
|
|||
|------------|---------|------------|
|
||||
| GCC | 4.9+ | Can be replaced with Clang 3.4+ |
|
||||
| CMake | 3.5+ | |
|
||||
| Irrlicht | - | Custom version required, see https://github.com/minetest/irrlicht |
|
||||
| IrrlichtMt | - | Custom version of Irrlicht, see https://github.com/minetest/irrlicht |
|
||||
| SQLite3 | 3.0+ | |
|
||||
| LuaJIT | 2.0+ | Bundled Lua 5.1 is used if not present |
|
||||
| GMP | 5.0.0+ | Bundled mini-GMP is used if not present |
|
||||
|
|
@ -209,7 +209,7 @@ Run it:
|
|||
- You can disable the client build by specifying `-DBUILD_CLIENT=FALSE`.
|
||||
- You can select between Release and Debug build by `-DCMAKE_BUILD_TYPE=<Debug or Release>`.
|
||||
- Debug build is slower, but gives much more useful output in a debugger.
|
||||
- If you build a bare server you don't need to have the Irrlicht library installed.
|
||||
- If you build a bare server you don't need to have the Irrlicht or IrrlichtMt library installed.
|
||||
- In that case use `-DIRRLICHT_INCLUDE_DIR=/some/where/irrlicht/include`.
|
||||
|
||||
### CMake options
|
||||
|
|
@ -229,7 +229,7 @@ General options and their default values:
|
|||
ENABLE_CURSES=ON - Build with (n)curses; Enables a server side terminal (command line option: --terminal)
|
||||
ENABLE_FREETYPE=ON - Build with FreeType2; Allows using TTF fonts
|
||||
ENABLE_GETTEXT=ON - Build with Gettext; Allows using translations
|
||||
ENABLE_GLES=OFF - Build for OpenGL ES instead of OpenGL (requires support by Irrlicht)
|
||||
ENABLE_GLES=OFF - Build for OpenGL ES instead of OpenGL (requires support by IrrlichtMt)
|
||||
ENABLE_LEVELDB=ON - Build with LevelDB; Enables use of LevelDB map backend
|
||||
ENABLE_POSTGRESQL=ON - Build with libpq; Enables use of PostgreSQL map backend (PostgreSQL 9.5 or greater recommended)
|
||||
ENABLE_REDIS=ON - Build with libhiredis; Enables use of Redis map backend
|
||||
|
|
|
|||
|
|
@ -205,6 +205,14 @@ core.register_entity(":__builtin:falling_node", {
|
|||
end
|
||||
end
|
||||
self.object:set_rotation({x=pitch, y=yaw, z=roll})
|
||||
elseif (def.drawtype == "mesh" and def.paramtype2 == "degrotate") then
|
||||
local p2 = (node.param2 - (def.place_param2 or 0)) % 240
|
||||
local yaw = (p2 / 240) * (math.pi * 2)
|
||||
self.object:set_yaw(yaw)
|
||||
elseif (def.drawtype == "mesh" and def.paramtype2 == "colordegrotate") then
|
||||
local p2 = (node.param2 % 32 - (def.place_param2 or 0) % 32) % 24
|
||||
local yaw = (p2 / 24) * (math.pi * 2)
|
||||
self.object:set_yaw(yaw)
|
||||
end
|
||||
end
|
||||
end,
|
||||
|
|
|
|||
|
|
@ -661,7 +661,7 @@ lighting_boost_spread (Light curve boost spread) float 0.2 0.0 0.4
|
|||
# Path to texture directory. All textures are first searched from here.
|
||||
texture_path (Texture path) path
|
||||
|
||||
# The rendering back-end for Irrlicht.
|
||||
# The rendering back-end.
|
||||
# A restart is required after changing this.
|
||||
# Note: On Android, stick with OGLES1 if unsure! App may fail to start otherwise.
|
||||
# On other platforms, OpenGL is recommended.
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
mark_as_advanced(IRRLICHT_LIBRARY IRRLICHT_INCLUDE_DIR IRRLICHT_DLL)
|
||||
mark_as_advanced(IRRLICHT_DLL)
|
||||
|
||||
# Find include directory and libraries
|
||||
|
||||
|
|
@ -29,8 +29,22 @@ foreach(libname IN ITEMS IrrlichtMt Irrlicht)
|
|||
endif()
|
||||
endforeach()
|
||||
|
||||
# Users will likely need to edit these
|
||||
mark_as_advanced(CLEAR IRRLICHT_LIBRARY IRRLICHT_INCLUDE_DIR)
|
||||
# Handholding for users
|
||||
if(IRRLICHT_INCLUDE_DIR AND (NOT IS_DIRECTORY "${IRRLICHT_INCLUDE_DIR}" OR
|
||||
NOT EXISTS "${IRRLICHT_INCLUDE_DIR}/irrlicht.h"))
|
||||
message(WARNING "IRRLICHT_INCLUDE_DIR was set to ${IRRLICHT_INCLUDE_DIR} "
|
||||
"but irrlicht.h does not exist inside. The path will not be used.")
|
||||
unset(IRRLICHT_INCLUDE_DIR CACHE)
|
||||
endif()
|
||||
if(WIN32 OR CMAKE_SYSTEM_NAME STREQUAL "Linux" OR APPLE)
|
||||
# (only on systems where we're sure how a valid library looks like)
|
||||
if(IRRLICHT_LIBRARY AND (IS_DIRECTORY "${IRRLICHT_LIBRARY}" OR
|
||||
NOT IRRLICHT_LIBRARY MATCHES "\\.(a|so|dylib|lib)([.0-9]+)?$"))
|
||||
message(WARNING "IRRLICHT_LIBRARY was set to ${IRRLICHT_LIBRARY} "
|
||||
"but is not a valid library file. The path will not be used.")
|
||||
unset(IRRLICHT_LIBRARY CACHE)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
# On Windows, find the DLL for installation
|
||||
if(WIN32)
|
||||
|
|
|
|||
|
|
@ -131,10 +131,11 @@ local function place_nodes(param)
|
|||
p2_max = 63
|
||||
elseif def.paramtype2 == "leveled" then
|
||||
p2_max = 127
|
||||
elseif def.paramtype2 == "degrotate" and def.drawtype == "plantlike" then
|
||||
p2_max = 179
|
||||
elseif def.paramtype2 == "degrotate" and (def.drawtype == "plantlike" or def.drawtype == "mesh") then
|
||||
p2_max = 239
|
||||
elseif def.paramtype2 == "colorfacedir" or
|
||||
def.paramtype2 == "colorwallmounted" or
|
||||
def.paramtype2 == "colordegrotate" or
|
||||
def.paramtype2 == "color" then
|
||||
p2_max = 255
|
||||
end
|
||||
|
|
@ -143,7 +144,8 @@ local function place_nodes(param)
|
|||
-- Skip undefined param2 values
|
||||
if not ((def.paramtype2 == "meshoptions" and p2 % 8 > 4) or
|
||||
(def.paramtype2 == "colorwallmounted" and p2 % 8 > 5) or
|
||||
(def.paramtype2 == "colorfacedir" and p2 % 32 > 23)) then
|
||||
((def.paramtype2 == "colorfacedir" or def.paramtype2 == "colordegrotate")
|
||||
and p2 % 32 > 23)) then
|
||||
|
||||
minetest.set_node(pos, { name = itemstring, param2 = p2 })
|
||||
nodes_placed = nodes_placed + 1
|
||||
|
|
|
|||
|
|
@ -254,11 +254,11 @@ minetest.register_node("testnodes:mesh_degrotate", {
|
|||
drawtype = "mesh",
|
||||
paramtype = "light",
|
||||
paramtype2 = "degrotate",
|
||||
mesh = "testnodes_pyramid.obj",
|
||||
mesh = "testnodes_ocorner.obj",
|
||||
tiles = { "testnodes_mesh_stripes2.png" },
|
||||
|
||||
on_rightclick = rotate_on_rightclick,
|
||||
place_param2 = 7,
|
||||
place_param2 = 10, -- 15°
|
||||
sunlight_propagates = true,
|
||||
groups = { dig_immediate = 3 },
|
||||
})
|
||||
|
|
@ -266,14 +266,15 @@ minetest.register_node("testnodes:mesh_degrotate", {
|
|||
minetest.register_node("testnodes:mesh_colordegrotate", {
|
||||
description = S("Color Degrotate Mesh Drawtype Test Node"),
|
||||
drawtype = "mesh",
|
||||
paramtype = "light",
|
||||
paramtype2 = "colordegrotate",
|
||||
palette = "testnodes_palette_facedir.png",
|
||||
mesh = "testnodes_pyramid.obj",
|
||||
tiles = { "testnodes_mesh_stripes2.png" },
|
||||
mesh = "testnodes_ocorner.obj",
|
||||
tiles = { "testnodes_mesh_stripes3.png" },
|
||||
|
||||
on_rightclick = rotate_on_rightclick,
|
||||
-- color index 1, 7 steps rotated
|
||||
place_param2 = 1 * 2^5 + 7,
|
||||
-- color index 1, 1 step (=15°) rotated
|
||||
place_param2 = 1 * 2^5 + 1,
|
||||
sunlight_propagates = true,
|
||||
groups = { dig_immediate = 3 },
|
||||
})
|
||||
|
|
|
|||
|
|
@ -761,7 +761,7 @@
|
|||
# type: path
|
||||
# texture_path =
|
||||
|
||||
# The rendering back-end for Irrlicht.
|
||||
# The rendering back-end.
|
||||
# A restart is required after changing this.
|
||||
# Note: On Android, stick with OGLES1 if unsure! App may fail to start otherwise.
|
||||
# On other platforms, OpenGL is recommended.
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@ fi
|
|||
builddir=$1
|
||||
mkdir -p $builddir
|
||||
builddir="$( cd "$builddir" && pwd )"
|
||||
packagedir=$builddir/packages
|
||||
libdir=$builddir/libs
|
||||
|
||||
# Test which win32 compiler is present
|
||||
|
|
@ -32,58 +31,50 @@ fi
|
|||
echo "Using $toolchain_file"
|
||||
|
||||
irrlicht_version=1.9.0mt1
|
||||
ogg_version=1.3.2
|
||||
vorbis_version=1.3.5
|
||||
curl_version=7.65.3
|
||||
ogg_version=1.3.4
|
||||
vorbis_version=1.3.7
|
||||
curl_version=7.76.1
|
||||
gettext_version=0.20.1
|
||||
freetype_version=2.10.1
|
||||
sqlite3_version=3.27.2
|
||||
freetype_version=2.10.4
|
||||
sqlite3_version=3.35.5
|
||||
luajit_version=2.1.0-beta3
|
||||
leveldb_version=1.22
|
||||
leveldb_version=1.23
|
||||
zlib_version=1.2.11
|
||||
|
||||
mkdir -p $packagedir
|
||||
mkdir -p $libdir
|
||||
|
||||
cd $builddir
|
||||
download () {
|
||||
local url=$1
|
||||
local filename=$2
|
||||
[ -z "$filename" ] && filename=${url##*/}
|
||||
local foldername=${filename%%[.-]*}
|
||||
local extract=$3
|
||||
[ -z "$extract" ] && extract=unzip
|
||||
|
||||
[ -d "./$foldername" ] && return 0
|
||||
wget "$url" -c -O "./$filename"
|
||||
if [ "$extract" = "unzip" ]; then
|
||||
unzip -o "$filename" -d "$foldername"
|
||||
elif [ "$extract" = "unzip_nofolder" ]; then
|
||||
unzip -o "$filename"
|
||||
else
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
# Get stuff
|
||||
[ -e $packagedir/irrlicht-$irrlicht_version.zip ] || wget https://github.com/minetest/irrlicht/releases/download/$irrlicht_version/win32.zip \
|
||||
-c -O $packagedir/irrlicht-$irrlicht_version.zip
|
||||
[ -e $packagedir/zlib-$zlib_version.zip ] || wget http://minetest.kitsunemimi.pw/zlib-$zlib_version-win32.zip \
|
||||
-c -O $packagedir/zlib-$zlib_version.zip
|
||||
[ -e $packagedir/libogg-$ogg_version.zip ] || wget http://minetest.kitsunemimi.pw/libogg-$ogg_version-win32.zip \
|
||||
-c -O $packagedir/libogg-$ogg_version.zip
|
||||
[ -e $packagedir/libvorbis-$vorbis_version.zip ] || wget http://minetest.kitsunemimi.pw/libvorbis-$vorbis_version-win32.zip \
|
||||
-c -O $packagedir/libvorbis-$vorbis_version.zip
|
||||
[ -e $packagedir/curl-$curl_version.zip ] || wget http://minetest.kitsunemimi.pw/curl-$curl_version-win32.zip \
|
||||
-c -O $packagedir/curl-$curl_version.zip
|
||||
[ -e $packagedir/gettext-$gettext_version.zip ] || wget http://minetest.kitsunemimi.pw/gettext-$gettext_version-win32.zip \
|
||||
-c -O $packagedir/gettext-$gettext_version.zip
|
||||
[ -e $packagedir/freetype2-$freetype_version.zip ] || wget http://minetest.kitsunemimi.pw/freetype2-$freetype_version-win32.zip \
|
||||
-c -O $packagedir/freetype2-$freetype_version.zip
|
||||
[ -e $packagedir/sqlite3-$sqlite3_version.zip ] || wget http://minetest.kitsunemimi.pw/sqlite3-$sqlite3_version-win32.zip \
|
||||
-c -O $packagedir/sqlite3-$sqlite3_version.zip
|
||||
[ -e $packagedir/luajit-$luajit_version.zip ] || wget http://minetest.kitsunemimi.pw/luajit-$luajit_version-win32.zip \
|
||||
-c -O $packagedir/luajit-$luajit_version.zip
|
||||
[ -e $packagedir/libleveldb-$leveldb_version.zip ] || wget http://minetest.kitsunemimi.pw/libleveldb-$leveldb_version-win32.zip \
|
||||
-c -O $packagedir/libleveldb-$leveldb_version.zip
|
||||
[ -e $packagedir/openal_stripped.zip ] || wget http://minetest.kitsunemimi.pw/openal_stripped.zip \
|
||||
-c -O $packagedir/openal_stripped.zip
|
||||
|
||||
# Extract stuff
|
||||
cd $libdir
|
||||
[ -d irrlicht ] || unzip -o $packagedir/irrlicht-$irrlicht_version.zip -d irrlicht
|
||||
[ -d zlib ] || unzip -o $packagedir/zlib-$zlib_version.zip -d zlib
|
||||
[ -d libogg ] || unzip -o $packagedir/libogg-$ogg_version.zip -d libogg
|
||||
[ -d libvorbis ] || unzip -o $packagedir/libvorbis-$vorbis_version.zip -d libvorbis
|
||||
[ -d libcurl ] || unzip -o $packagedir/curl-$curl_version.zip -d libcurl
|
||||
[ -d gettext ] || unzip -o $packagedir/gettext-$gettext_version.zip -d gettext
|
||||
[ -d freetype ] || unzip -o $packagedir/freetype2-$freetype_version.zip -d freetype
|
||||
[ -d sqlite3 ] || unzip -o $packagedir/sqlite3-$sqlite3_version.zip -d sqlite3
|
||||
[ -d openal_stripped ] || unzip -o $packagedir/openal_stripped.zip
|
||||
[ -d luajit ] || unzip -o $packagedir/luajit-$luajit_version.zip -d luajit
|
||||
[ -d leveldb ] || unzip -o $packagedir/libleveldb-$leveldb_version.zip -d leveldb
|
||||
download "https://github.com/minetest/irrlicht/releases/download/$irrlicht_version/win32.zip" irrlicht-$irrlicht_version.zip
|
||||
download "http://minetest.kitsunemimi.pw/zlib-$zlib_version-win32.zip"
|
||||
download "http://minetest.kitsunemimi.pw/libogg-$ogg_version-win32.zip"
|
||||
download "http://minetest.kitsunemimi.pw/libvorbis-$vorbis_version-win32.zip"
|
||||
download "http://minetest.kitsunemimi.pw/curl-$curl_version-win32.zip"
|
||||
download "http://minetest.kitsunemimi.pw/gettext-$gettext_version-win32.zip"
|
||||
download "http://minetest.kitsunemimi.pw/freetype2-$freetype_version-win32.zip" freetype-$freetype_version.zip
|
||||
download "http://minetest.kitsunemimi.pw/sqlite3-$sqlite3_version-win32.zip"
|
||||
download "http://minetest.kitsunemimi.pw/luajit-$luajit_version-win32.zip"
|
||||
download "http://minetest.kitsunemimi.pw/libleveldb-$leveldb_version-win32.zip" leveldb-$leveldb_version.zip
|
||||
download "http://minetest.kitsunemimi.pw/openal_stripped.zip" '' unzip_nofolder
|
||||
|
||||
# Set source dir, downloading Minetest as needed
|
||||
if [ -n "$EXISTING_MINETEST_DIR" ]; then
|
||||
|
|
@ -146,9 +137,9 @@ cmake -S $sourcedir -B . \
|
|||
-DOPENAL_LIBRARY=$libdir/openal_stripped/lib/libOpenAL32.dll.a \
|
||||
-DOPENAL_DLL=$libdir/openal_stripped/bin/OpenAL32.dll \
|
||||
\
|
||||
-DCURL_DLL=$libdir/libcurl/bin/libcurl-4.dll \
|
||||
-DCURL_INCLUDE_DIR=$libdir/libcurl/include \
|
||||
-DCURL_LIBRARY=$libdir/libcurl/lib/libcurl.dll.a \
|
||||
-DCURL_DLL=$libdir/curl/bin/libcurl-4.dll \
|
||||
-DCURL_INCLUDE_DIR=$libdir/curl/include \
|
||||
-DCURL_LIBRARY=$libdir/curl/lib/libcurl.dll.a \
|
||||
\
|
||||
-DGETTEXT_MSGFMT=`which msgfmt` \
|
||||
-DGETTEXT_DLL="$gettext_dlls" \
|
||||
|
|
|
|||
|
|
@ -16,63 +16,54 @@ fi
|
|||
builddir=$1
|
||||
mkdir -p $builddir
|
||||
builddir="$( cd "$builddir" && pwd )"
|
||||
packagedir=$builddir/packages
|
||||
libdir=$builddir/libs
|
||||
|
||||
toolchain_file=$dir/toolchain_x86_64-w64-mingw32.cmake
|
||||
irrlicht_version=1.9.0mt1
|
||||
ogg_version=1.3.2
|
||||
vorbis_version=1.3.5
|
||||
curl_version=7.65.3
|
||||
ogg_version=1.3.4
|
||||
vorbis_version=1.3.7
|
||||
curl_version=7.76.1
|
||||
gettext_version=0.20.1
|
||||
freetype_version=2.10.1
|
||||
sqlite3_version=3.27.2
|
||||
freetype_version=2.10.4
|
||||
sqlite3_version=3.35.5
|
||||
luajit_version=2.1.0-beta3
|
||||
leveldb_version=1.22
|
||||
leveldb_version=1.23
|
||||
zlib_version=1.2.11
|
||||
|
||||
mkdir -p $packagedir
|
||||
mkdir -p $libdir
|
||||
|
||||
cd $builddir
|
||||
download () {
|
||||
local url=$1
|
||||
local filename=$2
|
||||
[ -z "$filename" ] && filename=${url##*/}
|
||||
local foldername=${filename%%[.-]*}
|
||||
local extract=$3
|
||||
[ -z "$extract" ] && extract=unzip
|
||||
|
||||
[ -d "./$foldername" ] && return 0
|
||||
wget "$url" -c -O "./$filename"
|
||||
if [ "$extract" = "unzip" ]; then
|
||||
unzip -o "$filename" -d "$foldername"
|
||||
elif [ "$extract" = "unzip_nofolder" ]; then
|
||||
unzip -o "$filename"
|
||||
else
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
# Get stuff
|
||||
[ -e $packagedir/irrlicht-$irrlicht_version.zip ] || wget https://github.com/minetest/irrlicht/releases/download/$irrlicht_version/win64.zip \
|
||||
-c -O $packagedir/irrlicht-$irrlicht_version.zip
|
||||
[ -e $packagedir/zlib-$zlib_version.zip ] || wget http://minetest.kitsunemimi.pw/zlib-$zlib_version-win64.zip \
|
||||
-c -O $packagedir/zlib-$zlib_version.zip
|
||||
[ -e $packagedir/libogg-$ogg_version.zip ] || wget http://minetest.kitsunemimi.pw/libogg-$ogg_version-win64.zip \
|
||||
-c -O $packagedir/libogg-$ogg_version.zip
|
||||
[ -e $packagedir/libvorbis-$vorbis_version.zip ] || wget http://minetest.kitsunemimi.pw/libvorbis-$vorbis_version-win64.zip \
|
||||
-c -O $packagedir/libvorbis-$vorbis_version.zip
|
||||
[ -e $packagedir/curl-$curl_version.zip ] || wget http://minetest.kitsunemimi.pw/curl-$curl_version-win64.zip \
|
||||
-c -O $packagedir/curl-$curl_version.zip
|
||||
[ -e $packagedir/gettext-$gettext_version.zip ] || wget http://minetest.kitsunemimi.pw/gettext-$gettext_version-win64.zip \
|
||||
-c -O $packagedir/gettext-$gettext_version.zip
|
||||
[ -e $packagedir/freetype2-$freetype_version.zip ] || wget http://minetest.kitsunemimi.pw/freetype2-$freetype_version-win64.zip \
|
||||
-c -O $packagedir/freetype2-$freetype_version.zip
|
||||
[ -e $packagedir/sqlite3-$sqlite3_version.zip ] || wget http://minetest.kitsunemimi.pw/sqlite3-$sqlite3_version-win64.zip \
|
||||
-c -O $packagedir/sqlite3-$sqlite3_version.zip
|
||||
[ -e $packagedir/luajit-$luajit_version.zip ] || wget http://minetest.kitsunemimi.pw/luajit-$luajit_version-win64.zip \
|
||||
-c -O $packagedir/luajit-$luajit_version.zip
|
||||
[ -e $packagedir/libleveldb-$leveldb_version.zip ] || wget http://minetest.kitsunemimi.pw/libleveldb-$leveldb_version-win64.zip \
|
||||
-c -O $packagedir/libleveldb-$leveldb_version.zip
|
||||
[ -e $packagedir/openal_stripped.zip ] || wget http://minetest.kitsunemimi.pw/openal_stripped64.zip \
|
||||
-c -O $packagedir/openal_stripped.zip
|
||||
|
||||
# Extract stuff
|
||||
cd $libdir
|
||||
[ -d irrlicht ] || unzip -o $packagedir/irrlicht-$irrlicht_version.zip -d irrlicht
|
||||
[ -d zlib ] || unzip -o $packagedir/zlib-$zlib_version.zip -d zlib
|
||||
[ -d libogg ] || unzip -o $packagedir/libogg-$ogg_version.zip -d libogg
|
||||
[ -d libvorbis ] || unzip -o $packagedir/libvorbis-$vorbis_version.zip -d libvorbis
|
||||
[ -d libcurl ] || unzip -o $packagedir/curl-$curl_version.zip -d libcurl
|
||||
[ -d gettext ] || unzip -o $packagedir/gettext-$gettext_version.zip -d gettext
|
||||
[ -d freetype ] || unzip -o $packagedir/freetype2-$freetype_version.zip -d freetype
|
||||
[ -d sqlite3 ] || unzip -o $packagedir/sqlite3-$sqlite3_version.zip -d sqlite3
|
||||
[ -d openal_stripped ] || unzip -o $packagedir/openal_stripped.zip
|
||||
[ -d luajit ] || unzip -o $packagedir/luajit-$luajit_version.zip -d luajit
|
||||
[ -d leveldb ] || unzip -o $packagedir/libleveldb-$leveldb_version.zip -d leveldb
|
||||
download "https://github.com/minetest/irrlicht/releases/download/$irrlicht_version/win64.zip" irrlicht-$irrlicht_version.zip
|
||||
download "http://minetest.kitsunemimi.pw/zlib-$zlib_version-win64.zip"
|
||||
download "http://minetest.kitsunemimi.pw/libogg-$ogg_version-win64.zip"
|
||||
download "http://minetest.kitsunemimi.pw/libvorbis-$vorbis_version-win64.zip"
|
||||
download "http://minetest.kitsunemimi.pw/curl-$curl_version-win64.zip"
|
||||
download "http://minetest.kitsunemimi.pw/gettext-$gettext_version-win64.zip"
|
||||
download "http://minetest.kitsunemimi.pw/freetype2-$freetype_version-win64.zip" freetype-$freetype_version.zip
|
||||
download "http://minetest.kitsunemimi.pw/sqlite3-$sqlite3_version-win64.zip"
|
||||
download "http://minetest.kitsunemimi.pw/luajit-$luajit_version-win64.zip"
|
||||
download "http://minetest.kitsunemimi.pw/libleveldb-$leveldb_version-win64.zip" leveldb-$leveldb_version.zip
|
||||
download "http://minetest.kitsunemimi.pw/openal_stripped64.zip" 'openal_stripped.zip' unzip_nofolder
|
||||
|
||||
# Set source dir, downloading Minetest as needed
|
||||
if [ -n "$EXISTING_MINETEST_DIR" ]; then
|
||||
|
|
@ -135,9 +126,9 @@ cmake -S $sourcedir -B . \
|
|||
-DOPENAL_LIBRARY=$libdir/openal_stripped/lib/libOpenAL32.dll.a \
|
||||
-DOPENAL_DLL=$libdir/openal_stripped/bin/OpenAL32.dll \
|
||||
\
|
||||
-DCURL_DLL=$libdir/libcurl/bin/libcurl-4.dll \
|
||||
-DCURL_INCLUDE_DIR=$libdir/libcurl/include \
|
||||
-DCURL_LIBRARY=$libdir/libcurl/lib/libcurl.dll.a \
|
||||
-DCURL_DLL=$libdir/curl/bin/libcurl-4.dll \
|
||||
-DCURL_INCLUDE_DIR=$libdir/curl/include \
|
||||
-DCURL_LIBRARY=$libdir/curl/lib/libcurl.dll.a \
|
||||
\
|
||||
-DGETTEXT_MSGFMT=`which msgfmt` \
|
||||
-DGETTEXT_DLL="$gettext_dlls" \
|
||||
|
|
|
|||
Loading…
Reference in New Issue