Skip to content

Commit

Permalink
Addressed review remarks
Browse files Browse the repository at this point in the history
  • Loading branch information
PatrickvL committed Nov 18, 2019
1 parent 0aac02c commit 61b3743
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 32 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,8 @@ file (GLOB CXBXR_SOURCE_COMMON
"${CXBXR_ROOT_DIR}/src/common/xbe/XbePrinter.cpp"
"${CXBXR_ROOT_DIR}/src/common/xdvdfs-tools/buffered_io.cpp"
"${CXBXR_ROOT_DIR}/src/common/xdvdfs-tools/xdvdfs.cpp"
"${CXBXR_ROOT_DIR}/src/gui/DbgConsole.cpp"
"${CXBXR_ROOT_DIR}/src/CxbxVersion.cpp"
"${CXBXR_ROOT_DIR}/src/gui/DbgConsole.cpp"
"${CXBXR_ROOT_DIR}/src/HighPerformanceGraphicsEnabler.c"
)

Expand Down
30 changes: 3 additions & 27 deletions src/CxbxVersion.cpp
Original file line number Diff line number Diff line change
@@ -1,35 +1,11 @@
// This is an open source non-commercial project. Dear PVS-Studio, please check it.
// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
// ******************************************************************
// *
// * This file is part of the Cxbx project.
// *
// * Cxbx and Cxbe are free software; you can redistribute them
// * and/or modify them under the terms of the GNU General Public
// * License as published by the Free Software Foundation; either
// * version 2 of the license, or (at your option) any later version.
// *
// * 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 recieved a copy of the GNU General Public License
// * along with this program; see the file COPYING.
// * If not, write to the Free Software Foundation, Inc.,
// * 59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA.
// *
// * (c) 2019 Patrick van Logchem <pvanlogchem@gmail.com>
// *
// * All rights reserved
// *
// ******************************************************************
#include "Version.h"
#include "CxbxVersion.h"

/*! version string dependent on trace flag */
#ifndef _DEBUG_TRACE
char * CxbxVersionStr = _GIT_VERSION " (" __DATE__ ")";
const char* CxbxVersionStr = _GIT_VERSION " (" __DATE__ ")";
#else
char * CxbxVersionStr = _GIT_VERSION "-Trace (" __DATE__ ")";
#endif
const char* CxbxVersionStr = _GIT_VERSION "-Trace (" __DATE__ ")";
#endif
2 changes: 1 addition & 1 deletion src/CxbxVersion.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

#include "version.h"

extern char * CxbxVersionStr;
extern const char* CxbxVersionStr;
6 changes: 3 additions & 3 deletions src/common/xbe/XbePrinter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,9 @@ std::string XbePrinter::GameRatingToString()
std::string XbePrinter::GenDumpHeader()
{
std::string text;
text.append("XBE information generated by Cxbx-Reloaded (Version ");
text.append(CxbxVersionStr);
text.append(")\n\n");
text.append("XBE information generated by Cxbx-Reloaded (Version ");
text.append(CxbxVersionStr);
text.append(")\n\n");
text.append("Title identified as \"");
text.append(Xbe_to_print->m_szAsciiTitle);
text.append("\"\n\n");
Expand Down

0 comments on commit 61b3743

Please sign in to comment.