X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=Makefile;h=8b82e91823fc88d10db90506c4a4b3f2a9d5ecc5;hb=472f73116c620557e70989d1bfa0f052c345b95d;hp=e1d1fbd7f05bfa2eec88bb6a5e3ca055da1f6404;hpb=5703b5a6eafff14a4f8b74b037b7578b3c050584;p=xonotic%2Fnetradiant.git

diff --git a/Makefile b/Makefile
index e1d1fbd7..8b82e918 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,8 @@ CXX                ?= g++
 RANLIB             ?= ranlib
 AR                 ?= ar
 LDD                ?= ldd # nothing on Win32
-WINDRES            ?= # only used on Win32
+OTOOL              ?= # only used on OS X
+WINDRES            ?= windres # only used on Win32
 
 PKGCONFIG          ?= pkg-config
 PKG_CONFIG_PATH    ?=
@@ -103,14 +104,18 @@ ifeq ($(findstring $(CFLAGS),-O),)
 endif
 	CPPFLAGS_COMMON +=
 	LDFLAGS_COMMON +=
-else ifeq ($(BUILD),extradebug)
+else
+
+ifeq ($(BUILD),extradebug)
 ifeq ($(findstring $(CFLAGS),-g),)
 	CFLAGS_COMMON += -g3
 	# only add -g3 if no -g flag is in $(CFLAGS)
 endif
 	CPPFLAGS_COMMON += -D_DEBUG
 	LDFLAGS_COMMON +=
-else ifeq ($(BUILD),profile)
+else
+
+ifeq ($(BUILD),profile)
 ifeq ($(findstring $(CFLAGS),-g),)
 	CFLAGS_COMMON += -g
 	# only add -g if no -g flag is in $(CFLAGS)
@@ -122,7 +127,9 @@ endif
 	CFLAGS_COMMON += -pg
 	CPPFLAGS_COMMON +=
 	LDFLAGS_COMMON += -pg
-else ifeq ($(BUILD),release)
+else
+
+ifeq ($(BUILD),release)
 ifeq ($(findstring $(CFLAGS),-O),)
 	CFLAGS_COMMON += -O3
 	# only add -O3 if no -O flag is in $(CFLAGS)
@@ -131,11 +138,17 @@ endif
 	CPPFLAGS_COMMON +=
 	LDFLAGS_COMMON += -s
 else
+
 $(error Unsupported build type: $(BUILD))
 endif
+endif
+endif
+endif
+
+INSTALLDIR_BASE := $(INSTALLDIR)
 
 ifeq ($(OS),Linux)
-	CPPFLAGS_COMMON += -DPOSIX -DXWINDOWS -D_LINUX
+	CPPFLAGS_COMMON += -DPOSIX -DXWINDOWS
 	CFLAGS_COMMON += -fPIC
 	LDFLAGS_DLL = -fPIC -ldl
 	LIBS_COMMON = -lpthread
@@ -143,7 +156,9 @@ ifeq ($(OS),Linux)
 	A = a
 	DLL = so
 	MWINDOWS =
-else ifeq ($(OS),Win32)
+else
+
+ifeq ($(OS),Win32)
 	CPPFLAGS_COMMON += -DWIN32 -D_WIN32 -D_inline=inline
 	CFLAGS_COMMON += -mms-bitfields
 	LDFLAGS_DLL = --dll -Wl,--add-stdcall-alias
@@ -159,29 +174,51 @@ else ifeq ($(OS),Win32)
 	LIBS_GL = -lopengl32
 	# workaround: no -ldl on Win32
 	LIBS_DL = 
-else ifeq ($(OS),Darwin)
-	CFLAGS_COMMON += -force-cpusubtype_ALL -fPIC
+else
+
+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/lib -L/usr/X11R6/lib
 	LDFLAGS_DLL += -dynamiclib -ldl
 	EXE = ppc
-	$(error Unsupported build OS: $(OS) - please complete the Darwin support in this Makefile and submit a patch)
+	A = a
+	DLL = dylib
+	MWINDOWS =
+
+	# workaround for weird prints
+	ECHO_NOLF = /bin/echo -n
+
+	# workaround: http://developer.apple.com/qa/qa2007/qa1567.html
+	LIBS_GL += -lX11 -dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
+	LIBS_GTKGLEXT += -lX11 -dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
+	# workaround: we have no "ldd" for OS X, so...
+	LDD =
+	OTOOL = otool
+
+	INSTALLDIR := $(INSTALLDIR_BASE)/NetRadiant.app/Contents/MacOS/install
 else
+
 $(error Unsupported build OS: $(OS))
 endif
+endif
+endif
 
 # VERSION!
