Merge commit '830125fad042fad35dc029b6eb57c8156ad7e176'

[xonotic/netradiant.git] / COMPILING

diff --git a/COMPILING b/COMPILING
index ab74b034224bbd1a48bc721734fbc58b96a3de66..3c847ee13da6189d09f378d8a7e4fd1c2e0a053d 100644 (file)
--- a/COMPILING
+++ b/COMPILING
@@ -1,23 +1,22 @@
 
-developer documentation for GtkRadiant 1.5.0-div0
-=================================================
+developer documentation for NetRadiant
+======================================
 
 (NOTE: outdated stuff has been ROT13ed)
 
 getting the source
 ==================
 
-The latest source is available from the Subversion repository.
-  https://zerowing.idsoftware.com/svn/radiant/GtkRadiant/trunk/
+The latest source is available from the git repository.
+  git://git.icculus.org/divverent/netradiant.git
 
-The subversion client can be obtained from the Subversion site.
-  http://subversion.tigris.org
+The git client can be obtained from the Subversion site.
+  http://git-scm.org
 
-To get a copy of the source using the commandline Subversion client:
+To get a copy of the source using the commandline git client:
   Change the current directory to the desired location for the source.
-  svn checkout http://svn.icculus.org/netradiant/trunk/ NetRadiant
-  cd NetRadiant
-  sh download-gamepacks.sh
+  git clone git://git.icculus.org/divverent/netradiant.git
+  cd netradiant
 
 
 
@@ -40,7 +39,7 @@ build:
 run 'make'
 
 run:
-Execute './GtkRadiant/install/radiant.x86' (or './GtkRadiant/install/radiant.ppc' on osx)
+Execute 'install/radiant.x86'
 
 OSX(using X-windows)
 ====================
@@ -66,24 +65,25 @@ Win32 (2000, XP, Vista or Windows 7)
 ==================
 
 environment:
-- MinGW
-  http://www.mingw.org/wiki/HOWTO_Install_the_MinGW_GCC_Compiler_Suite (the installer link)
-  Install this to c:\mingw, and select the components C compiler, C++ compiler, Make
-- MSYS
-  http://www.mingw.org/wiki/msys (you need the installer MSYS-versionnumber.exe)
-  Install this to c:\msys\1.0
+- MinGW (http://www.mingw.org/wiki/Getting_Started)
+  Install this to c:\mingw, and select the components C compiler, C++ compiler
+  and MSYS Basic System
+- Start the MSYS shell once, then exit it
 - Prepackaged Radiant dependencies (Gtk and other stuff):
-  http://www.icculus.org/netradiant/files/radiant-deps-mingw32.zip
-  Preferably extract this one to c:\mingw\radiant-deps-mingw32
-- Subversion must be installed and available in PATH to download the game packs
+  http://www.icculus.org/netradiant/files/netradiant-dependencies-mingw32-20101211-7z.exe
+  Extract this one to
+  c:\mingw\msys\1.0\home\username
+  (if you do this with 7zip, keep the "netradiant-dependencies-mingw32" folder
+  name of the contents)
+- now download the source from the MSYS shell, if you don't already have it:
+  ~/netradiant-dependencies-mingw32/util/bin/git clone git://git.icculus.org/divverent/netradiant.git
 
 build:
-- Start the MSYS shell (to be found in c:\msys\1.0\msys.bat)
+- Start the MSYS shell
 - Switch to the directory with NetRadiant source
-- cp mingw-Makefile.conf Makefile.conf
-- (edit mingw-Makefile.conf in case you installed anything to other locations
-  than the recommended ones)
-- make
+- make MAKEFILE_CONF=mingw-Makefile.conf
 
 run:
 - in the "install" directory, double click netradiant.exe
+- if you get a DLL not found error, copy the DLL from either c:\mingw\bin or
+  from c:\mingw\msys\1.0\bin to the "install" directory