Unverified Commit e1360a1c authored by Stefan Kanthak's avatar Stefan Kanthak Committed by Daniel Stenberg
Browse files

(lib)curl.rc: fixup for minor bugs 

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
parent 4e326f92

lib/libcurl.rc

+6 −6
Original line number Diff line number Diff line
@@ -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

 * you should have received as part of this distribution. The terms
@@ -22,22 +22,22 @@ 
#include <winver.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



VS_VERSION_INFO VERSIONINFO

  FILEVERSION     RC_VERSION

  PRODUCTVERSION  RC_VERSION

  FILEFLAGSMASK   0x3fL

  FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK

#if defined(DEBUGBUILD) || defined(_DEBUG)

  FILEFLAGS 1

  FILEFLAGS VS_FF_DEBUG

#else

  FILEFLAGS 0

  FILEFLAGS 0L

#endif

  FILEOS      VOS__WINDOWS32

  FILETYPE    VFT_DLL

  FILESUBTYPE 0x0L

  FILESUBTYPE 0L



BEGIN

  BLOCK "StringFileInfo"

src/curl.rc

+5 −5
Original line number Diff line number Diff line
@@ -22,22 +22,22 @@ 
#include <winver.h>

#include "tool_version.h"



LANGUAGE  0x09,0x01

LANGUAGE  0, 0



#define RC_VERSION  CURL_VERSION_MAJOR, CURL_VERSION_MINOR, CURL_VERSION_PATCH, 0



VS_VERSION_INFO VERSIONINFO

  FILEVERSION     RC_VERSION

  PRODUCTVERSION  RC_VERSION

  FILEFLAGSMASK   0x3fL

  FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK

#if defined(DEBUGBUILD) || defined(_DEBUG)

  FILEFLAGS 1

  FILEFLAGS VS_FF_DEBUG

#else

  FILEFLAGS 0

  FILEFLAGS 0L

#endif

  FILEOS      VOS__WINDOWS32

  FILETYPE    VFT_APP

  FILESUBTYPE 0x0L

  FILESUBTYPE 0L



BEGIN

  BLOCK "StringFileInfo"