diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | CMakeLists.txt | 22 | ||||
| -rw-r--r-- | properties.h | 14 | ||||
| -rw-r--r-- | properties.h.in | 6 |
4 files changed, 14 insertions, 29 deletions
diff --git a/.gitignore b/.gitignore index 1b21a6b7b..3d03841e1 100644 --- a/.gitignore +++ b/.gitignore @@ -106,6 +106,7 @@ docs/doxygen_syms.md mingw64/ .ash_history !tools/ido-recomp/*/* +/properties.h # models models/**.blend diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b4be14c9..88fbca52c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,7 @@ cmake_minimum_required(VERSION 3.16.0 FATAL_ERROR) # Set the project version and language +project(Spaghettify VERSION 1.0.0 LANGUAGES C CXX ASM) include(FetchContent) set(NATO_PHONETIC_ALPHABET @@ -10,6 +11,15 @@ set(NATO_PHONETIC_ALPHABET "Xray" "Yankee" "Zulu" ) +# Get the patch version number from the project version +math(EXPR PATCH_INDEX "${PROJECT_VERSION_PATCH}") + +# Use the patch number to select the correct word +list(GET NATO_PHONETIC_ALPHABET ${PATCH_INDEX} PROJECT_PATCH_WORD) + +set(PROJECT_BUILD_NAME "Bolognese ${PROJECT_PATCH_WORD}" CACHE STRING "" FORCE) +set(PROJECT_TEAM "SpaghettiKart Team - HarbourMasters") + execute_process( COMMAND git config --global --add safe.directory ${CMAKE_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} @@ -46,17 +56,6 @@ else() set(PROJECT_VERSION_PATCH 0) endif() -# Get the patch version number from the project version -math(EXPR PATCH_INDEX "${PROJECT_VERSION_PATCH}") - -# Use the patch number to select the correct word -list(GET NATO_PHONETIC_ALPHABET ${PATCH_INDEX} PROJECT_PATCH_WORD) - -set(PROJECT_BUILD_NAME "Bolognese ${PROJECT_PATCH_WORD}" CACHE STRING "" FORCE) -set(PROJECT_TEAM "github.com/harbourmasters" CACHE STRING "" FORCE) - -project(Spaghettify VERSION ${PROJECT_VERSION_PATCH} LANGUAGES C CXX ASM) - message("Spaghetti Kart version: ${PROJECT_VERSION} ${PROJECT_PATCH_WORD}") if(APPLE) @@ -74,7 +73,6 @@ set(CMAKE_CXX_STANDARD 20 CACHE STRING "The C++ standard to use") set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_C_STANDARD 11 CACHE STRING "The C standard to use") set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT Spaghettify) -set(PROJECT_TEAM "MegaMech") #add_compile_options(-fsanitize=address) #add_link_options(-fsanitize=address) diff --git a/properties.h b/properties.h deleted file mode 100644 index ea32b671e..000000000 --- a/properties.h +++ /dev/null @@ -1,14 +0,0 @@ - -#define VER_FILEVERSION 0, 1, 0, 0 -#define VER_FILEVERSION_STR "0.1.0\0" - -#define VER_PRODUCTVERSION 0, 1, 0, 0 -#define VER_PRODUCTVERSION_str "0.1.0\0" - -#define VER_COMPANYNAME_STR "SpaghettiKart Team - Harbourmasters\0" -#define VER_PRODUCTNAME_STR "SpaghettiKart\0" - -#define VER_INTERNALNAME_STR "SpaghettiKart\0" -#define VER_ORIGINALFILENAME_STR "Spaghettify.exe\0" - -#define VER_FILEDESCRIPTION_STR "SpaghettiKart - Alfredo Alfa\0" diff --git a/properties.h.in b/properties.h.in index 972f8fbe0..364e552e1 100644 --- a/properties.h.in +++ b/properties.h.in @@ -6,9 +6,9 @@ #define VER_PRODUCTVERSION_str "@CMAKE_PROJECT_VERSION_MAJOR@.@CMAKE_PROJECT_VERSION_MINOR@.@CMAKE_PROJECT_VERSION_PATCH@\0" #define VER_COMPANYNAME_STR "@PROJECT_TEAM@\0" -#define VER_PRODUCTNAME_STR "Spaghettikart\0" +#define VER_PRODUCTNAME_STR "SpaghettiKart\0" -#define VER_INTERNALNAME_STR "@PROJECT_NAME@\0" +#define VER_INTERNALNAME_STR "SpaghettiKart\0" #define VER_ORIGINALFILENAME_STR "@PROJECT_NAME@.exe\0" -#define VER_FILEDESCRIPTION_STR "Spaghettikart - @PROJECT_BUILD_NAME@\0" +#define VER_FILEDESCRIPTION_STR "SpaghettiKart - @PROJECT_BUILD_NAME@\0" |