darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2024-11-27 22:22:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into cooking

Browse source
This commit is contained in:
Wolfgang Bumiller 2013-04-27 16:33:55 +02:00
commit 18cf3641b1
5 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGES
View file

@ -1,4 +1,7 @@
Release v0.2.9 Release v0.3.0
* to fill
2012-04-27 v0.2.9
* Preprocessor: * Preprocessor:
- __VA_ARGS__ support - __VA_ARGS__ support
_ __VA_ARGS__ indexing _ __VA_ARGS__ indexing

4
Makefile
View file

@ -14,7 +14,7 @@ CC ?= clang
LDFLAGS += LDFLAGS +=
LIBS += -lm 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),) ifneq ($(shell git describe --always 2>/dev/null),)
CFLAGS += -DGMQCC_GITINFO="\"$(shell git describe --always)\"" CFLAGS += -DGMQCC_GITINFO="\"$(shell git describe --always)\""
endif endif
@ -34,7 +34,7 @@ else
#Tiny C Compiler doesn't know what -pedantic-errors is #Tiny C Compiler doesn't know what -pedantic-errors is
# and instead of ignoring .. just errors. # and instead of ignoring .. just errors.
ifneq ($(CC), tcc) ifneq ($(CC), tcc)
CFLAGS +=-pedantic-errors -ffunction-sections -fdata-sections -Wl,-gc-sections CFLAGS += -pedantic-errors
else else
CFLAGS += -Wno-pointer-sign -fno-common CFLAGS += -Wno-pointer-sign -fno-common
endif endif

6
distro/archlinux/this/Makefile
View file

@ -14,12 +14,14 @@ CFLAGS :=
ifneq (, $(findstring i686, $(CARCH))) ifneq (, $(findstring i686, $(CARCH)))
CFLAGS := -m32 CFLAGS += -m32
LDFLAGS += -m32
endif endif
base: base:
$(MAKE) -C $(BASEDIR) clean $(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 "pkgname = gmqcc" > $(PKGINFO)
@echo "pkgver = $(MAJOR).$(MINOR).$(PATCH)-$(PKGREL)" >> $(PKGINFO) @echo "pkgver = $(MAJOR).$(MINOR).$(PATCH)-$(PKGREL)" >> $(PKGINFO)
@echo "pkgdesc = An Improved Quake C Compiler" >> $(PKGINFO) @echo "pkgdesc = An Improved Quake C Compiler" >> $(PKGINFO)

18
gmqcc.h
View file

@ -39,8 +39,8 @@
#endif /*! _MSC_VER */ #endif /*! _MSC_VER */
#define GMQCC_VERSION_MAJOR 0 #define GMQCC_VERSION_MAJOR 0
#define GMQCC_VERSION_MINOR 2 #define GMQCC_VERSION_MINOR 3
#define GMQCC_VERSION_PATCH 9 #define GMQCC_VERSION_PATCH 0
#define GMQCC_VERSION_BUILD(J,N,P) (((J)<<16)|((N)<<8)|(P)) #define GMQCC_VERSION_BUILD(J,N,P) (((J)<<16)|((N)<<8)|(P))
#define GMQCC_VERSION \ #define GMQCC_VERSION \
GMQCC_VERSION_BUILD(GMQCC_VERSION_MAJOR, GMQCC_VERSION_MINOR, GMQCC_VERSION_PATCH) GMQCC_VERSION_BUILD(GMQCC_VERSION_MAJOR, GMQCC_VERSION_MINOR, GMQCC_VERSION_PATCH)
@ -48,13 +48,17 @@
#define GMQCC_VERSION_TYPE_DEVEL #define GMQCC_VERSION_TYPE_DEVEL
/* Full version string in case we need it */ /* Full version string in case we need it */
#ifdef GMQCC_GITINFO #ifdef GMQCC_VERSION_TYPE_DEVEL
# define GMQCC_DEV_VERSION_STRING "git build: " GMQCC_GITINFO "\n" # ifdef GMQCC_GITINFO
#elif defined(GMQCC_VERSION_TYPE_DEVEL) # define GMQCC_DEV_VERSION_STRING "git build: " GMQCC_GITINFO "\n"
# define GMQCC_DEV_VERSION_STRING "development build\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 #else
# define GMQCC_DEV_VERSION_STRING # define GMQCC_DEV_VERSION_STRING
#endif /*! GMQCC_GITINGO */ #endif
#define GMQCC_STRINGIFY(x) #x #define GMQCC_STRINGIFY(x) #x
#define GMQCC_IND_STRING(x) GMQCC_STRINGIFY(x) #define GMQCC_IND_STRING(x) GMQCC_STRINGIFY(x)

7
main.c
View file

@ -44,18 +44,13 @@ static ppitem *ppems = NULL;
static const char *app_name; static const char *app_name;
static void version() { 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_MAJOR,
GMQCC_VERSION_MINOR, GMQCC_VERSION_MINOR,
GMQCC_VERSION_PATCH, GMQCC_VERSION_PATCH,
__DATE__, __DATE__,
__TIME__ __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() { static int usage() {