diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9044e8ebe8..a20829fb87 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,17 +1,17 @@
#============================================================================
# Copyright (C) 2013 - 2018, OpenJK contributors
-#
+#
# This file is part of the OpenJK source code.
-#
+#
# OpenJK is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 2 as
# published by the Free Software Foundation.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; if not, see .
#============================================================================
@@ -246,7 +246,7 @@ elseif (("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") OR ("${CMAKE_C_COMPILER_ID}" M
# enable somewhat modern C++
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
+
if("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-comment")
@@ -320,17 +320,18 @@ else()
message(STATUS "SOURCE_DATE_EPOCH is set ($ENV{SOURCE_DATE_EPOCH}): SOURCE_DATE set to \"${SOURCE_DATE}\"")
endif()
-# Current Git SHA1 hash
+# Current Git tag/version
+# ideally we would separate the hash suffix into its own variable, but sed is not available everywhere
execute_process(
- COMMAND "git" "rev-parse" "--short" "HEAD"
- OUTPUT_VARIABLE GIT_HASH
- RESULT_VARIABLE GIT_HASH_ERROR
+ COMMAND "git" "describe" "--tag"
+ OUTPUT_VARIABLE GIT_TAG
+ RESULT_VARIABLE GIT_TAG_ERROR
OUTPUT_STRIP_TRAILING_WHITESPACE)
-if(GIT_HASH_ERROR AND NOT GIT_HASH_ERROR EQUAL 0)
- message(WARNING "Unable to determine Git revision")
- set(GIT_HASH UNKNOWN)
+if(GIT_TAG_ERROR AND NOT GIT_TAG_ERROR EQUAL 0)
+ message(WARNING "Unable to determine Git tag")
+ set(GIT_TAG vUNKNOWN)
endif()
-message(STATUS "Git revision is ${GIT_HASH}")
+message(STATUS "Git tag is ${GIT_TAG}")
configure_file(shared/qcommon/q_version.h.in shared/qcommon/q_version.h @ONLY)
diff --git a/README.md b/README.md
index 069c314e9d..6bf1e201b7 100644
--- a/README.md
+++ b/README.md
@@ -76,7 +76,7 @@ If you have the Mac App Store Version of Jedi Academy, follow these steps to get
### Using OpenJK as a base for a new mod
* [Fork](https://github.com/JACoders/OpenJK/fork) the project on GitHub
-* Change the GAMEVERSION define in codemp/game/g_local.h from "OpenJK" to your project name
+* Change the JK_VERSION define in codemp/qcommon/game_version.h from "OpenJK" to your project name
* If you make a nice change, please consider back-porting to upstream via pull request as described above. This is so everyone benefits without having to reinvent the wheel for every project.
diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index 2c9e7f509f..7052fd7d62 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -175,7 +175,7 @@ if(BuildSPEngine OR BuildJK2SPEngine)
"${SPDir}/qcommon/z_memman_pc.cpp"
"${SPDir}/qcommon/qfiles.h"
"${SPDir}/qcommon/qcommon.h"
- "${SPDir}/qcommon/stv_version.h"
+ "${SPDir}/qcommon/game_version.h"
"${SPDir}/qcommon/timing.h"
"${SPDir}/qcommon/MiniHeap.h"
@@ -190,7 +190,7 @@ if(BuildSPEngine OR BuildJK2SPEngine)
)
source_group("common" FILES ${SPEngineCommonFiles})
set(SPEngineFiles ${SPEngineFiles} ${SPEngineCommonFiles})
-
+
set(SPEngineCommonSafeFiles
"${SharedDir}/qcommon/safe/files.cpp"
"${SharedDir}/qcommon/safe/files.h"
diff --git a/code/client/cl_console.cpp b/code/client/cl_console.cpp
index ba2bc40d5d..7e03b29b80 100644
--- a/code/client/cl_console.cpp
+++ b/code/client/cl_console.cpp
@@ -28,8 +28,7 @@ along with this program; if not, see .
#include "client.h"
#include "qcommon/stringed_ingame.h"
-#include "qcommon/stv_version.h"
-#include "qcommon/q_version.h"
+#include "qcommon/game_version.h"
int g_console_field_width = 78;
@@ -575,14 +574,6 @@ void Con_DrawSolidConsole( float frac )
(lines-(SMALLCHAR_HEIGHT+SMALLCHAR_HEIGHT/2)), JK_VERSION[x] );
}
- const char *revision = "revision: " GIT_HASH;
- i = strlen(revision);
-
- for (x = 0; x < i; x++) {
- SCR_DrawSmallChar( cls.glconfig.vidWidth - (i - x + 1) * SMALLCHAR_WIDTH,
- (lines - (SMALLCHAR_HEIGHT * 2 + SMALLCHAR_HEIGHT / 2)), revision[x] );
- }
-
// draw the text
con.vislines = lines;
rows = (lines-SMALLCHAR_WIDTH)/SMALLCHAR_WIDTH; // rows of text to draw
diff --git a/code/game/g_local.h b/code/game/g_local.h
index 8853a00c9c..4d5bb723d4 100644
--- a/code/game/g_local.h
+++ b/code/game/g_local.h
@@ -36,9 +36,6 @@ along with this program; if not, see .
//==================================================================
-// the "gameversion" client command will print this plus compile date
-#define GAMEVERSION "OpenJK-" GIT_HASH
-
#define BODY_QUEUE_SIZE 8
#define Q3_INFINITE 16777216
diff --git a/code/game/g_main.cpp b/code/game/g_main.cpp
index dceac508eb..a349d4f910 100644
--- a/code/game/g_main.cpp
+++ b/code/game/g_main.cpp
@@ -37,7 +37,7 @@ along with this program; if not, see .
//rww - RAGDOLL_END
#include "qcommon/ojk_saved_game_helper.h"
-#include "qcommon/q_version.h"
+#include "qcommon/game_version.h"
extern void WP_SaberLoadParms( void );
extern qboolean G_PlayerSpawned( void );
@@ -617,7 +617,7 @@ void G_InitCvars( void ) {
g_developer = gi.cvar ("developer", "", 0);
// noset vars
- gi.cvar( "gamename", GAMEVERSION , CVAR_SERVERINFO | CVAR_ROM );
+ gi.cvar( "gamename", JK_VERSION , CVAR_SERVERINFO | CVAR_ROM );
gi.cvar( "gamedate", SOURCE_DATE , CVAR_ROM );
g_skippingcin = gi.cvar ("skippingCinematic", "0", CVAR_ROM);
@@ -734,7 +734,7 @@ void InitGame( const char *mapname, const char *spawntarget, int checkSum, cons
g_qbLoadTransition = qbLoadTransition;
gi.Printf ("------- Game Initialization -------\n");
- gi.Printf ("gamename: %s\n", GAMEVERSION);
+ gi.Printf ("gamename: %s\n", JK_VERSION);
gi.Printf ("gamedate: %s\n", SOURCE_DATE);
srand( randomSeed );
diff --git a/code/qcommon/common.cpp b/code/qcommon/common.cpp
index a5be18dd80..cdc39626ac 100644
--- a/code/qcommon/common.cpp
+++ b/code/qcommon/common.cpp
@@ -26,10 +26,9 @@ along with this program; if not, see .
#include "q_shared.h"
#include "qcommon.h"
-#include "qcommon/q_version.h"
#include "sstring.h" // to get Gil's string class, because MS's doesn't compile properly in here
#include "stringed_ingame.h"
-#include "stv_version.h"
+#include "game_version.h"
#include "../shared/sys/sys_local.h"
#if defined(_WIN32)
#define WIN32_LEAN_AND_MEAN
@@ -55,7 +54,6 @@ cvar_t *com_cl_running;
cvar_t *com_logfile; // 1 = buffer log, 2 = flush after each print
cvar_t *com_showtrace;
cvar_t *com_version;
-cvar_t *com_revision;
cvar_t *com_buildScript; // for automated data building scripts
cvar_t *com_bootlogo;
cvar_t *cl_paused;
@@ -1128,9 +1126,7 @@ void Com_Init( char *commandLine ) {
Cmd_AddCommand ("freeze", Com_Freeze_f);
}
- s = va("%s %s %s", JK_VERSION, PLATFORM_STRING, SOURCE_DATE );
- com_version = Cvar_Get ("version", s, CVAR_ROM | CVAR_SERVERINFO );
- com_revision = Cvar_Get ("revision", GIT_HASH, CVAR_ROM | CVAR_SERVERINFO );
+ com_version = Cvar_Get ("version", JK_VERSION " " PLATFORM_STRING " " SOURCE_DATE, CVAR_ROM | CVAR_SERVERINFO );
#ifdef JK2_MODE
JK2SP_Init();
diff --git a/code/qcommon/stv_version.h b/code/qcommon/game_version.h
similarity index 55%
rename from code/qcommon/stv_version.h
rename to code/qcommon/game_version.h
index 4df6ae9de8..e0dc7335a4 100644
--- a/code/qcommon/stv_version.h
+++ b/code/qcommon/game_version.h
@@ -20,16 +20,21 @@ along with this program; if not, see .
===========================================================================
*/
+#include "qcommon/q_version.h"
+
// Current version of the single player game
-#include "../win32/AutoVersion.h"
+#define VERSION_MAJOR_RELEASE 1
+#define VERSION_MINOR_RELEASE 0
+#define VERSION_EXTERNAL_BUILD 1
+#define VERSION_INTERNAL_BUILD 1
+
+#define VERSION_STRING XSTRING(VERSION_MAJOR_RELEASE) ", " XSTRING(VERSION_MINOR_RELEASE) ", " XSTRING(VERSION_EXTERNAL_BUILD) ", " XSTRING(VERSION_INTERNAL_BUILD) // "a, b, c, d"
+#define VERSION_STRING_DOTTED XSTRING(VERSION_MAJOR_RELEASE) "." XSTRING(VERSION_MINOR_RELEASE) "." XSTRING(VERSION_EXTERNAL_BUILD) "." XSTRING(VERSION_INTERNAL_BUILD) // "a.b.c.d"
-#ifdef _DEBUG
- #define JK_VERSION "(debug)OpenJK: v" VERSION_STRING_DOTTED
-#elif defined FINAL_BUILD
- #define JK_VERSION "OpenJK: v" VERSION_STRING_DOTTED
+#if defined(_DEBUG)
+ #define JK_VERSION "(debug)OpenJK: " GIT_TAG
+ #define JK_VERSION_OLD "(debug)JA: v" VERSION_STRING_DOTTED
#else
- #define JK_VERSION "(internal)OpenJK: v" VERSION_STRING_DOTTED
+ #define JK_VERSION "OpenJK: " GIT_TAG
+ #define JK_VERSION_OLD "JA: v" VERSION_STRING_DOTTED
#endif
-// end
-
-
diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
index da27f339c7..70580daf9d 100644
--- a/code/qcommon/qcommon.h
+++ b/code/qcommon/qcommon.h
@@ -616,7 +616,6 @@ extern cvar_t *com_timescale;
extern cvar_t *com_sv_running;
extern cvar_t *com_cl_running;
extern cvar_t *com_version;
-extern cvar_t *com_revision;
extern cvar_t *com_homepath;
#ifndef _WIN32
extern cvar_t *com_ansiColor;
diff --git a/code/server/sv_ccmds.cpp b/code/server/sv_ccmds.cpp
index 67b079ae02..782516bd13 100644
--- a/code/server/sv_ccmds.cpp
+++ b/code/server/sv_ccmds.cpp
@@ -27,9 +27,7 @@ along with this program; if not, see .
#include "../game/weapons.h"
#include "../game/g_items.h"
#include "../game/statindex.h"
-
-#include "../win32/AutoVersion.h"
-
+#include "../qcommon/game_version.h"
/*
===============================================================================
@@ -386,7 +384,7 @@ static void SV_Status_f( void ) {
Com_Printf( "name : %s^7\n", cl->name );
Com_Printf( "score : %i\n", cl->gentity->client->persistant[PERS_SCORE] );
- Com_Printf( "version : %s %s %i\n", STATUS_OS, VERSION_STRING_DOTTED, PROTOCOL_VERSION );
+ Com_Printf( "version : %s %s %i\n", STATUS_OS, JK_VERSION, PROTOCOL_VERSION );
#ifdef JK2_MODE
Com_Printf( "game : Jedi Outcast %s\n", FS_GetCurrentGameDir() );
#else
diff --git a/code/server/sv_init.cpp b/code/server/sv_init.cpp
index 3b3dd751cb..7b78323877 100644
--- a/code/server/sv_init.cpp
+++ b/code/server/sv_init.cpp
@@ -208,7 +208,7 @@ void SV_SpawnServer( const char *server, ForceReload_e eForceReload, qboolean bA
// shut down the existing game if it is running
SV_ShutdownGameProgs(qtrue);
- Com_Printf ("------ Server Initialization ------\n%s\nrevision: %s\n", com_version->string, com_revision->string);
+ Com_Printf ("------ Server Initialization ------\n%s\n", com_version->string);
Com_Printf ("Server: %s\n",server);
// Moved up from below to help reduce fragmentation
diff --git a/code/ui/ui_atoms.cpp b/code/ui/ui_atoms.cpp
index 69ccfb6e3b..d2aad9ee70 100644
--- a/code/ui/ui_atoms.cpp
+++ b/code/ui/ui_atoms.cpp
@@ -31,7 +31,6 @@ along with this program; if not, see .
#include "ui_local.h"
#include "gameinfo.h"
-#include "../qcommon/stv_version.h"
uiimport_t ui;
uiStatic_t uis;
diff --git a/code/ui/ui_main.cpp b/code/ui/ui_main.cpp
index f79e4b618f..f8537aa9ed 100644
--- a/code/ui/ui_main.cpp
+++ b/code/ui/ui_main.cpp
@@ -47,8 +47,8 @@ USER INTERFACE MAIN
extern stringID_table_t animTable [MAX_ANIMATIONS+1];
#include "../qcommon/stringed_ingame.h"
-#include "../qcommon/stv_version.h"
#include "../qcommon/q_shared.h"
+#include "../qcommon/game_version.h"
extern qboolean ItemParse_model_g2anim_go( itemDef_t *item, const char *animName );
extern qboolean ItemParse_asset_model_go( itemDef_t *item, const char *name );
diff --git a/code/win32/AutoVersion.h b/code/win32/AutoVersion.h
deleted file mode 100644
index 841c109e4b..0000000000
--- a/code/win32/AutoVersion.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
-This file is part of Jedi Academy.
-
- Jedi Academy is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2
- as published by the Free Software Foundation.
-
- Jedi Academy is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Jedi Academy. If not, see .
-*/
-// Copyright 2001-2013 Raven Software
-
-#ifndef __AUTO_VERSION_HEADER
-#define __AUTO_VERSION_HEADER
-
-#define VERSION_MAJOR_RELEASE 1
-#define VERSION_MINOR_RELEASE 0
-#define VERSION_EXTERNAL_BUILD 1
-#define VERSION_INTERNAL_BUILD 1
-
-#define VERSION_STRING "1, 0, 1, 1"
-#define VERSION_STRING_DOTTED "1.0.1.1"
-
-#define VERSION_BUILD_NUMBER 80
-
-// BEGIN COMMENTS
-// 1.0.1.0 10/24/2003 16:29:53 jmonroe patch rc1
-// 1.0.0.4 10/17/2003 17:45:31 jmonroe fix ati texture rect hack
-// 1.0.0.3 08/29/2003 18:17:37 jmonroe hide saberrealisticcombat and g_dismemberment debug value
-// 1.0.0.2 08/12/2003 17:48:44 jmonroe demo, take 3
-// 1.0.0.1 08/07/2003 19:53:23 jmonroe demo round 2
-// 1.0.0.0 08/01/2003 16:59:44 jmonroe push demo code changes
-// 1.0.0.0 07/21/2003 16:09:23 jmonroe going gold
-// 0.0.12.0 07/20/2003 19:04:44 jmonroe build 0.12 for qa
-// 0.0.11.0 07/19/2003 15:30:08 jmonroe stuff
-// 0.0.11.0 07/17/2003 17:08:09 jmonroe build 0.11 for qa
-// 0.0.10.1 07/16/2003 17:33:28 mgummelt General Update With Latest Code
-// 0.0.10.0 07/16/2003 10:28:51 jmonroe new product id, remove outcast.roq at end, menu ignoreescape, eax looping sounds support chan_less_atten
-// 0.0.10.0 07/14/2003 19:04:42 jmonroe build 0.10 for qa
-// 0.0.9.0 07/12/2003 13:05:57 jmonroe increase numsnapshot ents
-// 0.0.9.0 07/11/2003 17:48:40 jmonroe buil 0.09 for qa
-// 0.0.8.4 07/11/2003 15:47:55 jmonroe weatherzone caching
-// 0.0.8.3 07/11/2003 12:05:44 mgummelt Lava & Acid fixes
-// 0.0.8.2 07/10/2003 17:26:42 mgummelt General Update with today's bug fixes
-// 0.0.8.1 07/09/2003 19:24:19 jmonroe eax voice stomp fix, increased weather zones, ...
-// 0.0.8.0 07/08/2003 17:28:27 jmonroe build 0.08 for qa
-// 0.0.7.2 07/07/2003 16:28:40 mgummelt Blaster Pistol alt-fire returns, Rancor spawnflags corrected
-// 0.0.7.1 07/07/2003 10:48:29 jmonroe load menu fixes, darkside autoload fix,...
-// 0.0.7.0 07/02/2003 19:31:37 jmonroe buil 7 for qa
-// 0.0.6.5 07/02/2003 18:17:17 mgummelt Boss balancing
-// 0.0.6.3 07/02/2003 01:34:48 jmonroe saber in moves menu
-// 0.0.6.2 06/30/2003 15:33:37 mgummelt Force Sight change (designers readme)
-// 0.0.6.1 06/29/2003 19:00:17 jmonroe vv merged, aev_soundchan
-// 0.0.6.0 06/28/2003 16:38:27 jmonroe eax update, force sight on key dudes
-// 0.0.6.0 06/26/2003 16:45:26 jmonroe qa build
-// 0.0.5.6 06/25/2003 21:22:38 mgummelt "redcrosshair" field on misc_model_breakables and func_breakables
-// 0.0.5.5 06/25/2003 18:31:52 mgummelt Force Visible on all applicable ents
-// 0.0.5.4 06/25/2003 10:45:12 jmonroe EAX 4.0
-// 0.0.5.3 06/24/2003 22:59:31 mgummelt Reborn tweaks
-// 0.0.5.2 06/24/2003 18:53:55 mgummelt New Reborn Master
-// 0.0.5.1 06/23/2003 20:47:44 jmonroe fix NULL NPC usage
-// 0.0.5.0 06/21/2003 13:04:27 jmonroe fix eweb crash
-// 0.0.4.2 06/18/2003 14:24:35 jmonroe script cmd SET_WEAPON now precaches weapon, gil's optimized dlights
-// 0.0.4.1 06/17/2003 19:04:28 mgummelt Various Force Power, saber move & Enemy Jedi tweaks
-// 0.0.4.0 06/16/2003 19:41:54 jmonroe bug stuff
-// 0.0.4.0 06/13/2003 23:52:36 jmonroe inc version to match qa beta
-// 0.0.2.6 06/12/2003 13:11:21 creed new z-far cull
-// 0.0.2.5 06/10/2003 17:02:17 creed targetJump & other navigation
-// 0.0.2.4 06/10/2003 11:18:58 jmonroe footstep sounds in per material
-// 0.0.2.3 06/10/2003 01:37:10 mgummelt helping with entity limit at spawntime
-// 0.0.2.2 06/09/2003 14:10:32 scork fix for asian languages being bust by bad font
-// 0.0.2.1 06/08/2003 17:57:11 mgummelt Area portal fix
-// 0.0.2.0 06/08/2003 14:02:03 mgummelt Force sight change
-// 0.0.2.0 06/08/2003 00:03:58 jmonroe CGEN_LIGHTING_DIFFUSE_ENTITY merges lightingdiffuse and entity color
-// 0.0.1.25 06/05/2003 20:51:30 mgummelt Saber pull-attacks done
-// 0.0.1.24 06/05/2003 18:11:06 mgummelt Both saber control schemes implemented
-// 0.0.1.23 05/30/2003 17:12:34 mgummelt Fixed Noghri and Sand Creature
-// 0.0.1.22 05/30/2003 12:15:37 mgummelt Saboteur change, new cultist
-// 0.0.1.21 05/29/2003 16:02:48 creed Fixes For Assassin, ST AI changes
-// 0.0.1.20 05/29/2003 12:00:18 mgummelt Navigation changes
-// 0.0.1.19 05/29/2003 11:08:06 mgummelt various tweaks
-// 0.0.1.18 05/28/2003 22:08:16 creed Boba Fett ++
-// 0.0.1.17 05/28/2003 20:38:33 mgummelt force grip and force sense changes
-// 0.0.1.15 05/28/2003 17:07:26 mgummelt tweaks of force drain, protect and absorb
-// 0.0.1.14 05/28/2003 14:48:57 mgummelt various saber & AI fixes
-// 0.0.1.13 05/27/2003 17:26:30 areis Ported Glow stuff from MP (with support for nVidia and ATI cards). Added solid flag for roffs (in behaved) and made tie-bombers explode with effect.
-// 0.0.1.12 05/27/2003 13:06:03 mgummelt Noghri stick weapon shoots a projectile, E-Web uses proper sounds
-// 0.0.1.7 05/19/2003 15:00:10 mgummelt adding random jedi, elder prisoners, jedi master
-// 0.0.1.6 05/19/2003 09:22:18 creed Weather Effects & Haz Trooper
-// 0.0.1.5 05/16/2003 18:55:10 creed New Wind Spawn Flags For Dusty Fog & 1/2 way through Haz Trooper Fixins
-// 0.0.1.4 05/15/2003 14:29:35 jmonroe misc_model_static stay around after a vid_start
-// 0.0.1.3 05/14/2003 17:53:44 mgummelt testing misc_model_breakable scaling
-// 0.0.1.2 05/13/2003 20:48:35 jmonroe vv post merge
-// 0.0.1.1 05/13/2003 14:17:20 scork ste test comment
-// END COMMENTS
-
-#endif // __AUTO_VERSION_HEADER
diff --git a/code/win32/game.rc b/code/win32/game.rc
index 7b9d377284..25a37910c4 100644
--- a/code/win32/game.rc
+++ b/code/win32/game.rc
@@ -27,18 +27,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// TEXTINCLUDE
//
-1 TEXTINCLUDE
+1 TEXTINCLUDE
BEGIN
"resource.h\0"
END
-2 TEXTINCLUDE
+2 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
-3 TEXTINCLUDE
+3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
@@ -51,7 +51,7 @@ END
//
// Version
//
-#include "AutoVersion.h"
+#include "../qcommon/game_version.h"
VS_VERSION_INFO VERSIONINFO
FILEVERSION VERSION_MAJOR_RELEASE,VERSION_MINOR_RELEASE,VERSION_EXTERNAL_BUILD,VERSION_INTERNAL_BUILD
diff --git a/code/win32/winquake.rc b/code/win32/winquake.rc
index 8be20e493c..937ad8c83f 100644
--- a/code/win32/winquake.rc
+++ b/code/win32/winquake.rc
@@ -27,18 +27,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// TEXTINCLUDE
//
-1 TEXTINCLUDE
+1 TEXTINCLUDE
BEGIN
"resource.h\0"
END
-2 TEXTINCLUDE
+2 TEXTINCLUDE
BEGIN
"#include ""winres.h""\r\n"
"\0"
END
-3 TEXTINCLUDE
+3 TEXTINCLUDE
BEGIN
"\0"
END
@@ -59,7 +59,7 @@ IDI_ICON1 ICON "starwars.ico"
//
// Version
//
-#include "AutoVersion.h"
+#include "../qcommon/game_version.h"
VS_VERSION_INFO VERSIONINFO
FILEVERSION VERSION_MAJOR_RELEASE,VERSION_MINOR_RELEASE,VERSION_EXTERNAL_BUILD,VERSION_INTERNAL_BUILD
diff --git a/codeJK2/game/g_local.h b/codeJK2/game/g_local.h
index 10b61cf3c0..221cf26d98 100644
--- a/codeJK2/game/g_local.h
+++ b/codeJK2/game/g_local.h
@@ -37,9 +37,6 @@ along with this program; if not, see .
//==================================================================
-// the "gameversion" client command will print this plus compile date
-#define GAMEVERSION "OpenJO-" GIT_HASH
-
#define BODY_QUEUE_SIZE 8
#define Q3_INFINITE 16777216
diff --git a/codeJK2/game/g_main.cpp b/codeJK2/game/g_main.cpp
index 22135c231f..671b309a80 100644
--- a/codeJK2/game/g_main.cpp
+++ b/codeJK2/game/g_main.cpp
@@ -36,7 +36,7 @@ along with this program; if not, see .
#include "../cgame/cg_local.h" // yeah I know this is naughty, but we're shipping soon...
#include "time.h"
#include "../code/qcommon/ojk_saved_game_helper.h"
-#include "qcommon/q_version.h"
+#include "../code/qcommon/game_version.h"
extern CNavigator navigator;
@@ -558,7 +558,7 @@ void G_InitCvars( void ) {
g_developer = gi.cvar ("developer", "", 0);
// noset vars
- gi.cvar( "gamename", GAMEVERSION , CVAR_SERVERINFO | CVAR_ROM );
+ gi.cvar( "gamename", JK_VERSION , CVAR_SERVERINFO | CVAR_ROM );
gi.cvar( "gamedate", SOURCE_DATE , CVAR_ROM );
g_skippingcin = gi.cvar ("skippingCinematic", "0", CVAR_ROM);
@@ -620,7 +620,7 @@ void InitGame( const char *mapname, const char *spawntarget, int checkSum, cons
g_qbLoadTransition = qbLoadTransition;
gi.Printf ("------- Game Initialization -------\n");
- gi.Printf ("gamename: %s\n", GAMEVERSION);
+ gi.Printf ("gamename: %s\n", JK_VERSION);
gi.Printf ("gamedate: %s\n", SOURCE_DATE);
srand( randomSeed );
diff --git a/codeJK2/win32/AutoVersion.h b/codeJK2/win32/AutoVersion.h
deleted file mode 100644
index 841c109e4b..0000000000
--- a/codeJK2/win32/AutoVersion.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
-This file is part of Jedi Academy.
-
- Jedi Academy is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2
- as published by the Free Software Foundation.
-
- Jedi Academy is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Jedi Academy. If not, see .
-*/
-// Copyright 2001-2013 Raven Software
-
-#ifndef __AUTO_VERSION_HEADER
-#define __AUTO_VERSION_HEADER
-
-#define VERSION_MAJOR_RELEASE 1
-#define VERSION_MINOR_RELEASE 0
-#define VERSION_EXTERNAL_BUILD 1
-#define VERSION_INTERNAL_BUILD 1
-
-#define VERSION_STRING "1, 0, 1, 1"
-#define VERSION_STRING_DOTTED "1.0.1.1"
-
-#define VERSION_BUILD_NUMBER 80
-
-// BEGIN COMMENTS
-// 1.0.1.0 10/24/2003 16:29:53 jmonroe patch rc1
-// 1.0.0.4 10/17/2003 17:45:31 jmonroe fix ati texture rect hack
-// 1.0.0.3 08/29/2003 18:17:37 jmonroe hide saberrealisticcombat and g_dismemberment debug value
-// 1.0.0.2 08/12/2003 17:48:44 jmonroe demo, take 3
-// 1.0.0.1 08/07/2003 19:53:23 jmonroe demo round 2
-// 1.0.0.0 08/01/2003 16:59:44 jmonroe push demo code changes
-// 1.0.0.0 07/21/2003 16:09:23 jmonroe going gold
-// 0.0.12.0 07/20/2003 19:04:44 jmonroe build 0.12 for qa
-// 0.0.11.0 07/19/2003 15:30:08 jmonroe stuff
-// 0.0.11.0 07/17/2003 17:08:09 jmonroe build 0.11 for qa
-// 0.0.10.1 07/16/2003 17:33:28 mgummelt General Update With Latest Code
-// 0.0.10.0 07/16/2003 10:28:51 jmonroe new product id, remove outcast.roq at end, menu ignoreescape, eax looping sounds support chan_less_atten
-// 0.0.10.0 07/14/2003 19:04:42 jmonroe build 0.10 for qa
-// 0.0.9.0 07/12/2003 13:05:57 jmonroe increase numsnapshot ents
-// 0.0.9.0 07/11/2003 17:48:40 jmonroe buil 0.09 for qa
-// 0.0.8.4 07/11/2003 15:47:55 jmonroe weatherzone caching
-// 0.0.8.3 07/11/2003 12:05:44 mgummelt Lava & Acid fixes
-// 0.0.8.2 07/10/2003 17:26:42 mgummelt General Update with today's bug fixes
-// 0.0.8.1 07/09/2003 19:24:19 jmonroe eax voice stomp fix, increased weather zones, ...
-// 0.0.8.0 07/08/2003 17:28:27 jmonroe build 0.08 for qa
-// 0.0.7.2 07/07/2003 16:28:40 mgummelt Blaster Pistol alt-fire returns, Rancor spawnflags corrected
-// 0.0.7.1 07/07/2003 10:48:29 jmonroe load menu fixes, darkside autoload fix,...
-// 0.0.7.0 07/02/2003 19:31:37 jmonroe buil 7 for qa
-// 0.0.6.5 07/02/2003 18:17:17 mgummelt Boss balancing
-// 0.0.6.3 07/02/2003 01:34:48 jmonroe saber in moves menu
-// 0.0.6.2 06/30/2003 15:33:37 mgummelt Force Sight change (designers readme)
-// 0.0.6.1 06/29/2003 19:00:17 jmonroe vv merged, aev_soundchan
-// 0.0.6.0 06/28/2003 16:38:27 jmonroe eax update, force sight on key dudes
-// 0.0.6.0 06/26/2003 16:45:26 jmonroe qa build
-// 0.0.5.6 06/25/2003 21:22:38 mgummelt "redcrosshair" field on misc_model_breakables and func_breakables
-// 0.0.5.5 06/25/2003 18:31:52 mgummelt Force Visible on all applicable ents
-// 0.0.5.4 06/25/2003 10:45:12 jmonroe EAX 4.0
-// 0.0.5.3 06/24/2003 22:59:31 mgummelt Reborn tweaks
-// 0.0.5.2 06/24/2003 18:53:55 mgummelt New Reborn Master
-// 0.0.5.1 06/23/2003 20:47:44 jmonroe fix NULL NPC usage
-// 0.0.5.0 06/21/2003 13:04:27 jmonroe fix eweb crash
-// 0.0.4.2 06/18/2003 14:24:35 jmonroe script cmd SET_WEAPON now precaches weapon, gil's optimized dlights
-// 0.0.4.1 06/17/2003 19:04:28 mgummelt Various Force Power, saber move & Enemy Jedi tweaks
-// 0.0.4.0 06/16/2003 19:41:54 jmonroe bug stuff
-// 0.0.4.0 06/13/2003 23:52:36 jmonroe inc version to match qa beta
-// 0.0.2.6 06/12/2003 13:11:21 creed new z-far cull
-// 0.0.2.5 06/10/2003 17:02:17 creed targetJump & other navigation
-// 0.0.2.4 06/10/2003 11:18:58 jmonroe footstep sounds in per material
-// 0.0.2.3 06/10/2003 01:37:10 mgummelt helping with entity limit at spawntime
-// 0.0.2.2 06/09/2003 14:10:32 scork fix for asian languages being bust by bad font
-// 0.0.2.1 06/08/2003 17:57:11 mgummelt Area portal fix
-// 0.0.2.0 06/08/2003 14:02:03 mgummelt Force sight change
-// 0.0.2.0 06/08/2003 00:03:58 jmonroe CGEN_LIGHTING_DIFFUSE_ENTITY merges lightingdiffuse and entity color
-// 0.0.1.25 06/05/2003 20:51:30 mgummelt Saber pull-attacks done
-// 0.0.1.24 06/05/2003 18:11:06 mgummelt Both saber control schemes implemented
-// 0.0.1.23 05/30/2003 17:12:34 mgummelt Fixed Noghri and Sand Creature
-// 0.0.1.22 05/30/2003 12:15:37 mgummelt Saboteur change, new cultist
-// 0.0.1.21 05/29/2003 16:02:48 creed Fixes For Assassin, ST AI changes
-// 0.0.1.20 05/29/2003 12:00:18 mgummelt Navigation changes
-// 0.0.1.19 05/29/2003 11:08:06 mgummelt various tweaks
-// 0.0.1.18 05/28/2003 22:08:16 creed Boba Fett ++
-// 0.0.1.17 05/28/2003 20:38:33 mgummelt force grip and force sense changes
-// 0.0.1.15 05/28/2003 17:07:26 mgummelt tweaks of force drain, protect and absorb
-// 0.0.1.14 05/28/2003 14:48:57 mgummelt various saber & AI fixes
-// 0.0.1.13 05/27/2003 17:26:30 areis Ported Glow stuff from MP (with support for nVidia and ATI cards). Added solid flag for roffs (in behaved) and made tie-bombers explode with effect.
-// 0.0.1.12 05/27/2003 13:06:03 mgummelt Noghri stick weapon shoots a projectile, E-Web uses proper sounds
-// 0.0.1.7 05/19/2003 15:00:10 mgummelt adding random jedi, elder prisoners, jedi master
-// 0.0.1.6 05/19/2003 09:22:18 creed Weather Effects & Haz Trooper
-// 0.0.1.5 05/16/2003 18:55:10 creed New Wind Spawn Flags For Dusty Fog & 1/2 way through Haz Trooper Fixins
-// 0.0.1.4 05/15/2003 14:29:35 jmonroe misc_model_static stay around after a vid_start
-// 0.0.1.3 05/14/2003 17:53:44 mgummelt testing misc_model_breakable scaling
-// 0.0.1.2 05/13/2003 20:48:35 jmonroe vv post merge
-// 0.0.1.1 05/13/2003 14:17:20 scork ste test comment
-// END COMMENTS
-
-#endif // __AUTO_VERSION_HEADER
diff --git a/codeJK2/win32/game.rc b/codeJK2/win32/game.rc
index d8a95ca3aa..42449da65c 100644
--- a/codeJK2/win32/game.rc
+++ b/codeJK2/win32/game.rc
@@ -27,18 +27,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// TEXTINCLUDE
//
-1 TEXTINCLUDE
+1 TEXTINCLUDE
BEGIN
"resource.h\0"
END
-2 TEXTINCLUDE
+2 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
-3 TEXTINCLUDE
+3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
@@ -51,7 +51,7 @@ END
//
// Version
//
-#include "AutoVersion.h"
+#include "../qcommon/game_version.h"
VS_VERSION_INFO VERSIONINFO
FILEVERSION VERSION_MAJOR_RELEASE,VERSION_MINOR_RELEASE,VERSION_EXTERNAL_BUILD,VERSION_INTERNAL_BUILD
diff --git a/codemp/cgame/CMakeLists.txt b/codemp/cgame/CMakeLists.txt
index 3bb751c74a..92cc7f2acc 100644
--- a/codemp/cgame/CMakeLists.txt
+++ b/codemp/cgame/CMakeLists.txt
@@ -25,6 +25,7 @@ set(MPCGameIncludeDirectories
"${MPDir}"
"${SharedDir}"
"${GSLIncludeDirectory}"
+ "${CMAKE_BINARY_DIR}/shared"
)
if(WIN32)
set(MPCGameLibraries "odbc32" "odbccp32") # what are these even?
@@ -106,7 +107,7 @@ set(MPCGameCommonFiles
"${MPDir}/qcommon/q_shared.h"
"${MPDir}/qcommon/qfiles.h"
"${MPDir}/qcommon/tags.h"
-
+
${SharedCommonFiles}
)
source_group("common" FILES ${MPCGameCommonFiles})
diff --git a/codemp/client/cl_console.cpp b/codemp/client/cl_console.cpp
index 2873f4f563..878b24519f 100644
--- a/codemp/client/cl_console.cpp
+++ b/codemp/client/cl_console.cpp
@@ -28,7 +28,6 @@ along with this program; if not, see .
#include "cl_cgameapi.h"
#include "qcommon/stringed_ingame.h"
#include "qcommon/game_version.h"
-#include "qcommon/q_version.h"
int g_console_field_width = 78;
@@ -744,15 +743,6 @@ void Con_DrawSolidConsole( float frac ) {
(lines-(SMALLCHAR_HEIGHT+SMALLCHAR_HEIGHT/2)), JK_VERSION[x] );
}
- const char *revision = "revision: " GIT_HASH;
- i = strlen( revision );
-
- for (x=0 ; x.
#include "qcommon/cm_public.h"
#include "qcommon/MiniHeap.h"
#include "qcommon/stringed_ingame.h"
+#include "qcommon/game_version.h"
#include "cl_cgameapi.h"
#include "cl_uiapi.h"
#include "cl_lan.h"
@@ -922,7 +923,7 @@ void CL_RequestMotd( void ) {
Info_SetValueForKey( info, "challenge", cls.updateChallenge );
Info_SetValueForKey( info, "renderer", cls.glconfig.renderer_string );
Info_SetValueForKey( info, "rvendor", cls.glconfig.vendor_string );
- Info_SetValueForKey( info, "version", com_version->string );
+ Info_SetValueForKey( info, "version", JK_VERSION_OLD " " PLATFORM_STRING " " SOURCE_DATE );
//If raven starts filtering for this, add this code back in
#if 0
diff --git a/codemp/game/bg_public.h b/codemp/game/bg_public.h
index e3da414b2f..7772a635b4 100644
--- a/codemp/game/bg_public.h
+++ b/codemp/game/bg_public.h
@@ -36,7 +36,7 @@ along with this program; if not, see .
#define MAX_SPAWN_VARS 64
#define MAX_SPAWN_VARS_CHARS 4096
-
+// like a protocol version, but for mods
#define GAME_VERSION "basejka-1"
#define DEFAULT_SABER "Kyle"
diff --git a/codemp/game/g_cvar.c b/codemp/game/g_cvar.c
index ea8f8d0468..8fe13445b6 100644
--- a/codemp/game/g_cvar.c
+++ b/codemp/game/g_cvar.c
@@ -22,6 +22,7 @@ along with this program; if not, see .
*/
#include "g_local.h"
+#include "qcommon/game_version.h"
//
// Cvar callbacks
diff --git a/codemp/game/g_local.h b/codemp/game/g_local.h
index ff69ab12b6..cc4031372d 100644
--- a/codemp/game/g_local.h
+++ b/codemp/game/g_local.h
@@ -43,9 +43,6 @@ extern vec3_t gPainPoint;
//==================================================================
-// the "gameversion" client command will print this plus compile date
-#define GAMEVERSION "OpenJK-" GIT_HASH
-
#define SECURITY_LOG "security.log"
#define BODY_QUEUE_SIZE 8
diff --git a/codemp/game/g_main.c b/codemp/game/g_main.c
index 31715742ad..bfaa915ee0 100644
--- a/codemp/game/g_main.c
+++ b/codemp/game/g_main.c
@@ -28,7 +28,7 @@ along with this program; if not, see .
#include "g_nav.h"
#include "bg_saga.h"
#include "b_local.h"
-#include "qcommon/q_version.h"
+#include "qcommon/game_version.h"
NORETURN_PTR void (*Com_Error)( int level, const char *error, ... );
void (*Com_Printf)( const char *msg, ... );
@@ -199,7 +199,7 @@ void G_InitGame( int levelTime, int randomSeed, int restart ) {
BG_VehicleLoadParms();
trap->Print ("------- Game Initialization -------\n");
- trap->Print ("gamename: %s\n", GAMEVERSION);
+ trap->Print ("gamename: %s\n", JK_VERSION);
trap->Print ("gamedate: %s\n", SOURCE_DATE);
G_RegisterCvars();
diff --git a/codemp/game/g_xcvar.h b/codemp/game/g_xcvar.h
index dca8c3ccd8..948679048e 100644
--- a/codemp/game/g_xcvar.h
+++ b/codemp/game/g_xcvar.h
@@ -21,8 +21,6 @@ along with this program; if not, see .
===========================================================================
*/
-#include "qcommon/q_version.h"
-
#ifdef XCVAR_PROTO
#define XCVAR_DEF( name, defVal, update, flags, announce ) extern vmCvar_t name;
#endif
@@ -168,7 +166,7 @@ XCVAR_DEF( g_warmup, "20", NULL, CVAR_ARCHIVE, qtrue )
XCVAR_DEF( g_weaponDisable, "0", NULL, CVAR_SERVERINFO|CVAR_ARCHIVE|CVAR_LATCH, qtrue )
XCVAR_DEF( g_weaponRespawn, "5", NULL, CVAR_NONE, qtrue )
XCVAR_DEF( gamedate, SOURCE_DATE, NULL, CVAR_ROM, qfalse )
-XCVAR_DEF( gamename, GAMEVERSION, NULL, CVAR_SERVERINFO|CVAR_ROM, qfalse )
+XCVAR_DEF( gamename, JK_VERSION, NULL, CVAR_SERVERINFO|CVAR_ROM, qfalse )
XCVAR_DEF( pmove_fixed, "0", NULL, CVAR_SYSTEMINFO|CVAR_ARCHIVE, qtrue )
XCVAR_DEF( pmove_float, "0", NULL, CVAR_SYSTEMINFO|CVAR_ARCHIVE, qtrue )
XCVAR_DEF( pmove_msec, "8", NULL, CVAR_SYSTEMINFO|CVAR_ARCHIVE, qtrue )
diff --git a/codemp/qcommon/common.cpp b/codemp/qcommon/common.cpp
index 0a08077119..022bf7a0fe 100644
--- a/codemp/qcommon/common.cpp
+++ b/codemp/qcommon/common.cpp
@@ -27,7 +27,6 @@ along with this program; if not, see .
#include "stringed_ingame.h"
#include "qcommon/cm_public.h"
#include "qcommon/game_version.h"
-#include "qcommon/q_version.h"
#include "../server/NPCNav/navigator.h"
#include "../shared/sys/sys_local.h"
#if defined(_WIN32)
@@ -59,7 +58,6 @@ cvar_t *com_G2Report;
#endif
cvar_t *com_version;
-cvar_t *com_revision;
cvar_t *com_buildScript; // for automated data building scripts
cvar_t *com_bootlogo;
cvar_t *cl_paused;
@@ -1125,7 +1123,6 @@ Com_Init
=================
*/
void Com_Init( char *commandLine ) {
- char *s;
int qport;
Com_Printf( "%s %s %s\n", JK_VERSION, PLATFORM_STRING, SOURCE_DATE );
@@ -1243,9 +1240,7 @@ void Com_Init( char *commandLine ) {
com_bootlogo = Cvar_Get( "com_bootlogo", "1", CVAR_ARCHIVE_ND, "Show intro movies" );
- s = va("%s %s %s", JK_VERSION_OLD, PLATFORM_STRING, SOURCE_DATE );
- com_version = Cvar_Get ("version", s, CVAR_ROM | CVAR_SERVERINFO );
- com_revision = Cvar_Get ("revision", GIT_HASH, CVAR_ROM | CVAR_SERVERINFO );
+ com_version = Cvar_Get ("version", JK_VERSION " " PLATFORM_STRING " " SOURCE_DATE, CVAR_ROM | CVAR_SERVERINFO );
SE_Init();
diff --git a/codemp/qcommon/game_version.h b/codemp/qcommon/game_version.h
index a0988af0e3..db570e3d96 100644
--- a/codemp/qcommon/game_version.h
+++ b/codemp/qcommon/game_version.h
@@ -20,8 +20,7 @@ along with this program; if not, see .
===========================================================================
*/
-#define _STR(x) #x
-#define STR(x) _STR(x)
+#include "qcommon/q_version.h"
// Current version of the multi player game
#define VERSION_MAJOR_RELEASE 1
@@ -29,13 +28,13 @@ along with this program; if not, see .
#define VERSION_EXTERNAL_BUILD 1
#define VERSION_INTERNAL_BUILD 0
-#define VERSION_STRING STR(VERSION_MAJOR_RELEASE) ", " STR(VERSION_MINOR_RELEASE) ", " STR(VERSION_EXTERNAL_BUILD) ", " STR(VERSION_INTERNAL_BUILD) // "a, b, c, d"
-#define VERSION_STRING_DOTTED STR(VERSION_MAJOR_RELEASE) "." STR(VERSION_MINOR_RELEASE) "." STR(VERSION_EXTERNAL_BUILD) "." STR(VERSION_INTERNAL_BUILD) // "a.b.c.d"
+#define VERSION_STRING XSTRING(VERSION_MAJOR_RELEASE) ", " XSTRING(VERSION_MINOR_RELEASE) ", " XSTRING(VERSION_EXTERNAL_BUILD) ", " XSTRING(VERSION_INTERNAL_BUILD) // "a, b, c, d"
+#define VERSION_STRING_DOTTED XSTRING(VERSION_MAJOR_RELEASE) "." XSTRING(VERSION_MINOR_RELEASE) "." XSTRING(VERSION_EXTERNAL_BUILD) "." XSTRING(VERSION_INTERNAL_BUILD) // "a.b.c.d"
#if defined(_DEBUG)
- #define JK_VERSION "(debug)OpenJK-MP: v" VERSION_STRING_DOTTED
+ #define JK_VERSION "(debug)OpenJK-MP: " GIT_TAG
#define JK_VERSION_OLD "(debug)JAmp: v" VERSION_STRING_DOTTED
#else
- #define JK_VERSION "OpenJK-MP: v" VERSION_STRING_DOTTED
+ #define JK_VERSION "OpenJK-MP: " GIT_TAG
#define JK_VERSION_OLD "JAmp: v" VERSION_STRING_DOTTED
#endif
diff --git a/codemp/qcommon/qcommon.h b/codemp/qcommon/qcommon.h
index f3d73c068a..1c69b9f3a5 100644
--- a/codemp/qcommon/qcommon.h
+++ b/codemp/qcommon/qcommon.h
@@ -778,7 +778,6 @@ extern cvar_t *com_timescale;
extern cvar_t *com_sv_running;
extern cvar_t *com_cl_running;
extern cvar_t *com_version;
-extern cvar_t *com_revision;
extern cvar_t *com_buildScript; // for building release pak files
extern cvar_t *com_journal;
extern cvar_t *com_cameraMode;
diff --git a/codemp/server/sv_ccmds.cpp b/codemp/server/sv_ccmds.cpp
index 47c2deb879..9603b921e0 100644
--- a/codemp/server/sv_ccmds.cpp
+++ b/codemp/server/sv_ccmds.cpp
@@ -24,8 +24,8 @@ along with this program; if not, see .
#include "server.h"
#include "qcommon/stringed_ingame.h"
-#include "server/sv_gameapi.h"
#include "qcommon/game_version.h"
+#include "server/sv_gameapi.h"
/*
===============================================================================
diff --git a/codemp/ui/CMakeLists.txt b/codemp/ui/CMakeLists.txt
index f44d4fcf4e..79b8f35989 100644
--- a/codemp/ui/CMakeLists.txt
+++ b/codemp/ui/CMakeLists.txt
@@ -25,6 +25,7 @@ set(MPUIIncludeDirectories
"${MPDir}"
"${SharedDir}"
"${GSLIncludeDirectory}"
+ "${CMAKE_BINARY_DIR}/shared"
)
if(WIN32)
set(MPUILibraries "odbc32" "odbccp32") # what are these even?
@@ -54,7 +55,7 @@ set(MPUICommonFiles
"${MPDir}/qcommon/q_shared.h"
"${MPDir}/qcommon/qfiles.h"
"${MPDir}/qcommon/tags.h"
-
+
${SharedCommonFiles}
)
source_group("common" FILES ${MPUICommonFiles})
diff --git a/shared/qcommon/q_version.h.in b/shared/qcommon/q_version.h.in
index d58c533843..559233daf4 100644
--- a/shared/qcommon/q_version.h.in
+++ b/shared/qcommon/q_version.h.in
@@ -1,5 +1,5 @@
#cmakedefine SOURCE_DATE "@SOURCE_DATE@"
-#cmakedefine GIT_HASH "@GIT_HASH@"
+#cmakedefine GIT_TAG "@GIT_TAG@"
#cmakedefine BUILD_PORTABLE
#if !defined(SOURCE_DATE)
diff --git a/shared/sys/sys_win32.cpp b/shared/sys/sys_win32.cpp
index 5b6c234cf5..0cfa98b0cc 100644
--- a/shared/sys/sys_win32.cpp
+++ b/shared/sys/sys_win32.cpp
@@ -19,7 +19,6 @@ along with this program; if not, see .
===========================================================================
*/
-#include "qcommon/q_version.h"
#include "sys_local.h"
#include
#include