X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=COMPILING;h=29a707c5917ef3dbdc40fce5dfbb2bbc92cc425e;hp=4b57fbbd2335609c8cb23b3cfa9c1526d37aa787;hb=42856811f2b174e37a761bfcb9fbeb8c6af2f558;hpb=27ecd5cda3c543216e126fcd0ca46ba02d8dd600

diff --git a/COMPILING b/COMPILING
index 4b57fbbd..29a707c5 100644
--- a/COMPILING
+++ b/COMPILING
@@ -48,16 +48,22 @@ environment:
 - OS X 10.5 or 10.6
 - Xcode developer tools installed (OSX DVD)
 - X11 (from the OS X DVD)
-- MacPorts or fink installed
+- MacPorts or fink or homebrew installed
 - the following packages installed:
   Macports:
     gtkglext pkgconfig glib2-devel libxml2 gtk2 pango atk gettext wget
   Fink:
     gtkglext1 pkgconfig glib2-dev libxml2 gtk+2 gtk+2-dev pango1-xft2-ft219-dev atk1 gettext-dev wget
+  homebrew:
+    gtk+ gtkglext
 
 build:
 run 'make'
 
+homebrew build:
+run 'export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/opt/X11/lib/pkgconfig
+make'
+
 run:
 Switch into the install folder, and run NetRadiant.app
 
@@ -65,24 +71,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