X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=Makefile;h=fddd00491209ec9416a92fba803a034459d72692;hb=a5b337c0c2fb423c8fc96a3955f7f7eba75c2f01;hp=7bc32d70df525240a7c9e3818d34c5f8cf9bce2e;hpb=8487b92dc238aea017c73831d2f209fe5777b65f;p=xonotic%2Fnetradiant.git

diff --git a/Makefile b/Makefile
index 7bc32d70..fddd0049 100644
--- a/Makefile
+++ b/Makefile
@@ -81,7 +81,7 @@ LIBS_GL            ?= -lGL # -lopengl32 on Win32
 CPPFLAGS_DL        ?=
 LIBS_DL            ?= -ldl # nothing on Win32
 CPPFLAGS_ZLIB      ?=
-LIBS_ZLIB          ?= -lz
+LIBS_ZLIB          ?= -lz -lminizip
 CPPFLAGS_JPEG      ?=
 LIBS_JPEG          ?= -ljpeg
 DEPEND_ON_MAKEFILE ?= yes
@@ -155,17 +155,27 @@ ifeq ($(BUILD),release)
 ifeq ($(findstring $(CFLAGS),-O),)
 	CFLAGS_COMMON += -O3
 	# only add -O3 if no -O flag is in $(CFLAGS)
-	# to allow overriding the optimizations
 endif
 	CPPFLAGS_COMMON +=
 	LDFLAGS_COMMON += -s
 else
 
+ifeq ($(BUILD),native)
+ifeq ($(findstring $(CFLAGS),-O),)
+	CFLAGS_COMMON += -O3
+	# only add -O3 if no -O flag is in $(CFLAGS)
+endif
+	CFLAGS_COMMON += -march=native -mcpu=native
+	CPPFLAGS_COMMON +=
+	LDFLAGS_COMMON += -s
+else
+
 $(error Unsupported build type: $(BUILD))
 endif
 endif
 endif
 endif
+endif
 
 INSTALLDIR_BASE := $(INSTALLDIR)
 
@@ -223,8 +233,6 @@ ifeq ($(OS),Darwin)
 	# 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))
@@ -233,10 +241,11 @@ endif
 endif
 
 # VERSION!
-RADIANT_VERSION_NUMBER = 1.5.0
+RADIANT_MAJOR_VERSION = 1
+RADIANT_MINOR_VERSION = 5
+RADIANT_PATCH_VERSION = 0
+RADIANT_VERSION_NUMBER = $(RADIANT_MAJOR_VERSION).$(RADIANT_MINOR_VERSION).$(RADIANT_PATCH_VERSION)
 RADIANT_VERSION = $(RADIANT_VERSION_NUMBER)n
-RADIANT_MAJOR_VERSION = 5
-RADIANT_MINOR_VERSION = 0
 Q3MAP_VERSION = 2.5.17n
 
 # Executable extension
@@ -248,7 +257,7 @@ ifneq ($(GIT_VERSION),)
 	Q3MAP_VERSION := $(Q3MAP_VERSION)-git-$(GIT_VERSION)
 endif
 
-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)\"" -DRADIANT_EXECUTABLE="\"$(RADIANT_EXECUTABLE)\""
+CPPFLAGS += -DRADIANT_VERSION="\"$(RADIANT_VERSION)\"" -DRADIANT_MAJOR_VERSION="\"$(RADIANT_MAJOR_VERSION)\"" -DRADIANT_MINOR_VERSION="\"$(RADIANT_MINOR_VERSION)\"" -DRADIANT_PATCH_VERSION="\"$(RADIANT_PATCH_VERSION)\"" -DRADIANT_ABOUTMSG="\"$(RADIANT_ABOUTMSG)\"" -DQ3MAP_VERSION="\"$(Q3MAP_VERSION)\"" -DRADIANT_EXECUTABLE="\"$(RADIANT_EXECUTABLE)\""
 
 .PHONY: all
 all: \
@@ -391,6 +400,7 @@ binaries-radiant-plugins: \
 .PHONY: binaries-radiant
 binaries-radiant-core: \
 	$(INSTALLDIR)/radiant.$(EXE) \
+	$(INSTALLDIR)/radiant \
 
 .PHONY: binaries-tools
 binaries-tools: \
@@ -406,14 +416,17 @@ binaries-tools-quake2: \
 .PHONY: binaries-q2map
 binaries-q2map: \
 	$(INSTALLDIR)/q2map.$(EXE) \
