cmake/makefile: there is no need for MAJOR/MINOR/PATCH anymore

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f7868846844efc6a95ba4b2057f965107942c3fc..e5d7f7746a4d5e84fbfbe1c6a8c3e67b1084a66c 100644 (file)
--- 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 e7f5b725c3e268e1c171a520872ef0844366c443..32da23f360929ecc52cf2289a16ad55dd034fcdb 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

diff --git a/include/version.h b/include/version.h
index 3df8773e90359c41d4f7eca588c4c66d5db2ec21..745b5d394de38c6ebb871bb35e05f29c5bd1c734 100644 (file)
--- 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