From cc3ef4cbca9bc8494d7f96d438e4d36c095ae22d Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 27 Apr 2018 04:02:41 +0200 Subject: [PATCH] Add RC file for Windows --- CMakeLists.txt | 4 ++ Minetestmapper/CMakeLists.txt | 6 +-- Minetestmapper/Minetestmapper.rc | 51 +++++++++++++++++++++++ Minetestmapper/ResTempl1.rct | Bin 1412 -> 0 bytes Minetestmapper/minetestmapper.rc | 69 ------------------------------- Minetestmapper/version.h | 16 +++++-- version.h.in | 14 ++++++- 7 files changed, 82 insertions(+), 78 deletions(-) create mode 100644 Minetestmapper/Minetestmapper.rc delete mode 100644 Minetestmapper/ResTempl1.rct delete mode 100644 Minetestmapper/minetestmapper.rc diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e2b79b..201aaeb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -111,6 +111,10 @@ add_subdirectory ("Minetestmapper") message(STATUS "VCPKG_APPLOCAL_DEPS: ${VCPKG_APPLOCAL_DEPS}") +if(NOT PROJECT_VERSION_TWEAK) + set(PROJECT_VERSION_TWEAK 0) +endif() + configure_file( "${PROJECT_SOURCE_DIR}/version.h.in" "${PROJECT_SOURCE_DIR}/Minetestmapper/version.h" diff --git a/Minetestmapper/CMakeLists.txt b/Minetestmapper/CMakeLists.txt index 2d25e0c..f0ece08 100644 --- a/Minetestmapper/CMakeLists.txt +++ b/Minetestmapper/CMakeLists.txt @@ -45,9 +45,7 @@ set(sources ) if(WIN32) -set(sources ${sources} ResTempl1.rct) -add_definitions(-DVER_COMPANYNAME_STR="MyCompany") -add_definitions(-DVER_FILEVERSION_STR="1,1,0.0") +set(sources ${sources} Minetestmapper.rc) add_definitions(-D_USE_MATH_DEFINES) endif(WIN32) @@ -104,4 +102,4 @@ install(DIRECTORY "${PROJECT_BINARY_DIR}/Minetestmapper/$/" DESTINATION FILES_MATCHING PATTERN "*.dll" PATTERN "/" EXCLUDE) install(DIRECTORY "${PROJECT_SOURCE_DIR}/colors/" DESTINATION "colors/" - FILES_MATCHING PATTERN "*.txt") \ No newline at end of file + FILES_MATCHING PATTERN "*.txt") diff --git a/Minetestmapper/Minetestmapper.rc b/Minetestmapper/Minetestmapper.rc new file mode 100644 index 0000000..d9b50b6 --- /dev/null +++ b/Minetestmapper/Minetestmapper.rc @@ -0,0 +1,51 @@ +#include "version.h" +#include "Windows.h" + +#ifndef DEBUG +#define VER_DEBUG 0 +#else +#define VER_DEBUG VS_FF_DEBUG +#endif + +#define VER_PRIVATEBUILD 0 +#define VER_PRERELEASE VS_FF_PRERELEASE + +VS_VERSION_INFO VERSIONINFO +FILEVERSION VER_FILEVERSION +PRODUCTVERSION VER_PRODUCTVERSION +FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +FILEFLAGS (VER_PRIVATEBUILD|VER_PRERELEASE|VER_DEBUG) +FILEOS VOS__WINDOWS32 +FILETYPE VFT_APP +FILESUBTYPE VFT2_UNKNOWN +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904E4" + BEGIN + VALUE "CompanyName", VER_COMPANYNAME_STR + VALUE "FileDescription", VER_FILEDESCRIPTION_STR + VALUE "FileVersion", VER_FILEVERSION_STR + VALUE "InternalName", VER_INTERNALNAME_STR + VALUE "LegalCopyright", VER_LEGALCOPYRIGHT_STR + //VALUE "LegalTrademarks1", VER_LEGALTRADEMARKS1_STR + //VALUE "LegalTrademarks2", VER_LEGALTRADEMARKS2_STR + VALUE "OriginalFilename", VER_ORIGINALFILENAME_STR + VALUE "ProductName", VER_PRODUCTNAME_STR + VALUE "ProductVersion", VER_PRODUCTVERSION_STR + END + END + + BLOCK "VarFileInfo" + BEGIN + /* The following line should only be modified for localized versions. */ + /* It consists of any number of WORD,WORD pairs, with each pair */ + /* describing a language,codepage combination supported by the file. */ + /* */ + /* For example, a file might have values "0x409,1252" indicating that it */ + /* supports English language (0x409) in the Windows ANSI codepage (1252). */ + + VALUE "Translation", 0x409, 1252 + + END +END diff --git a/Minetestmapper/ResTempl1.rct b/Minetestmapper/ResTempl1.rct deleted file mode 100644 index b906b227d2145520df356cfa4a240e11cb8c78b7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1412 zcmZ`(&2G~`5dKm{3iMDa0T)g=^Z*AUr-bsO3Y6MgVo1D^?S@uDvO)=IM4CovD#1JO z7(4(kz*}(S9k}*{`DQn+leAfDcV|7{%+7qXy8uvTPgC0|F0?ybZLv4-9($bAv|#kk z=I!E|k$~StU_I`gj)&c8ZyhKRvS?E=M)Nis@ICzwRZ!E3l8y=^Uk8aF>}&a1;Qs<4 zZar{S6Wapwz51RGV?42oP{rX9YIfnj33RCN)UJ+HgdHme8qcicHg%-%+%6ib*~SZz zlX^Q!0(BTCp^EfD=&GbsZyqRAovP%Q>!YKV@>VHb9mJt-Ua1{t(b(0kRz1kfYmQ^R z<33@FTs@v~Rl4H0xX7kzn+Gv3yzvXtwy$kd=#RLP4(5JTnhUn4r2%m9AgPOrOtdYYa$o!Eb zh`dW%mzYzG(Ix&Hqv>+hGuy~@XciP4RSw5V4G_W=*+C)?Mf^*N4BJY&W+ zp#RYg{yh4a5<6ft*5ZUVc6~vMKE%6&TXViU)KBO=_gO`S7~AEX>|%p>$z6O;Or*oP ztU|L_%u#Y4vY-{Bj)?}|8a|rT^%>jHFf%46!fYQW1|w`O{ww1lk&npHHY2I>WJ~i* z9C~Iel@X5_M;U+MS&-asj;Dcp%%x2qXZVB*6Xojq+@zX$T}s8D#qUIHvFC4A_EG_vB=4H+m1FG5pMRs| c9s9a~x&DsH{ry2)?&tdbm3#V!m{s@mKf#{YBLDyZ diff --git a/Minetestmapper/minetestmapper.rc b/Minetestmapper/minetestmapper.rc deleted file mode 100644 index 01ee02c..0000000 --- a/Minetestmapper/minetestmapper.rc +++ /dev/null @@ -1,69 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#include "version.h" - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "version.h\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION MINETESTMAPPER_VERSION_BINARY - PRODUCTVERSION MINETESTMAPPER_VERSION_BINARY - FILEFLAGSMASK 0x3fL - FILEFLAGS (0 MINETESTMAPPER_DEBUG_FLAG MINETESTMAPPER_WIP_FLAG) - FILEOS VOS_NT_WINDOWS32 - FILETYPE VFT_APP - FILESUBTYPE VFT2_UNKNOWN -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "FileDescription", "Generates maps of minetest and freeminer worlds " - VALUE "FileVersion", MINETESTMAPPER_VERSION_BINARY - VALUE "InternalName", "minetestmapper.exe" - VALUE "LegalCopyright", "LGPLv2.1+/ BSD 2-clause license" - VALUE "OriginalFilename", "minetestmapper.exe" - VALUE "ProductName", "Minetestmapper" - VALUE "ProductVersion", MINETESTMAPPER_VERSION_FULL - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/Minetestmapper/version.h b/Minetestmapper/version.h index 77481a0..4298548 100644 --- a/Minetestmapper/version.h +++ b/Minetestmapper/version.h @@ -8,10 +8,20 @@ #define PROJECT_VERSION_MAJOR 0 #define PROJECT_VERSION_MINOR 1 #define PROJECT_VERSION_PATCH 0 -#define PROJECT_VERSION_TWEAK +#define PROJECT_VERSION_TWEAK 0 -#define MINETESTMAPPER_VERSION_BINARY 0, 1, 0, 0, -#define MINETESTMAPPER_VERSION_FULL "0. 1. 0" +#define VER_FILEVERSION 0, 1, 0, 0 +#define VER_FILEVERSION_STR "0. 1. 0" + +#define VER_PRODUCTVERSION VER_FILEVERSION + +#define VER_COMPANYNAME_STR "" +#define VER_FILEDESCRIPTION_STR "Map generator for Minetest" +#define VER_INTERNALNAME_STR PROJECT_NAME +#define VER_LEGALCOPYRIGHT_STR "" +#define VER_ORIGINALFILENAME_STR "Minetestmapper.exe" +#define VER_PRODUCTNAME_STR PROJECT_NAME +#define VER_PRODUCTVERSION_STR VER_FILEVERSION_STR /* Copyright string */ /* #undef PROJECT_COPYRIGHT */ diff --git a/version.h.in b/version.h.in index 2d4efde..d64f497 100644 --- a/version.h.in +++ b/version.h.in @@ -10,8 +10,18 @@ #define PROJECT_VERSION_PATCH @PROJECT_VERSION_PATCH@ #define PROJECT_VERSION_TWEAK @PROJECT_VERSION_TWEAK@ -#define MINETESTMAPPER_VERSION_BINARY @PROJECT_VERSION_MAJOR@, @PROJECT_VERSION_MINOR@, @PROJECT_VERSION_PATCH@, @PROJECT_VERSION_PATCH@, @PROJECT_VERSION_TWEAK@ -#define MINETESTMAPPER_VERSION_FULL "@PROJECT_VERSION_MAJOR@. @PROJECT_VERSION_MINOR@. @PROJECT_VERSION_PATCH@" +#define VER_FILEVERSION @PROJECT_VERSION_MAJOR@, @PROJECT_VERSION_MINOR@, @PROJECT_VERSION_PATCH@, @PROJECT_VERSION_TWEAK@ +#define VER_FILEVERSION_STR "@PROJECT_VERSION_MAJOR@. @PROJECT_VERSION_MINOR@. @PROJECT_VERSION_PATCH@" + +#define VER_PRODUCTVERSION VER_FILEVERSION + +#define VER_COMPANYNAME_STR "" +#define VER_FILEDESCRIPTION_STR "@PROJECT_DESCRIPTION@" +#define VER_INTERNALNAME_STR PROJECT_NAME +#define VER_LEGALCOPYRIGHT_STR "@PROJECT_COPYRIGHT@" +#define VER_ORIGINALFILENAME_STR "@PROJECT_NAME@.exe" +#define VER_PRODUCTNAME_STR PROJECT_NAME +#define VER_PRODUCTVERSION_STR VER_FILEVERSION_STR /* Copyright string */ #cmakedefine PROJECT_COPYRIGHT "@PROJECT_COPYRIGHT@"