cmake/makefile: there is no need for MAJOR/MINOR/PATCH anymore
authorThomas Debesse <dev@illwieckz.net>
Wed, 5 Jun 2019 00:00:58 +0000 (02:00 +0200)
committerThomas Debesse <dev@illwieckz.net>
Sun, 16 Jun 2019 13:22:23 +0000 (15:22 +0200)
CMakeLists.txt
Makefile
include/version.h

index f786884..e5d7f77 100644 (file)
@@ -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)
index e7f5b72..32da23f 100644 (file)
--- 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
index 3df8773..745b5d3 100644 (file)
@@ -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