diff options
| author | Alexander Ovchinnikov <Alexander.Ovchinnikov@mendix.com> | 2020-06-16 13:19:02 +0200 |
|---|---|---|
| committer | Alexander Ovchinnikov <Alexander.Ovchinnikov@mendix.com> | 2020-07-01 15:42:34 +0200 |
| commit | 5c40456b167aa3b1d7163304135c04d9c25a5898 (patch) | |
| tree | daea0c8e2470e31e50f4353b0b331f4a858c437b | |
| parent | d6c62852076005053be9169cb4f3cd9cf9db2aea (diff) | |
| download | libgit2-5c40456b167aa3b1d7163304135c04d9c25a5898.tar.gz | |
Enable building git2.rc resource script with GCC
| -rw-r--r-- | src/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/win32/git2.rc | 15 |
2 files changed, 17 insertions, 4 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 481707c7a..2aea58997 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -278,10 +278,12 @@ list(SORT SRC_H) # On Windows use specific platform sources if(WIN32 AND NOT CYGWIN) - if(MSVC) - SET(WIN_RC "win32/git2.rc") + if(NOT MSVC) + ADD_DEFINITIONS(-DGCC_WINDRES) endif() + SET(WIN_RC "win32/git2.rc") + file(GLOB SRC_OS win32/*.c win32/*.h) list(SORT SRC_OS) elseif(AMIGA) diff --git a/src/win32/git2.rc b/src/win32/git2.rc index 3571bc683..1379379f7 100644 --- a/src/win32/git2.rc +++ b/src/win32/git2.rc @@ -9,7 +9,18 @@ # define LIBGIT2_COMMENTS "For more information visit http://libgit2.github.com/" #endif +#ifdef GCC_WINDRES +# define STRINGIZE(x) #x +# define STRINGIZE_(x) STRINGIZE(x) +#else +# define STRINGIZE_(x) x +#endif + +#ifdef GCC_WINDRES +VS_VERSION_INFO VERSIONINFO +#else VS_VERSION_INFO VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE +#endif FILEVERSION LIBGIT2_VER_MAJOR,LIBGIT2_VER_MINOR,LIBGIT2_VER_REVISION,LIBGIT2_VER_PATCH PRODUCTVERSION LIBGIT2_VER_MAJOR,LIBGIT2_VER_MINOR,LIBGIT2_VER_REVISION,LIBGIT2_VER_PATCH FILEFLAGSMASK VS_FFI_FILEFLAGSMASK @@ -29,9 +40,9 @@ BEGIN BEGIN VALUE "FileDescription", "libgit2 - the Git linkable library\0" VALUE "FileVersion", LIBGIT2_VERSION "\0" - VALUE "InternalName", LIBGIT2_FILENAME ".dll\0" + VALUE "InternalName", STRINGIZE_(LIBGIT2_FILENAME) ".dll\0" VALUE "LegalCopyright", "Copyright (C) the libgit2 contributors. All rights reserved.\0" - VALUE "OriginalFilename", LIBGIT2_FILENAME ".dll\0" + VALUE "OriginalFilename", STRINGIZE_(LIBGIT2_FILENAME) ".dll\0" VALUE "ProductName", "libgit2\0" VALUE "ProductVersion", LIBGIT2_VERSION "\0" VALUE "Comments", LIBGIT2_COMMENTS "\0" |