From 92d8320ac95acc388becb893fc18346fef0ead5d Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Thu, 28 Sep 2023 21:20:30 +0200 Subject: [PATCH] VisualC: remove VisualC/version.rc --- VisualC/Version.rc | 105 ------------------------------- VisualC/resource.h | 15 ----- build-scripts/test-versioning.sh | 2 +- src/version.rc | 2 +- 4 files changed, 2 insertions(+), 122 deletions(-) delete mode 100644 VisualC/Version.rc delete mode 100644 VisualC/resource.h diff --git a/VisualC/Version.rc b/VisualC/Version.rc deleted file mode 100644 index 383b1467..00000000 --- a/VisualC/Version.rc +++ /dev/null @@ -1,105 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "winresrc.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifndef _MAC -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,0,0,0 - PRODUCTVERSION 3,0,0,0 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "CompanyName", "\0" - VALUE "FileDescription", "SDL_image\0" - VALUE "FileVersion", "3, 0, 0, 0\0" - VALUE "InternalName", "SDL_image\0" - VALUE "LegalCopyright", "Copyright (C) 2023 Sam Lantinga\0" - VALUE "OriginalFilename", "SDL_image.dll\0" - VALUE "ProductName", "Simple DirectMedia Layer\0" - VALUE "ProductVersion", "3, 0, 0, 0\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -#endif // !_MAC - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/VisualC/resource.h b/VisualC/resource.h deleted file mode 100644 index 7c822cff..00000000 --- a/VisualC/resource.h +++ /dev/null @@ -1,15 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Developer Studio generated include file. -// Used by Version.rc -// - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 101 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1000 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/build-scripts/test-versioning.sh b/build-scripts/test-versioning.sh index 17b52814..66a25494 100755 --- a/build-scripts/test-versioning.sh +++ b/build-scripts/test-versioning.sh @@ -41,7 +41,7 @@ else not_ok "CMakeLists.txt $version disagrees with SDL_image.h $ref_version" fi -for rcfile in src/version.rc VisualC/Version.rc; do +for rcfile in src/version.rc; do tuple=$(sed -ne 's/^ *FILEVERSION *//p' "$rcfile" | tr -d '\r') ref_tuple="${ref_major},${ref_minor},${ref_micro},0" diff --git a/src/version.rc b/src/version.rc index 6525d54d..8c4fb85f 100644 --- a/src/version.rc +++ b/src/version.rc @@ -26,7 +26,7 @@ BEGIN VALUE "FileVersion", "3, 0, 0, 0\0" VALUE "InternalName", "SDL_image\0" VALUE "LegalCopyright", "Copyright (C) 2023 Sam Lantinga\0" - VALUE "OriginalFilename", "SDL_image.dll\0" + VALUE "OriginalFilename", "SDL3_image.dll\0" VALUE "ProductName", "Simple DirectMedia Layer\0" VALUE "ProductVersion", "3, 0, 0, 0\0" END