empathicqubit/AppleWin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Version macros.

Browse source 
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
This commit is contained in:
Andrea Odetti 2019-04-19 20:42:25 +01:00
parent 5a737e988b
commit e68898daf4
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/CMakeLists.txt
View file

@ -1,8 +1,3 @@
add_custom_command(OUTPUT linux/version.hpp
COMMAND grep FILEVERSION ${CMAKE_CURRENT_SOURCE_DIR}/../resource/Applewin.rc | sed 's/FILEVERSION/\#define FILEVERSION/' > linux/version.hpp
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../resource/Applewin.rc
)
add_library(appleii SHARED
SaveState.cpp
Pravets.cpp
@ -31,7 +26,6 @@ add_library(appleii SHARED
linux/benchmark.cpp
linux/paddle.cpp
linux/version.cpp
linux/version.hpp
Z80VICE/z80.cpp
Z80VICE/z80mem.cpp

8
source/linux/version.cpp
View file

@ -1,10 +1,10 @@
#include "linux/version.h"
#include "linux/version.hpp"
#include "../resource/version.h"
#define xstr(a) str(a)
#define str(a, b, c, d) #a"."#b"."#c"."#d
#define xstr2(a) str2(a)
#define str2(a, b, c, d) #a"."#b"."#c"."#d
std::string getVersion()
{
return xstr(FILEVERSION);
return xstr2(APPLEWIN_VERSION);
}