darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2025-02-21 02:40:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Not defining GMQCC_VERSION_ in gmqcc.h but checking if they're defiend and #error if not - they're set in the Makefile - please fix windows builds"

Browse source 
This reverts commit a473979cf5.

-- because visual studio sucks
This commit is contained in:
Wolfgang (Blub) Bumiller 2012-12-17 16:45:37 +01:00
parent e72d656eb8
commit f7bc1dca08
2 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Makefile
View file

@ -4,10 +4,6 @@ BINDIR := $(PREFIX)/bin
DATADIR := $(PREFIX)/share
MANDIR := $(DATADIR)/man
GMQCC_MAJOR=0
GMQCC_MINOR=2
GMQCC_PATCH=0
CC ?= clang
CFLAGS += -Wall -Wextra -I. -pedantic-errors
#turn on tons of warnings if clang is present
@ -37,9 +33,6 @@ OBJ_T = test.o util.o con.o
OBJ_C = main.o lexer.o parser.o
OBJ_X = exec-standalone.o util.o con.o
CFLAGS += -DGMQCC_VERSION_MAJOR=$(GMQCC_MAJOR)
CFLAGS += -DGMQCC_VERSION_MINOR=$(GMQCC_MINOR)
CFLAGS += -DGMQCC_VERSION_PATCH=$(GMQCC_PATCH)
default: gmqcc
%.o: %.c

9
gmqcc.h
View file

@ -41,12 +41,9 @@
# pragma warning(disable : 4700 ) /* uninitialized local variable used */
#endif
#if !defined(GMQCC_VERSION_MAJOR) \
|| !defined(GMQCC_VERSION_MINOR) \
|| !defined(GMQCC_VERSION_PATCH)
# error GMQCC_VERSION_ macros missing
#endif
#define GMQCC_VERSION_MAJOR 0
#define GMQCC_VERSION_MINOR 2
#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)