From 8be92adf1a650f702cb95199829c32015f7c7b65 Mon Sep 17 00:00:00 2001 From: Thomas Debesse Date: Wed, 5 Jun 2019 02:00:58 +0200 Subject: [PATCH] cmake/makefile: there is no need for MAJOR/MINOR/PATCH anymore --- CMakeLists.txt | 3 --- Makefile | 2 +- include/version.h | 9 --------- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f7868846..e5d7f774 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -142,9 +142,6 @@ endif () if (BUILD_BINARIES) add_definitions(-DRADIANT_VERSION="${RADIANT_VERSION}") - add_definitions(-DRADIANT_MAJOR_VERSION="${RADIANT_VERSION_MAJOR}") - add_definitions(-DRADIANT_MINOR_VERSION="${RADIANT_VERSION_MINOR}") - add_definitions(-DRADIANT_PATCH_VERSION="${RADIANT_VERSION_PATCH}") if (NOT CMAKE_BUILD_TYPE MATCHES Release) add_definitions(-D_DEBUG=1) diff --git a/Makefile b/Makefile index e7f5b725..32da23f3 100644 --- a/Makefile +++ b/Makefile @@ -262,7 +262,7 @@ ifneq ($(GIT_VERSION),) Q3MAP_VERSION := $(Q3MAP_VERSION)-git-$(GIT_VERSION) endif -CPPFLAGS += -DRADIANT_VERSION="\"$(RADIANT_VERSION)\"" -DRADIANT_MAJOR_VERSION="\"$(RADIANT_MAJOR_VERSION)\"" -DRADIANT_MINOR_VERSION="\"$(RADIANT_MINOR_VERSION)\"" -DRADIANT_PATCH_VERSION="\"$(RADIANT_PATCH_VERSION)\"" -DRADIANT_ABOUTMSG="\"$(RADIANT_ABOUTMSG)\"" -DRADIANT_BASENAME="\"${RADIANT_BASENAME}\"" -DQ3MAP_VERSION="\"$(Q3MAP_VERSION)\"" -DRADIANT_EXECUTABLE="\"$(RADIANT_EXECUTABLE)\"" +CPPFLAGS += -DRADIANT_VERSION="\"$(RADIANT_VERSION)\"" -DRADIANT_ABOUTMSG="\"$(RADIANT_ABOUTMSG)\"" -DRADIANT_BASENAME="\"${RADIANT_BASENAME}\"" -DQ3MAP_VERSION="\"$(Q3MAP_VERSION)\"" -DRADIANT_EXECUTABLE="\"$(RADIANT_EXECUTABLE)\"" CPPFLAGS += -DGTK_TARGET=2 .PHONY: all diff --git a/include/version.h b/include/version.h index 3df8773e..745b5d39 100644 --- a/include/version.h +++ b/include/version.h @@ -2,12 +2,3 @@ #ifndef RADIANT_VERSION #error no RADIANT_VERSION defined #endif -#ifndef RADIANT_MAJOR_VERSION -#error no RADIANT_MAJOR_VERSION defined -#endif -#ifndef RADIANT_MINOR_VERSION -#error no RADIANT_MINOR_VERSION defined -#endif -#ifndef RADIANT_PATCH_VERSION -#error no RADIANT_PATCH_VERSION defined -#endif -- 2.39.2