moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-14 05:25:06 -05:00
Code Issues Releases Wiki Activity

(lib)curl.rc: fixup for minor bugs

Browse Source 
All resources defined in lib/libcurl.rc and curl.rc are language
neutral.

winbuild/MakefileBuild.vc ALWAYS defines the macro DEBUGBUILD, so the
ifdef's in line 33 of lib/libcurl.rc and src/curl.rc are wrong.

Replace the hard-coded constants in both *.rc files with #define'd
values.

Thumbs-uped-by: Rod Widdowson, Johannes Schindelin
URL: https://curl.haxx.se/mail/lib-2018-11/0000.html
Closes #3348
This commit is contained in:
Stefan Kanthak 2018-12-07 16:39:35 +01:00 committed by Daniel Stenberg
parent 4e326f9247
commit e1360a1c91
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/libcurl.rc
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -22,22 +22,22 @@
#include <winver.h> #include <winver.h>
#include "../include/curl/curlver.h" #include "../include/curl/curlver.h"
LANGUAGE 0x09,0x01 LANGUAGE 0, 0
#define RC_VERSION LIBCURL_VERSION_MAJOR, LIBCURL_VERSION_MINOR, LIBCURL_VERSION_PATCH, 0 #define RC_VERSION LIBCURL_VERSION_MAJOR, LIBCURL_VERSION_MINOR, LIBCURL_VERSION_PATCH, 0
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION RC_VERSION FILEVERSION RC_VERSION
PRODUCTVERSION RC_VERSION PRODUCTVERSION RC_VERSION
FILEFLAGSMASK 0x3fL FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#if defined(DEBUGBUILD) || defined(_DEBUG) #if defined(DEBUGBUILD) || defined(_DEBUG)
FILEFLAGS 1 FILEFLAGS VS_FF_DEBUG
#else #else
FILEFLAGS 0 FILEFLAGS 0L
#endif #endif
FILEOS VOS__WINDOWS32 FILEOS VOS__WINDOWS32
FILETYPE VFT_DLL FILETYPE VFT_DLL
FILESUBTYPE 0x0L FILESUBTYPE 0L
BEGIN BEGIN
BLOCK "StringFileInfo" BLOCK "StringFileInfo"

10
src/curl.rc
View File

@ -22,22 +22,22 @@
#include <winver.h> #include <winver.h>
#include "tool_version.h" #include "tool_version.h"
LANGUAGE 0x09,0x01 LANGUAGE 0, 0
#define RC_VERSION CURL_VERSION_MAJOR, CURL_VERSION_MINOR, CURL_VERSION_PATCH, 0 #define RC_VERSION CURL_VERSION_MAJOR, CURL_VERSION_MINOR, CURL_VERSION_PATCH, 0
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION RC_VERSION FILEVERSION RC_VERSION
PRODUCTVERSION RC_VERSION PRODUCTVERSION RC_VERSION
FILEFLAGSMASK 0x3fL FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#if defined(DEBUGBUILD) || defined(_DEBUG) #if defined(DEBUGBUILD) || defined(_DEBUG)
FILEFLAGS 1 FILEFLAGS VS_FF_DEBUG
#else #else
FILEFLAGS 0 FILEFLAGS 0L
#endif #endif
FILEOS VOS__WINDOWS32 FILEOS VOS__WINDOWS32
FILETYPE VFT_APP FILETYPE VFT_APP
FILESUBTYPE 0x0L FILESUBTYPE 0L
BEGIN BEGIN
BLOCK "StringFileInfo" BLOCK "StringFileInfo"