Skip to content

Commit 5c40456

Browse files
Alexander OvchinnikovAlexander Ovchinnikov
authored andcommitted
Enable building git2.rc resource script with GCC
1 parent d6c6285 commit 5c40456

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

src/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,10 +278,12 @@ list(SORT SRC_H)
278278

279279
# On Windows use specific platform sources
280280
if(WIN32 AND NOT CYGWIN)
281-
if(MSVC)
282-
SET(WIN_RC "win32/git2.rc")
281+
if(NOT MSVC)
282+
ADD_DEFINITIONS(-DGCC_WINDRES)
283283
endif()
284284

285+
SET(WIN_RC "win32/git2.rc")
286+
285287
file(GLOB SRC_OS win32/*.c win32/*.h)
286288
list(SORT SRC_OS)
287289
elseif(AMIGA)

src/win32/git2.rc

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,18 @@
99
# define LIBGIT2_COMMENTS "For more information visit http://libgit2.github.com/"
1010
#endif
1111

12+
#ifdef GCC_WINDRES
13+
# define STRINGIZE(x) #x
14+
# define STRINGIZE_(x) STRINGIZE(x)
15+
#else
16+
# define STRINGIZE_(x) x
17+
#endif
18+
19+
#ifdef GCC_WINDRES
20+
VS_VERSION_INFO VERSIONINFO
21+
#else
1222
VS_VERSION_INFO VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
23+
#endif
1324
FILEVERSION LIBGIT2_VER_MAJOR,LIBGIT2_VER_MINOR,LIBGIT2_VER_REVISION,LIBGIT2_VER_PATCH
1425
PRODUCTVERSION LIBGIT2_VER_MAJOR,LIBGIT2_VER_MINOR,LIBGIT2_VER_REVISION,LIBGIT2_VER_PATCH
1526
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
@@ -29,9 +40,9 @@ BEGIN
2940
BEGIN
3041
VALUE "FileDescription", "libgit2 - the Git linkable library\0"
3142
VALUE "FileVersion", LIBGIT2_VERSION "\0"
32-
VALUE "InternalName", LIBGIT2_FILENAME ".dll\0"
43+
VALUE "InternalName", STRINGIZE_(LIBGIT2_FILENAME) ".dll\0"
3344
VALUE "LegalCopyright", "Copyright (C) the libgit2 contributors. All rights reserved.\0"
34-
VALUE "OriginalFilename", LIBGIT2_FILENAME ".dll\0"
45+
VALUE "OriginalFilename", STRINGIZE_(LIBGIT2_FILENAME) ".dll\0"
3546
VALUE "ProductName", "libgit2\0"
3647
VALUE "ProductVersion", LIBGIT2_VERSION "\0"
3748
VALUE "Comments", LIBGIT2_COMMENTS "\0"

0 commit comments

Comments
 (0)