Merge remote branch 'origin/merlijn/osx-compile'

diff --git a/COMPILING b/COMPILING
index 9ac19a8c389e20fba32e37f3ed0939d8c9b8f3fc..ab74b034224bbd1a48bc721734fbc58b96a3de66 100644 (file)
--- a/COMPILING
+++ b/COMPILING
@@ -1,3 +1,4 @@
+
 developer documentation for GtkRadiant 1.5.0-div0
 =================================================
 
@@ -45,13 +46,15 @@ OSX(using X-windows)
 ====================
 
 environment:
-- OS X 10.5
-- Xcode developer tools installed
+- OS X 10.5 or 10.6
+- Xcode developer tools installed (OSX DVD)
 - X11 (from the OS X DVD)
-- fink installed
-- the following fink packages installed:
-  gtkglext1 pkgconfig glib2-dev libxml2 gtk+2-dev pango1-xft2-dev atk-dev atk1 gettext-dev
-- Subversion must be installed and available in PATH to download the game packs
+- MacPorts or fink 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
 
 build:
 run 'make'

diff --git a/Makefile b/Makefile
index 98dcb2f91b7b25fa2be7742c02d19a999e91ee2a..4dad41808a8f2ae43429420219dbc18aea9e8f4c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -193,17 +193,14 @@ ifeq ($(OS),Darwin)
        CPPFLAGS_COMMON += -DPOSIX -DXWINDOWS
        CFLAGS_COMMON += -fPIC
        CXXFLAGS_COMMON += -fno-exceptions -fno-rtti
-       CPPFLAGS_COMMON += -I/sw/include -I/usr/X11R6/include
-       LDFLAGS_COMMON += -L/sw/lib  -L/usr/X11R6/lib
-       #LDFLAGS_COMMON += -L/sw/lib -L/usr/lib -L/usr/X11R6/lib
+       CPPFLAGS_COMMON += -I/opt/local/include -I/sw/include -I/usr/X11R6/include
+       LDFLAGS_COMMON += -L/opt/local/lib -L/sw/lib -L/usr/X11R6/lib
        LDFLAGS_DLL += -dynamiclib -ldl
        EXE ?= ppc
-       MACLIBDIR ?= /sw/lib
+       MACLIBDIR ?= /opt/local/lib
        A = a
        DLL = dylib
        MWINDOWS =
-       MACVERSION ?= 16
-       CPPFLAGS_COMMON += -DMACVERSION="$(MACVERSION)"
        # workaround for weird prints
        ECHO_NOLF = /bin/echo -n
 

diff --git a/Makefile.conf b/Makefile.conf
index 2986545586224bf978efce6344a032e3827c0590..95d54970dbf0de2f5d82b32c7315912980a19ef1 100644 (file)
--- a/Makefile.conf
+++ b/Makefile.conf
@@ -4,11 +4,6 @@
 # BUILD=debug
 # RADIANT_ABOUTMSG=Custom build
 # EXE=ub
-#
-## MacPorts:
-# CPPFLAGS=-I/opt/local/include/ -I/usr/X11R6/include/ 
-# LDFLAGS=-L/opt/local/lib -L/usr/X11R6/lib
-# MACLIBDIR=/opt/local/lib
 
 ## Fink
 ## (-arch ppc can combined with -arch 386, I read somewhere. However does work fine like this on OSX 10.6) 
@@ -16,3 +11,7 @@
 # CFLAGS=-arch i386
 # TARGET_ARCH=-arch i386
 # MACLIBDIR=/sw/lib
+
+## On some versions of OSX you may get compile errors regarding glTexImage1D, uncomment this to fix it
+#MACVERSION ?= 16
+#CPPFLAGS_COMMON += -DMACVERSION="$(MACVERSION)"

diff --git a/osx-Makefile.conf b/osx-Makefile.conf
deleted file mode 100644 (file)
index ef1d5bf..0000000
--- a/osx-Makefile.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-# Makefile.conf template
-
-## OS X:
-BUILD=debug
-RADIANT_ABOUTMSG=OSX NetRadiant Custom build
-EXE=ub
-### Snow Leopard 16, Leopard 15, Tiger 14, Panther 13
-MACVERSION=16
-#
-## MacPorts:
-CPPFLAGS=-I/opt/local/include/ -I/usr/X11R6/include/ 
-LDFLAGS=-L/opt/local/lib -L/usr/X11R6/lib
-MACLIBDIR=/opt/local/lib
-
-## Fink
-## (-arch ppc can combined with -arch 386, I read somewhere. However does work fine like this on OSX 10.6) 
-# LDFLAGS=-arch i386
-# CFLAGS=-arch i386
-# TARGET_ARCH=-arch i386
-# MACLIBDIR=/sw/lib