-RADIANT_VERSION = 1.5.0
+RADIANT_VERSION = 1.5.0n
 RADIANT_MAJOR_VERSION = 5
 RADIANT_MINOR_VERSION = 0
+Q3MAP_VERSION = 2.5.17n
 
 SVN_VERSION := $(shell $(SVNVERSION) -n $(STDERR_TO_DEVNULL) | $(SED) 's/M$$//g; s/.*://g;')
 ifneq ($(SVN_VERSION),)
 	RADIANT_VERSION := $(RADIANT_VERSION)-svn$(SVN_VERSION)
+	Q3MAP_VERSION := $(Q3MAP_VERSION)-svn$(SVN_VERSION)
 endif
 
-CPPFLAGS += -DRADIANT_VERSION="\"$(RADIANT_VERSION)\"" -DRADIANT_MAJOR_VERSION="\"$(RADIANT_MAJOR_VERSION)\"" -DRADIANT_MINOR_VERSION="\"$(RADIANT_MINOR_VERSION)\"" -DRADIANT_ABOUTMSG="\"$(RADIANT_ABOUTMSG)\""
+CPPFLAGS += -DRADIANT_VERSION="\"$(RADIANT_VERSION)\"" -DRADIANT_MAJOR_VERSION="\"$(RADIANT_MAJOR_VERSION)\"" -DRADIANT_MINOR_VERSION="\"$(RADIANT_MINOR_VERSION)\"" -DRADIANT_ABOUTMSG="\"$(RADIANT_ABOUTMSG)\"" -DQ3MAP_VERSION="\"$(Q3MAP_VERSION)\""
 
 .PHONY: all
 all: \
@@ -229,8 +266,10 @@ dependencies-check:
 	checkbinary g++ "$(CXX)"; \
 	checkbinary binutils "$(RANLIB)"; \
 	checkbinary binutils "$(AR)"; \
+	checkbinary pkg-config "$(PKGCONFIG)"; \
 	[ "$(OS)" = "Win32" ] && checkbinary mingw32 "$(WINDRES)"; \
-	[ "$(OS)" != "Win32" ] && checkbinary libc6 "$(LDD)"; \
+	[ -n "$(LDD)" ] && checkbinary libc6 "$(LDD)"; \
+	[ -n "$(OTOOL)" ] && checkbinary xcode "$(OTOOL)"; \
 	$(ECHO) All required tools have been found!
 	@$(ECHO)
 	@if [ x"$(DEPENDENCIES_CHECK)" = x"verbose" ]; then set -x; fi; \
@@ -295,7 +334,7 @@ binaries: \
 
 .PHONY: clean
 clean:
