v. 1.1.0 release | MinGW

buildwin64.sh

@@ -1,18 +1,11 @@
 #!/bin/bash
 set -e
 
-dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-if [ $# -ne 1 ]; then
-	echo "Usage: $0 <build directory>"
-	exit 1
-fi
-builddir=$1
-mkdir -p $builddir
-builddir="$( cd "$builddir" && pwd )"
+builddir="$( pwd )"
 packagedir=$builddir/packages
 libdir=$builddir/libs
 
-toolchain_file=$dir/toolchain_mingw64.cmake
+toolchain_file=$builddir/toolchain_mingw64.cmake
 irrlicht_version=1.8.1
 ogg_version=1.3.1
 vorbis_version=1.3.4
@@ -68,25 +61,10 @@ cd $libdir
 [ -d luajit ] || unzip -o $packagedir/luajit-$luajit_version.zip -d luajit
 [ -d leveldb ] || unzip -o $packagedir/libleveldb-$leveldb_version.zip -d leveldb
 
-# Get minetest
+# Get MultiCraft
 cd $builddir
-if [ ! "x$EXISTING_MINETEST_DIR" = "x" ]; then
-	ln -s $EXISTING_MINETEST_DIR minetest
-else
-	[ -d minetest ] && (cd minetest && git pull) || (git clone https://github.com/minetest/minetest)
-fi
-cd minetest
-git_hash=`git show | head -c14 | tail -c7`
-
-# Get minetest_game
-cd games
-if [ "x$NO_MINETEST_GAME" = "x" ]; then
-	[ -d minetest_game ] && (cd minetest_game && git pull) || (git clone https://github.com/minetest/minetest_game)
-fi
-cd ../..
 
 # Build the thing
-cd minetest
 [ -d _build ] && rm -Rf _build/
 mkdir _build
 cd _build
@@ -151,6 +129,6 @@ cmake .. \
 	-DGETTEXT_INCLUDE_DIR=$libdir/gettext/include \
 	-DGETTEXT_LIBRARY=$libdir/gettext/lib/libintl.dll.a
 
-make package -j2
+make package -j8
 
 # EOF

src/defaultsettings.cpp

@@ -99,6 +99,7 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("screenH", "600");
 	settings->setDefault("fullscreen", "false");
 	settings->setDefault("fullscreen_bpp", "24");
+	settings->setDefault("screen_dpi", "72");
 	settings->setDefault("fsaa", "0");
 	settings->setDefault("vsync", "false");
 	settings->setDefault("address", "");
@@ -354,7 +355,6 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("pause_fps_max", "10");
 	settings->setDefault("max_objects_per_block", "32");
 	settings->setDefault("sqlite_synchronous", "1");
-	settings->setDefault("screen_dpi", "72");
 	settings->setDefault("gui_scaling", "1.1");
 	settings->setDefault("curl_verify_cert","false");
 	settings->setDefault("mouse_sensitivity", "0.15");

util/updatepo.sh

@@ -64,7 +64,7 @@ xgettext --package-name=MultiCraft \
 # Now iterate on all languages and create the po file if missing, or update it
 # if it exists already
 for lang in $langs ; do # note the missing quotes around $langs
-	pofile=po/$lang/minetest.po
+	pofile=po/$lang/MultiCraft.po
 	if test -e $pofile; then
 		echo "[$lang]: updating strings"
 		msgmerge --update --sort-by-file $pofile $potfile