rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename VERSION to SYNERGY_VERSION

This commit is contained in:
Andrew Nelless 2017-04-27 15:59:22 +01:00
parent 876744ad2c
commit 242f1e7e29
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -309,7 +309,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
/DWIN32 /DWIN32
/D_WINDOWS /D_WINDOWS
/D_CRT_SECURE_NO_WARNINGS /D_CRT_SECURE_NO_WARNINGS
/DVERSION=\"${VERSION}\" /DSYNERGY_VERSION=\"${SYNERGY_VERSION}\"
/D_XKEYCHECK_H /D_XKEYCHECK_H
) )
endif() endif()

2
res/config.h.in
View File

@ -1,5 +1,5 @@
/* Define version here for Unix, but using /D for Windows. */ /* Define version here for Unix, but using /D for Windows. */
#cmakedefine VERSION "${VERSION}" #cmakedefine SYNERGY_VERSION "${SYNERGY_VERSION}"
/* Define to the base type of arg 3 for `accept`. */ /* Define to the base type of arg 3 for `accept`. */
#cmakedefine ACCEPT_TYPE_ARG3 ${ACCEPT_TYPE_ARG3} #cmakedefine ACCEPT_TYPE_ARG3 ${ACCEPT_TYPE_ARG3}

8
src/lib/common/Version.cpp
View File

@ -22,7 +22,7 @@ const char* kApplication = "Synergy";
const char* kCopyright = "Copyright (C) 2012-2016 Symless Ltd.\n" const char* kCopyright = "Copyright (C) 2012-2016 Symless Ltd.\n"
"Copyright (C) 2008-2014 Nick Bolton\n" "Copyright (C) 2008-2014 Nick Bolton\n"
"Copyright (C) 2002-2014 Chris Schoeneman"; "Copyright (C) 2002-2014 Chris Schoeneman";
const char* kContact = "Email: nick@symless.com"; const char* kContact = "Email: engineering@symless.com";
const char* kWebsite = "http://symless.com/"; const char* kWebsite = "https://symless.com/";
const char* kVersion = VERSION; const char* kVersion = SYNERGY_VERSION;
const char* kAppVersion = "Synergy " VERSION; const char* kAppVersion = "Synergy " SYNERGY_VERSION;

2
src/lib/common/Version.h
View File

@ -21,7 +21,7 @@
#include "common/common.h" #include "common/common.h"
// set version macro if not set yet // set version macro if not set yet
#if !defined(VERSION) #if !defined(SYNERGY_VERSION)
#error Version was not set (should be passed to compiler). #error Version was not set (should be passed to compiler).
#endif #endif