-	$(RM_R) $(INSTALLDIR)/
+	$(RM_R) $(INSTALLDIR_BASE)/
 	$(FIND) . \( -name \*.o -o -name \*.d -o -name \*.$(DLL) -o -name \*.$(A) -o -name \*.$(EXE) \) -exec $(RM) {} \;
 	$(RM) icons/*.rc
 
@@ -322,12 +361,12 @@ ifeq ($(OS),Win32)
 endif
 
 %.o: %.cpp $(if $(findstring $(DEPEND_ON_MAKEFILE),yes),$(wildcard Makefile*),)
-	$(CXX) $< $(CFLAGS) $(CXXFLAGS) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) $(CPPFLAGS) $(CPPFLAGS_COMMON) $(CPPFLAGS_EXTRA) $(TARGET_ARCH) -c -o $@
+	$(CXX) $< $(CFLAGS) $(CXXFLAGS) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) $(CPPFLAGS_EXTRA) $(CPPFLAGS_COMMON) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@
 
 %.o: %.c $(if $(findstring $(DEPEND_ON_MAKEFILE),yes),$(wildcard Makefile*),)
-	$(CC) $< $(CFLAGS) $(CFLAGS_COMMON) $(CPPFLAGS) $(CPPFLAGS_COMMON) $(CPPFLAGS_EXTRA) $(TARGET_ARCH) -c -o $@
+	$(CC) $< $(CFLAGS) $(CFLAGS_COMMON) $(CPPFLAGS_EXTRA) $(CPPFLAGS_COMMON) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@
 
-$(INSTALLDIR)/q3map2.$(EXE): LIBS_EXTRA := $(LIBS_XML) $(LIBS_GLIB) $(LIBS_PNG)
+$(INSTALLDIR)/q3map2.$(EXE): LIBS_EXTRA := $(LIBS_XML) $(LIBS_GLIB) $(LIBS_PNG) $(LIBS_ZLIB)
 $(INSTALLDIR)/q3map2.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) $(CPPFLAGS_PNG) -Itools/quake3/common -Ilibs -Iinclude
 $(INSTALLDIR)/q3map2.$(EXE): \
 	tools/quake3/common/cmdlib.o \
@@ -452,8 +491,8 @@ libddslib.$(A): CPPFLAGS_EXTRA := -Ilibs
 libddslib.$(A): \
 	libs/ddslib/ddslib.o \
 
-$(INSTALLDIR)/q3data.$(EXE): LIBS_EXTRA := $(LIBS_XML) $(LIBS_GLIB)
-$(INSTALLDIR)/q3data.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) -Itools/quake3/common -Ilibs -Iinclude
+$(INSTALLDIR)/q3data.$(EXE): LIBS_EXTRA := $(LIBS_XML) $(LIBS_GLIB) $(LIBS_ZLIB)
+$(INSTALLDIR)/q3data.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) $(CPPFLAGS_ZLIB) -Itools/quake3/common -Ilibs -Iinclude
 $(INSTALLDIR)/q3data.$(EXE): \
 	tools/quake3/common/aselib.o \
 	tools/quake3/common/bspfile.o \
@@ -480,7 +519,7 @@ $(INSTALLDIR)/q3data.$(EXE): \
 	$(if $(findstring $(OS),Win32),icons/q3data.o,) \
 
 $(INSTALLDIR)/radiant.$(EXE): LDFLAGS_EXTRA := $(MWINDOWS)
-$(INSTALLDIR)/radiant.$(EXE): LIBS_EXTRA := $(LIBS_GL) $(LIBS_DL) $(LIBS_XML) $(LIBS_GLIB) $(LIBS_GTK) $(LIBS_GTKGLEXT)
+$(INSTALLDIR)/radiant.$(EXE): LIBS_EXTRA := $(LIBS_GL) $(LIBS_DL) $(LIBS_XML) $(LIBS_GLIB) $(LIBS_GTK) $(LIBS_GTKGLEXT) $(LIBS_ZLIB)
 $(INSTALLDIR)/radiant.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_GL) $(CPPFLAGS_DL) $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) $(CPPFLAGS_GTKGLEXT) -Ilibs -Iinclude
 $(INSTALLDIR)/radiant.$(EXE): \
 	radiant/autosave.o \
@@ -905,7 +944,8 @@ $(INSTALLDIR)/heretic2/h2data.$(EXE): \
 .PHONY: install-data
 install-data: binaries
 	$(MKDIR) $(INSTALLDIR)/games
-	$(FIND) $(INSTALLDIR)/ -name .svn -exec $(RM_R) {} \; -prune
+	$(FIND) $(INSTALLDIR_BASE)/ -name .svn -exec $(RM_R) {} \; -prune
+	[ "$(OS)" != "Darwin" ] || $(CP_R) setup/data/osx/NetRadiant.app/* $(INSTALLDIR_BASE)/NetRadiant.app/
 	set -ex; \
 	for GAME in games/*; do \
 		if [ -d "$$GAME/tools" ]; then \
@@ -921,15 +961,20 @@ install-data: binaries
 	$(ECHO) $(RADIANT_MINOR_VERSION) > $(INSTALLDIR)/RADIANT_MINOR
 	$(ECHO) $(RADIANT_MAJOR_VERSION) > $(INSTALLDIR)/RADIANT_MAJOR
 	$(CP_R) setup/data/tools/* $(INSTALLDIR)/
-	$(FIND) $(INSTALLDIR)/ -name .svn -exec $(RM_R) {} \; -prune
+	$(FIND) $(INSTALLDIR_BASE)/ -name .svn -exec $(RM_R) {} \; -prune
 
 .PHONY: install-dll
 ifeq ($(OS),Win32)
 install-dll: binaries
-	MKDIR="$(MKDIR)" CP="$(CP)" CAT="$(CAT)" GTKDIR="$(GTKDIR)" WHICHDLL="$(WHICHDLL)" $(SH) install-dlls.sh
+	MKDIR="$(MKDIR)" CP="$(CP)" CAT="$(CAT)" GTKDIR="$(GTKDIR)" WHICHDLL="$(WHICHDLL)" INSTALLDIR="$(INSTALLDIR)" $(SH) install-dlls.sh
+else
+ifeq ($(OS),Darwin)
+install-dll: binaries
+	CP="$(CP)" OTOOL="$(OTOOL)" INSTALLDIR="$(INSTALLDIR)" $(SH) install-dylibs.sh
 else
 install-dll: binaries
 	@$(ECHO) No DLL inclusion implemented for this target.
 endif
+endif
 
 -include $(shell find . -name \*.d)