diff options
| author | Alexander Ovchinnikov <Alexander.Ovchinnikov@mendix.com> | 2020-07-01 15:41:38 +0200 |
|---|---|---|
| committer | Alexander Ovchinnikov <Alexander.Ovchinnikov@mendix.com> | 2020-07-01 15:42:35 +0200 |
| commit | dc1deb3b90080831eb5f289510e0694003ab2c8c (patch) | |
| tree | 67c4ed9caca8db81506a5ef24e7231c1e5cebe2f | |
| parent | 71000441677e9845adaa5d136fc842d3c9bf351e (diff) | |
| download | libgit2-dc1deb3b90080831eb5f289510e0694003ab2c8c.tar.gz | |
Use __GNUC__ macro in the resource script
Fix the default LIBGIT2_FILENAME for GNU windres
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/win32/git2.rc | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2aea58997..8f139ec20 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -278,10 +278,6 @@ list(SORT SRC_H) # On Windows use specific platform sources if(WIN32 AND NOT CYGWIN) - if(NOT MSVC) - ADD_DEFINITIONS(-DGCC_WINDRES) - endif() - SET(WIN_RC "win32/git2.rc") file(GLOB SRC_OS win32/*.c win32/*.h) diff --git a/src/win32/git2.rc b/src/win32/git2.rc index d325a5c4e..d273afd70 100644 --- a/src/win32/git2.rc +++ b/src/win32/git2.rc @@ -2,21 +2,25 @@ #include "../../include/git2/version.h" #ifndef LIBGIT2_FILENAME -# define LIBGIT2_FILENAME "git2" +# ifdef __GNUC__ +# define LIBGIT2_FILENAME git2 +# else +# define LIBGIT2_FILENAME "git2" +# endif #endif #ifndef LIBGIT2_COMMENTS # define LIBGIT2_COMMENTS "For more information visit http://libgit2.github.com/" #endif -#ifdef GCC_WINDRES +#ifdef __GNUC__ # define _STR(x) #x # define STR(x) _STR(x) #else # define STR(x) x #endif -#ifdef GCC_WINDRES +#ifdef __GNUC__ VS_VERSION_INFO VERSIONINFO #else VS_VERSION_INFO VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE |