From 6dee38b998e138cb15d0b50c2576fb07dcb18490 Mon Sep 17 00:00:00 2001 From: merlijn Date: Sun, 29 Aug 2010 20:44:05 +0200 Subject: [PATCH 1/3] OSX build stuff - default to using MacPorts instead of Fink and update the MACVERSION stuff as it should not be needed in most cases. --- osx-Makefile.conf | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 osx-Makefile.conf diff --git a/osx-Makefile.conf b/osx-Makefile.conf deleted file mode 100644 index ef1d5bfc..00000000 --- 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 From eadc09e9f6cdb30d9be0612bd962243534317267 Mon Sep 17 00:00:00 2001 From: merlijn Date: Sun, 29 Aug 2010 20:47:06 +0200 Subject: [PATCH 2/3] Update these files as well --- Makefile | 9 +++------ Makefile.conf | 9 ++++----- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 98dcb2f9..4dad4180 100644 --- 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 29865455..95d54970 100644 --- 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)" From e7031068fa3434319807e79e6a86ee0d8c01cb24 Mon Sep 17 00:00:00 2001 From: merlijn Date: Sun, 29 Aug 2010 21:35:58 +0200 Subject: [PATCH 3/3] Update documentation --- COMPILING | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/COMPILING b/COMPILING index 9ac19a8c..ab74b034 100644 --- 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'