+	$(INSTALLDIR)/q2map \
 
 .PHONY: binaries-qdata3
 binaries-qdata3: \
 	$(INSTALLDIR)/qdata3.$(EXE) \
+	$(INSTALLDIR)/qdata3 \
 
 .PHONY: binaries-h2data
 binaries-h2data: \
-	$(INSTALLDIR)/heretic2/h2data.$(EXE)
+	$(INSTALLDIR)/heretic2/h2data.$(EXE) \
+	$(INSTALLDIR)/heretic2/h2data \
 
 .PHONY: binaries-tools-quake3
 binaries-tools-quake3: \
@@ -423,10 +436,12 @@ binaries-tools-quake3: \
 .PHONY: binaries-q3data
 binaries-q3data: \
 	$(INSTALLDIR)/q3data.$(EXE) \
+	$(INSTALLDIR)/q3data \
 
 .PHONY: binaries-q3map2
 binaries-q3map2: \
 	$(INSTALLDIR)/q3map2.$(EXE) \
+	$(INSTALLDIR)/q3map2 \
 
 
 .PHONY: clean
@@ -439,7 +454,9 @@ clean:
 	file=$@; $(MKDIR) $${file%/*}
 	$(CXX) $^ $(LDFLAGS) $(LDFLAGS_COMMON) $(LDFLAGS_EXTRA) $(LIBS_EXTRA) $(LIBS_COMMON) $(LIBS) -o $@
 	[ -z "$(LDD)" ] || [ -z "`$(LDD) -r $@ $(STDERR_TO_STDOUT) $(STDOUT_TO_DEVNULL) $(TEE_STDERR)`" ] || { $(RM) $@; exit 1; }
-	if $(MAKE_EXE_SYMLINK); then o=$@; $(LN_SNF) $${o##*/} $*; fi
+
+$(INSTALLDIR)/%: $(INSTALLDIR)/%.$(EXE)
+	if $(MAKE_EXE_SYMLINK); then o=$<; $(LN_SNF) $${o##*/} $@; else true; fi
 
 %.$(A):
 	$(AR) rc $@ $^
@@ -477,7 +494,6 @@ $(INSTALLDIR)/q3map2.$(EXE): \
 	tools/quake3/common/polylib.o \
 	tools/quake3/common/scriplib.o \
 	tools/quake3/common/threads.o \
-	tools/quake3/common/unzip.o \
 	tools/quake3/common/vfs.o \
 	tools/quake3/q3map2/brush.o \
 	tools/quake3/q3map2/brush_primit.o \
@@ -485,12 +501,19 @@ $(INSTALLDIR)/q3map2.$(EXE): \
 	tools/quake3/q3map2/bspfile_ibsp.o \
 	tools/quake3/q3map2/bspfile_rbsp.o \
 	tools/quake3/q3map2/bsp.o \
+	tools/quake3/q3map2/bsp_analyze.o \
+	tools/quake3/q3map2/bsp_scale.o \
+	tools/quake3/q3map2/bsp_info.o \
 	tools/quake3/q3map2/convert_ase.o \
+	tools/quake3/q3map2/convert_bsp.o \
 	tools/quake3/q3map2/convert_obj.o \
 	tools/quake3/q3map2/convert_map.o \
 	tools/quake3/q3map2/decals.o \
+	tools/quake3/q3map2/exportents.o \
 	tools/quake3/q3map2/facebsp.o \
+	tools/quake3/q3map2/fixaas.o \
 	tools/quake3/q3map2/fog.o \
+	tools/quake3/q3map2/help.o \
 	tools/quake3/q3map2/image.o \
 	tools/quake3/q3map2/leakfile.o \
 	tools/quake3/q3map2/light_bounce.o \
@@ -500,6 +523,7 @@ $(INSTALLDIR)/q3map2.$(EXE): \
 	tools/quake3/q3map2/light_ydnar.o \
 	tools/quake3/q3map2/main.o \
 	tools/quake3/q3map2/map.o \
+	tools/quake3/q3map2/minimap.o \
 	tools/quake3/q3map2/mesh.o \
 	tools/quake3/q3map2/model.o \
 	tools/quake3/q3map2/patch.o \
@@ -518,6 +542,7 @@ $(INSTALLDIR)/q3map2.$(EXE): \
 	tools/quake3/q3map2/vis.o \
 	tools/quake3/q3map2/writebsp.o \
 	libddslib.$(A) \
+	libetclib.$(A) \
 	libfilematch.$(A) \
 	libl_net.$(A) \
 	libmathlib.$(A) \
@@ -567,6 +592,10 @@ libddslib.$(A): CPPFLAGS_EXTRA := -Ilibs
 libddslib.$(A): \
 	libs/ddslib/ddslib.o \
 
+libetclib.$(A): CPPFLAGS_EXTRA := -Ilibs
+libetclib.$(A): \
+	libs/etclib.o \
+
 $(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): \
@@ -578,7 +607,6 @@ $(INSTALLDIR)/q3data.$(EXE): \
 	tools/quake3/common/md4.o \
 	tools/quake3/common/scriplib.o \
 	tools/quake3/common/trilib.o \
-	tools/quake3/common/unzip.o \
 	tools/quake3/common/vfs.o \
 	tools/quake3/q3data/3dslib.o \
 	tools/quake3/q3data/compress.o \
@@ -591,6 +619,7 @@ $(INSTALLDIR)/q3data.$(EXE): \
 	tools/quake3/q3data/stripper.o \
 	tools/quake3/q3data/video.o \
 	libfilematch.$(A) \
+	libetclib.$(A) \
 	libl_net.$(A) \
 	libmathlib.$(A) \
 	$(if $(findstring $(OS),Win32),icons/q3data.o,) \
@@ -785,9 +814,11 @@ $(INSTALLDIR)/modules/image.$(DLL): \
 	plugins/image/dds.o \
 	plugins/image/image.o \
 	plugins/image/jpeg.o \
+	plugins/image/ktx.o \
 	plugins/image/pcx.o \
 	plugins/image/tga.o \
 	libddslib.$(A) \
+	libetclib.$(A) \
 
 $(INSTALLDIR)/modules/imageq2.$(DLL): CPPFLAGS_EXTRA := -Ilibs -Iinclude
 $(INSTALLDIR)/modules/imageq2.$(DLL): \
@@ -1027,10 +1058,10 @@ $(INSTALLDIR)/heretic2/h2data.$(EXE): \
 install-data: binaries
 	$(MKDIR) $(INSTALLDIR)/games
 	$(FIND) $(INSTALLDIR_BASE)/ -name .svn -exec $(RM_R) {} \; -prune
-	[ "$(OS)" != "Darwin" ] || $(CP_R) setup/data/osx/NetRadiant.app/* $(INSTALLDIR_BASE)/NetRadiant.app/
 	DOWNLOAD_GAMEPACKS="$(DOWNLOAD_GAMEPACKS)" GIT="$(GIT)" SVN="$(SVN)" WGET="$(WGET)" RM_R="$(RM_R)" MV="$(MV)" UNZIPPER="$(UNZIPPER)" ECHO="$(ECHO)" SH="$(SH)" CP="$(CP)" CP_R="$(CP_R)" $(SH) install-gamepacks.sh "$(INSTALLDIR)"
-	$(ECHO) $(RADIANT_MINOR_VERSION) > $(INSTALLDIR)/RADIANT_MINOR
 	$(ECHO) $(RADIANT_MAJOR_VERSION) > $(INSTALLDIR)/RADIANT_MAJOR
+	$(ECHO) $(RADIANT_MINOR_VERSION) > $(INSTALLDIR)/RADIANT_MINOR
+	$(ECHO) $(RADIANT_PATCH_VERSION) > $(INSTALLDIR)/RADIANT_PATCH
 	$(CP_R) setup/data/tools/* $(INSTALLDIR)/
 	$(MKDIR) $(INSTALLDIR)/docs
 	$(CP_R) docs/* $(INSTALLDIR)/docs/
@@ -1041,14 +1072,9 @@ ifeq ($(OS),Win32)
 install-dll: binaries
 	MKDIR="$(MKDIR)" CP="$(CP)" CAT="$(CAT)" GTKDIR="$(GTKDIR)" WHICHDLL="$(WHICHDLL)" INSTALLDIR="$(INSTALLDIR)" $(SH) $(DLLINSTALL) 
 else
-ifeq ($(OS),Darwin)
-install-dll: binaries
-	EXE="$(EXE)" MACLIBDIR="$(MACLIBDIR)" CP="$(CP)" OTOOL="$(OTOOL)" INSTALLDIR="$(INSTALLDIR)" $(SH) install-dylibs.sh
-else
 install-dll: binaries
 	@$(ECHO) No DLL inclusion implemented for this target.
 endif
-endif
 
 # release building... NOT for general users
 # these may use tools not in the list that is checked by the build system