make recompile for vers/git state change minimal
Make a `version.c` with `const char*` variables to store the version strings used by other files, to make recompiles slightly faster when the git state changes. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
This commit is contained in:
parent
af0de1c4b3
commit
24d83a1262
|
@ -809,6 +809,7 @@ set(
|
|||
src/sdl/expr.cpp
|
||||
src/sdl/exprNode.cpp
|
||||
src/sdl/expr-lex.cpp
|
||||
src/common/version.c
|
||||
)
|
||||
|
||||
set(
|
||||
|
@ -818,6 +819,7 @@ set(
|
|||
src/sdl/inputSDL.h
|
||||
src/sdl/expr.cpp.h
|
||||
src/sdl/exprNode.h
|
||||
src/common/version_c.h
|
||||
)
|
||||
|
||||
set(
|
||||
|
|
|
@ -0,0 +1,6 @@
|
|||
#include "version_c.h"
|
||||
#include "version.h"
|
||||
|
||||
const char* vba_name_and_subversion = VBA_NAME_AND_SUBVERSION;
|
||||
|
||||
const char* vbam_version = VERSION;
|
|
@ -0,0 +1,8 @@
|
|||
#ifndef VBAM_VERSION_C_H
|
||||
#define VBAM_VERSION_C_H
|
||||
|
||||
extern const char* vba_name_and_subversion;
|
||||
|
||||
extern const char* vbam_version;
|
||||
|
||||
#endif /* VBAM_VERSION_C_H */
|
|
@ -41,7 +41,7 @@
|
|||
|
||||
#include <time.h>
|
||||
|
||||
#include "version.h"
|
||||
#include "../common/version_c.h"
|
||||
|
||||
#include "SDL.h"
|
||||
|
||||
|
@ -1521,7 +1521,7 @@ void SetHomeDataDir()
|
|||
|
||||
int main(int argc, char** argv)
|
||||
{
|
||||
fprintf(stdout, "%s\n", VBA_NAME_AND_SUBVERSION);
|
||||
fprintf(stdout, "%s\n", vba_name_and_subversion);
|
||||
|
||||
home = argv[0];
|
||||
SetHome(home);
|
||||
|
|
|
@ -17,6 +17,9 @@
|
|||
// along with this program; if not, write to the Free Software Foundation,
|
||||
// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
#ifndef VBAM_VERSION_H
|
||||
#define VBAM_VERSION_H
|
||||
|
||||
#define VBA_NAME "VisualBoyAdvance-M"
|
||||
#define VBA_CURRENT_VERSION "@VERSION@"
|
||||
|
||||
|
@ -46,3 +49,5 @@
|
|||
|
||||
#define VER_FILEVERSION_STR VERSION
|
||||
#define VER_FILEVERSION @WIN_VERSION@
|
||||
|
||||
#endif /* VBAM_VERSION_H */
|
||||
|
|
|
@ -668,6 +668,7 @@ set(
|
|||
cmd-evtable.h
|
||||
# icon File
|
||||
xrc/vbam.xpm
|
||||
../common/version.c
|
||||
)
|
||||
|
||||
if(APPLE)
|
||||
|
@ -693,6 +694,7 @@ set(
|
|||
../sdl/text.h
|
||||
# from external source with minor modifications
|
||||
widgets/wx/checkedlistctrl.h
|
||||
../common/version_c.h
|
||||
)
|
||||
|
||||
set(
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
#include <wx/wfstream.h>
|
||||
#include <wx/msgdlg.h>
|
||||
|
||||
#include "version.h"
|
||||
#include "../common/version_c.h"
|
||||
#include "../common/ConfigManager.h"
|
||||
#include "../gb/gbPrinter.h"
|
||||
#include "../gba/agbprint.h"
|
||||
|
@ -2723,22 +2723,14 @@ EVT_HANDLER(Translate, "Translations")
|
|||
wxLaunchDefaultBrowser(wxT("http://www.transifex.com/projects/p/vba-m"));
|
||||
}
|
||||
|
||||
#include "../common/version_c.h"
|
||||
|
||||
// was About
|
||||
EVT_HANDLER(wxID_ABOUT, "About...")
|
||||
{
|
||||
wxAboutDialogInfo ai;
|
||||
ai.SetName(wxT("VisualBoyAdvance-M"));
|
||||
wxString version = wxT("");
|
||||
#ifndef FINAL_BUILD
|
||||
#ifndef VERSION
|
||||
# define VERSION "git"
|
||||
#endif
|
||||
|
||||
if (!version.IsEmpty())
|
||||
version = version + wxT("-");
|
||||
|
||||
version = version + wxT(VERSION);
|
||||
#endif
|
||||
wxString version(vbam_version);
|
||||
ai.SetVersion(version);
|
||||
// setting website, icon, license uses custom aboutbox on win32 & macosx
|
||||
// but at least win32 standard about is nothing special
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
#include <wx/dcbuffer.h>
|
||||
#include <SDL_joystick.h>
|
||||
|
||||
#include "version.h"
|
||||
#include "../common/version_c.h"
|
||||
#include "../common/ConfigManager.h"
|
||||
#include "../common/Patch.h"
|
||||
#include "../gb/gbPrinter.h"
|
||||
|
@ -424,9 +424,8 @@ void GameArea::SetFrameTitle()
|
|||
}
|
||||
|
||||
tit.append(wxT("VisualBoyAdvance-M "));
|
||||
#ifndef FINAL_BUILD
|
||||
tit.append(_(VERSION));
|
||||
#endif
|
||||
tit.append(vbam_version);
|
||||
|
||||
#ifndef NO_LINK
|
||||
int playerId = GetLinkPlayerId();
|
||||
|
||||
|
|
Loading…
Reference in New Issue