X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=README.txt;h=25663e48f8f8c84d8f2f8f165b04ff0e118eb49d;hb=f5995337e887b4d36fc0c6f6d4459332e92178b6;hp=662f2770b0734d0ca2a6212959cae376b890f4db;hpb=112b85d0fb97b896da977a3915dab73015681896;p=dragonfireclient.git

diff --git a/README.txt b/README.txt
index 662f2770b..25663e48f 100644
--- a/README.txt
+++ b/README.txt
@@ -26,11 +26,11 @@ Map directory:
 - Map is stored in a directory, which can be removed to generate a new map.
 - There is a command-line option for it: --map-dir
 - For a RUN_IN_PLACE build, it is located in:
-		../map
+		../world
 - Otherwise something like this:
-	Windows: C:\Documents and Settings\user\Application Data\minetest\map
-	Linux: ~/.minetest/map
-	OS X: ~/Library/Application Support/minetest/map
+	Windows: C:\Documents and Settings\user\Application Data\minetest\world
+	Linux: ~/.minetest/world
+	OS X: ~/Library/Application Support/minetest/world
 
 Configuration file:
 -------------------
@@ -54,12 +54,12 @@ Compiling on GNU/Linux:
 -----------------------
 
 Install dependencies. Here's an example for Debian/Ubuntu:
-$ apt-get install build-essential libirrlicht-dev cmake libbz2-dev libpng12-dev libjpeg8-dev libxxf86vm-dev libgl1-mesa-dev
+$ apt-get install build-essential libirrlicht-dev cmake libbz2-dev libpng12-dev libjpeg8-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev
 
 Download source, extract (this is the URL to the latest of source repository, which might not work at all times):
-$ wget https://bitbucket.org/celeron55/minetest/get/tip.tar.gz
-$ tar xf tip.tar.gz
-$ cd minetest
+$ wget https://github.com/celeron55/minetest/tarball/master -O master.tar.gz
+$ tar xf master.tar.gz
+$ cd celeron55-minetest-286edd4 (or similar)
 
 Build a version that runs directly from the source directory:
 $ cmake . -DRUN_IN_PLACE=1
@@ -157,6 +157,8 @@ Compiling on Windows:
 	GETTEXT_MSGFMT           DIR/gettext/bin/msgfmt
 	-----------------
 	- Hit "Configure"
+	- Hit "Configure" once again 8)
+	- If something is still coloured red, you have a problem.
 	- Hit "Generate"
 	If using MSVC:
 		- Open the generated minetest.sln
@@ -174,6 +176,30 @@ Compiling on Windows:
 		- You should now have a working game with the executable in
 			DIR/minetest/bin/minetest.exe
 
+Windows releases of minetest are built using a bat script like this:
+--------------------------------------------------------------------
+
+set installpath="C:\tmp\minetest_install"
+set irrlichtpath="C:\tmp\irrlicht-1.7.2"
+
+set sourcedir=%CD%
+set builddir=%sourcedir%\bvc10
+mkdir %builddir%
+pushd %builddir%
+cmake %sourcedir% -G "Visual Studio 10" -DIRRLICHT_SOURCE_DIR=%irrlichtpath% -DRUN_IN_PLACE=1 -DCMAKE_INSTALL_PREFIX=%installpath%
+"C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" ALL_BUILD.vcxproj /p:Configuration=Release
+"C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" INSTALL.vcxproj /p:Configuration=Release
+"C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" PACKAGE.vcxproj /p:Configuration=Release
+popd
+
+License of Minetest-c55 textures
+--------------------------------
+
+This does not apply to texture packs made by others.
+
+Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)                                 
+http://creativecommons.org/licenses/by-sa/3.0/
+
 License of Minetest-c55
 -----------------------