From 50ff9e4fd0aa1da00769564438d21e4ea6ad2981 Mon Sep 17 00:00:00 2001 From: Dale Weiler Date: Fri, 26 Apr 2013 15:43:13 +0000 Subject: [PATCH 1/6] Fix OSX compiles --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ff63173..6a9ccd8 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ CC ?= clang LDFLAGS := LIBS := -lm -CFLAGS += -Wall -Wextra -Werror -I. -fno-strict-aliasing $(OPTIONAL) +CFLAGS += -Wall -Wextra -Werror -fno-strict-aliasing $(OPTIONAL) ifneq ($(shell git describe --always 2>/dev/null),) CFLAGS += -DGMQCC_GITINFO="\"$(shell git describe --always)\"" endif @@ -34,7 +34,7 @@ else #Tiny C Compiler doesn't know what -pedantic-errors is # and instead of ignoring .. just errors. ifneq ($(CC), tcc) - CFLAGS +=-pedantic-errors -ffunction-sections -fdata-sections -Wl,-gc-sections + CFLAGS += -pedantic-errors else CFLAGS += -Wno-pointer-sign -fno-common endif From 5007fd7f7150addee29bfc5077fc8b25c1288d59 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Fri, 26 Apr 2013 17:33:56 +0200 Subject: [PATCH 2/6] don't overwrite ldflags/libs env vars --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 6a9ccd8..35b825a 100644 --- a/Makefile +++ b/Makefile @@ -11,8 +11,8 @@ MINGW = $(findstring MINGW32, $(UNAME)) CC ?= clang # linker flags and optional additional libraries if required -LDFLAGS := -LIBS := -lm +LDFLAGS += +LIBS += -lm CFLAGS += -Wall -Wextra -Werror -fno-strict-aliasing $(OPTIONAL) ifneq ($(shell git describe --always 2>/dev/null),) From 75ceab8f51954450e6228d9d640969b8f5c387b8 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Fri, 26 Apr 2013 17:56:08 +0200 Subject: [PATCH 3/6] fix distro/ Makefiles --- distro/archlinux/this/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/distro/archlinux/this/Makefile b/distro/archlinux/this/Makefile index bf5a3e8..fa863d1 100644 --- a/distro/archlinux/this/Makefile +++ b/distro/archlinux/this/Makefile @@ -14,12 +14,14 @@ CFLAGS := ifneq (, $(findstring i686, $(CARCH))) - CFLAGS := -m32 + CFLAGS += -m32 + LDFLAGS += -m32 endif base: $(MAKE) -C $(BASEDIR) clean - $(MAKE) -C $(BASEDIR) OPTIONAL=$(CFLAGS) DESTDIR=$(DESTDIR) PREFIX=$(PREFIX) install + CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ + $(MAKE) -C $(BASEDIR) "DESTDIR=$(DESTDIR)" "PREFIX=$(PREFIX)" install @echo "pkgname = gmqcc" > $(PKGINFO) @echo "pkgver = $(MAJOR).$(MINOR).$(PATCH)-$(PKGREL)" >> $(PKGINFO) @echo "pkgdesc = An Improved Quake C Compiler" >> $(PKGINFO) From 219508e478ab0e9bf0b99799c71925a4a4d49ed7 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Sat, 27 Apr 2013 16:30:03 +0200 Subject: [PATCH 4/6] this should be tagged 0.2.9 --- gmqcc.h | 16 ++++++++++------ main.c | 7 +------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/gmqcc.h b/gmqcc.h index 76be020..f09cd10 100644 --- a/gmqcc.h +++ b/gmqcc.h @@ -45,16 +45,20 @@ #define GMQCC_VERSION \ GMQCC_VERSION_BUILD(GMQCC_VERSION_MAJOR, GMQCC_VERSION_MINOR, GMQCC_VERSION_PATCH) /* Undefine the following on a release-tag: */ -#define GMQCC_VERSION_TYPE_DEVEL +/* #define GMQCC_VERSION_TYPE_DEVEL */ /* Full version string in case we need it */ -#ifdef GMQCC_GITINFO -# define GMQCC_DEV_VERSION_STRING "git build: " GMQCC_GITINFO "\n" -#elif defined(GMQCC_VERSION_TYPE_DEVEL) -# define GMQCC_DEV_VERSION_STRING "development build\n" +#ifdef GMQCC_VERSION_TYPE_DEVEL +# ifdef GMQCC_GITINFO +# define GMQCC_DEV_VERSION_STRING "git build: " GMQCC_GITINFO "\n" +# elif defined(GMQCC_VERSION_TYPE_DEVEL) +# define GMQCC_DEV_VERSION_STRING "development build\n" +# else +# define GMQCC_DEV_VERSION_STRING +# endif /*! GMQCC_GITINGO */ #else # define GMQCC_DEV_VERSION_STRING -#endif /*! GMQCC_GITINGO */ +#endif #define GMQCC_STRINGIFY(x) #x #define GMQCC_IND_STRING(x) GMQCC_STRINGIFY(x) diff --git a/main.c b/main.c index 498386c..bbc685a 100644 --- a/main.c +++ b/main.c @@ -44,18 +44,13 @@ static ppitem *ppems = NULL; static const char *app_name; static void version() { - con_out("GMQCC %d.%d.%d Built %s %s\n", + con_out("GMQCC %d.%d.%d Built %s %s\n" GMQCC_DEV_VERSION_STRING, GMQCC_VERSION_MAJOR, GMQCC_VERSION_MINOR, GMQCC_VERSION_PATCH, __DATE__, __TIME__ ); -#ifdef GMQCC_GITINFO - con_out("git build: %s\n", GMQCC_GITINFO); -#elif defined(GMQCC_VERION_TYPE_DEVEL) - con_out("development build\n"); -#endif } static int usage() { From b8e536d409a98bcd80d266e85dcc6b9a7c2a3c2c Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Sat, 27 Apr 2013 16:30:35 +0200 Subject: [PATCH 5/6] Starting point of 0.3.0 --- gmqcc.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gmqcc.h b/gmqcc.h index f09cd10..0031227 100644 --- a/gmqcc.h +++ b/gmqcc.h @@ -39,13 +39,13 @@ #endif /*! _MSC_VER */ #define GMQCC_VERSION_MAJOR 0 -#define GMQCC_VERSION_MINOR 2 -#define GMQCC_VERSION_PATCH 9 +#define GMQCC_VERSION_MINOR 3 +#define GMQCC_VERSION_PATCH 0 #define GMQCC_VERSION_BUILD(J,N,P) (((J)<<16)|((N)<<8)|(P)) #define GMQCC_VERSION \ GMQCC_VERSION_BUILD(GMQCC_VERSION_MAJOR, GMQCC_VERSION_MINOR, GMQCC_VERSION_PATCH) /* Undefine the following on a release-tag: */ -/* #define GMQCC_VERSION_TYPE_DEVEL */ +#define GMQCC_VERSION_TYPE_DEVEL /* Full version string in case we need it */ #ifdef GMQCC_VERSION_TYPE_DEVEL From 01ead27dd900bb6a396083d43a1a11ed881c002f Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Sat, 27 Apr 2013 16:33:47 +0200 Subject: [PATCH 6/6] Update CHANGES file --- CHANGES | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 6941035..01af3ff 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,7 @@ -Release v0.2.9 +Release v0.3.0 + * to fill + +2012-04-27 v0.2.9 * Preprocessor: - __VA_ARGS__ support _ __VA_ARGS__ indexing