summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Lantinga <slouken@libsdl.org>2012-01-21 12:06:51 -0500
committerSam Lantinga <slouken@libsdl.org>2012-01-21 12:06:51 -0500
commitf9bf4f3370faafc9c180b21fb68a38ff69297edd (patch)
treedcdc2f6c92b5f1c736375386af631def1a6f2a55
parent4b94656bc755af30f52ac9eeb87731bd34db717b (diff)
downloadsdl-f9bf4f3370faafc9c180b21fb68a38ff69297edd.tar.gz
Added the correct version.rc to the Visual Studio build.
-rw-r--r--VisualC/SDL/SDL.vcproj4
-rw-r--r--VisualC/SDL/Version.rc105
-rw-r--r--src/main/win32/version.rc10
3 files changed, 9 insertions, 110 deletions
diff --git a/VisualC/SDL/SDL.vcproj b/VisualC/SDL/SDL.vcproj
index 0cdcd96e1..c4b3ca976 100644
--- a/VisualC/SDL/SDL.vcproj
+++ b/VisualC/SDL/SDL.vcproj
@@ -819,6 +819,10 @@
>
</File>
<File
+ RelativePath="..\..\src\main\win32\version.rc"
+ >
+ </File>
+ <File
RelativePath="..\..\src\video\wincommon\Wmmsg.h"
>
</File>
diff --git a/VisualC/SDL/Version.rc b/VisualC/SDL/Version.rc
deleted file mode 100644
index 0e729dd19..000000000
--- a/VisualC/SDL/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 1,2,15,0
- PRODUCTVERSION 1,2,15,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\0"
- VALUE "FileVersion", "1, 2, 15, 0\0"
- VALUE "InternalName", "SDL\0"
- VALUE "LegalCopyright", "Copyright © 2012 Sam Lantinga\0"
- VALUE "OriginalFilename", "SDL.dll\0"
- VALUE "ProductName", "Simple DirectMedia Layer\0"
- VALUE "ProductVersion", "1, 2, 15, 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/src/main/win32/version.rc b/src/main/win32/version.rc
index 16921cee3..c9bd333cf 100644
--- a/src/main/win32/version.rc
+++ b/src/main/win32/version.rc
@@ -9,8 +9,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,2,14,0
- PRODUCTVERSION 1,2,14,0
+ FILEVERSION 1,2,15,0
+ PRODUCTVERSION 1,2,15,0
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS 0x40004L
@@ -23,12 +23,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "\0"
VALUE "FileDescription", "SDL\0"
- VALUE "FileVersion", "1, 2, 14, 0\0"
+ VALUE "FileVersion", "1, 2, 15, 0\0"
VALUE "InternalName", "SDL\0"
- VALUE "LegalCopyright", "Copyright © 2009 Sam Lantinga\0"
+ VALUE "LegalCopyright", "Copyright © 2012 Sam Lantinga\0"
VALUE "OriginalFilename", "SDL.dll\0"
VALUE "ProductName", "Simple DirectMedia Layer\0"
- VALUE "ProductVersion", "1, 2, 14, 0\0"
+ VALUE "ProductVersion", "1, 2, 15, 0\0"
END
END
BLOCK "VarFileInfo"