X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=Makefile;h=ce50a1880e022e947ae4f1ddbdfc47f176a39efc;hb=5d302d4fb9ced82cc0c5d86cc0636bdb370c027f;hp=c8c0578362ec2d6a3e53ebe5b5074ed6b266e0be;hpb=4aa2bb9bfcec79466d89e7c1a7061ce9ca439fc9;p=xonotic%2Fnetradiant.git

diff --git a/Makefile b/Makefile
index c8c05783..ce50a188 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,8 @@ A = a
 DLL = so
 NETAPI = berkley
 
+RADIANT_ABOUTMSG = Custom build
+
 LDD ?= ldd
 FIND ?= find
 RANLIB ?= ranlib
@@ -48,6 +50,7 @@ LDFLAGS := $(LDFLAGS_COMMON)
 
 .PHONY: all
 all: \
+	makeversion \
 	install/q3map2.$(EXE) \
 	install/q3data.$(EXE) \
 	install/radiant.$(EXE) \
@@ -79,7 +82,7 @@ clean:
 	$(CXX) -shared -o $@ $^ $(LDFLAGS) $(LDFLAGS_DLL) $(LIBS)
 	[ -z "$(LDD)" ] || [ -z "`$(LDD) -r $@ 2>&1 >/dev/null $(TEE_STDERR)`" ] || { $(RM) $@; exit 1; }
 
-install/q3map2.$(EXE): LIBS := -lmhash $(LIBS_XML) $(LIBS_GLIB) $(LIBS_PNG)
+install/q3map2.$(EXE): LIBS := $(LIBS_XML) $(LIBS_GLIB) $(LIBS_PNG)
 install/q3map2.$(EXE): CPPFLAGS := $(CPPFLAGS_COMMON) $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) $(CPPFLAGS_PNG) -Itools/quake3/common -Ilibs -Iinclude
 install/q3map2.$(EXE): \
 	tools/quake3/common/cmdlib.o \
@@ -91,6 +94,7 @@ install/q3map2.$(EXE): \
 	tools/quake3/common/threads.o \
 	tools/quake3/common/unzip.o \
 	tools/quake3/common/vfs.o \
+	tools/quake3/common/md4.o \
 	tools/quake3/q3map2/brush.o \
 	tools/quake3/q3map2/brush_primit.o \
 	tools/quake3/q3map2/bspfile_abstract.o \
@@ -202,7 +206,7 @@ libddslib.$(A): CPPFLAGS := $(CPPFLAGS_COMMON) -Ilibs
 libddslib.$(A): \
 	libs/ddslib/ddslib.o \
 
-install/q3data.$(EXE): LIBS := -lmhash $(LIBS_XML) $(LIBS_GLIB)
+install/q3data.$(EXE): LIBS := $(LIBS_XML) $(LIBS_GLIB)
 install/q3data.$(EXE): CPPFLAGS := $(CPPFLAGS_COMMON) $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) -Itools/quake3/common -Ilibs -Iinclude
 install/q3data.$(EXE): \
 	tools/quake3/common/aselib.o \
@@ -228,7 +232,7 @@ install/q3data.$(EXE): \
 	libmathlib.$(A) \
 	libl_net.$(A) \
 
-install/radiant.$(EXE): LIBS := -lmhash -ldl -lGL -static-libgcc $(LIBS_XML) $(LIBS_GLIB) $(LIBS_GTK) $(LIBS_GTKGLEXT)
+install/radiant.$(EXE): LIBS := -ldl -lGL -static-libgcc $(LIBS_XML) $(LIBS_GLIB) $(LIBS_GTK) $(LIBS_GTKGLEXT)
 install/radiant.$(EXE): CPPFLAGS := $(CPPFLAGS_COMMON) $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) $(CPPFLAGS_GTKGLEXT) -Ilibs -Iinclude
 #install/radiant.$(EXE): LDFLAGS := -fPIC -Wl,-fini,fini_stub $(LDFLAGS_COMMON)
 install/radiant.$(EXE): \
@@ -444,3 +448,19 @@ install/modules/vfspk3.$(DLL): \
 	plugins/vfspk3/vfs.o \
 	plugins/vfspk3/vfspk3.o \
 
+.PHONY: makeversion
+makeversion:
+	set -ex; \
+	ver=`cat include/version.default`; \
+	major=`echo $$ver | cut -d . -f 2`; \
+	minor=`echo $$ver | cut -d . -f 3 | cut -d - -f 1`; \
+	echo "// generated header, see Makefile" > include/version.h; \
+	echo "#define RADIANT_VERSION \"$$ver\"" >> include/version.h; \
+	echo "#define RADIANT_MAJOR_VERSION \"$$major\"" >> include/version.h; \
+	echo "#define RADIANT_MINOR_VERSION \"$$minor\"" >> include/version.h; \
+	echo "$$major" > include/RADIANT_MAJOR; \
+	echo "$$minor" > include/RADIANT_MINOR; \
+	echo "$$ver" > include/version; \
+	echo "// generated header, see Makefile" > include/aboutmsg.h; \
+	echo "#define RADIANT_ABOUTMSG \"$(RADIANT_ABOUTMSG)\"" >> include/aboutmsg.h; \
+