From 1451c0697c7cf28c905b1144d4d873bd0ce04254 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Sun, 21 Jun 2015 12:40:54 +0200 Subject: [PATCH] Updated version to netradiant-20150621-1.5.0ing, moved common make options into Makefile.conf.common. --- Makefile.conf.common | 8 ++++++++ Makefile.conf.linux | 7 ++----- Makefile.conf.win32 | 9 +++------ Makefile.conf.win64 | 7 ++----- setup/data/tools/README.txt | 12 ++++++------ 5 files changed, 21 insertions(+), 22 deletions(-) create mode 100644 Makefile.conf.common diff --git a/Makefile.conf.common b/Makefile.conf.common new file mode 100644 index 00000000..44b8d6c1 --- /dev/null +++ b/Makefile.conf.common @@ -0,0 +1,8 @@ +# Makefile.common +# Platform-independent configuration settings + +RADIANT_ABOUTMSG=netradiant-20150621-1.5.0ing +BUILD=release + +# do not fetch gamepacks +DOWNLOAD_GAMEPACKS=no diff --git a/Makefile.conf.linux b/Makefile.conf.linux index d5b66162..e6a20a92 100644 --- a/Makefile.conf.linux +++ b/Makefile.conf.linux @@ -1,8 +1,5 @@ # Makefile.conf # Build configuration for netradiant on linux -RADIANT_ABOUTMSG=netradiant-20150620-1.5.0ing -BUILD=release - -# do not fetch gamepacks -DOWNLOAD_GAMEPACKS=no +# Include platform-independent configuration settings +-include Makefile.conf.common diff --git a/Makefile.conf.win32 b/Makefile.conf.win32 index 14bebe2a..17bcbc75 100644 --- a/Makefile.conf.win32 +++ b/Makefile.conf.win32 @@ -1,8 +1,9 @@ # Makefile.conf # Build configuration for netradiant on win32 -RADIANT_ABOUTMSG=netradiant-20150620-1.5.0ing -BUILD=release +# Include platform-independent configuration settings +-include Makefile.conf.common + EXE=exe OS=Win32 @@ -13,7 +14,3 @@ PKGCONFIG=pkg-config.sh CFLAGS=-I/local32/include -mms-bitfields -mthreads -fno-strict-aliasing CXXFLAGS=-I/local32/include -I/local32/include/libxml2 LDFLAGS=-L/local32/lib - -# do not fetch gamepacks -DOWNLOAD_GAMEPACKS=no - diff --git a/Makefile.conf.win64 b/Makefile.conf.win64 index 04f5c650..cf072e99 100644 --- a/Makefile.conf.win64 +++ b/Makefile.conf.win64 @@ -1,7 +1,8 @@ # Makefile.conf # Build configuration for netradiant on win64 -RADIANT_ABOUTMSG=netradiant-20150620-1.5.0ing +# Include platform-independent configuration settings +-include Makefile.conf.common # FIXME release build fails on win64 BUILD=debug @@ -14,7 +15,3 @@ PKGCONFIG=pkg-config.sh CFLAGS=-I/local64/include -mms-bitfields -mthreads -fno-strict-aliasing CXXFLAGS=-I/local64/include -I/local64/include/libxml2 LDFLAGS=-L/local64/lib - -# do not fetch gamepacks -DOWNLOAD_GAMEPACKS=no - diff --git a/setup/data/tools/README.txt b/setup/data/tools/README.txt index 7d9fce20..22a56de1 100644 --- a/setup/data/tools/README.txt +++ b/setup/data/tools/README.txt @@ -26,8 +26,8 @@ WEBSITES http://www.icculus.org/netradiant SOURCE - - git://git.xonotic.org/xonotic/netradiant.git + + https://gitlab.com/xonotic/netradiant http://ingar.satgnu.net/gtkradiant/files/gamepacks @@ -57,8 +57,8 @@ GAMEPACKS Quake 3 support files can be downloaded from https://zerowing.idsoftware.com/svn/radiant.gamepacks/Q3Pack/trunk/install/ - Quetoo gamepack for GtkRadiant 1.5 - http://quetoo.org + Quetoo gamepack for GtkRadiant 1.5/NetRadiant + svn://svn.icculus.org/gtkradiant-gamepacks/Q2WPack/branches/1.5/ Neverball 1.6 gamepack for GtkRadiant 1.5/NetRadiant http://neverball.org @@ -101,9 +101,9 @@ MANUAL CHANGES - 2015-06-20 + 2015-06-21 updated to the latest NetRadiant git revision - updated gamepacks + updated gamepacks 2013-06-30 updated to the latest NetRadiant git revision