From 78cc6e4eadc4a0866c9a8319b0b7ff6faaa9e7a7 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Fri, 14 Apr 2006 01:01:43 +0000
Subject: Finish cleanup of root directory. Now move scummvm.rc to dists/
svn-id: r21860
---
dists/devcpp/scummvm.dev | 2 +-
dists/msvc6/scummvm.dsp | 2 +-
dists/msvc7/scummvm.vcproj | 2 +-
dists/msvc71/scummvm.vcproj | 2 +-
dists/msvc8/scummvm.vcproj | 2 +-
dists/scummvm.rc | 37 +++++++++++++++++++++++++++++++++++++
dists/scummvm.rc.in | 37 +++++++++++++++++++++++++++++++++++++
scummvm.rc | 37 -------------------------------------
scummvm.rc.in | 37 -------------------------------------
tools/update-version.pl | 2 +-
10 files changed, 80 insertions(+), 80 deletions(-)
create mode 100644 dists/scummvm.rc
create mode 100644 dists/scummvm.rc.in
delete mode 100644 scummvm.rc
delete mode 100644 scummvm.rc.in
diff --git a/dists/devcpp/scummvm.dev b/dists/devcpp/scummvm.dev
index f8cdb45536..a30c95b5af 100644
--- a/dists/devcpp/scummvm.dev
+++ b/dists/devcpp/scummvm.dev
@@ -1600,7 +1600,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit163]
-FileName=..\..\scummvm.rc
+FileName=..\..\dists\scummvm.rc
CompileCpp=1
Folder=Resources
Compile=1
diff --git a/dists/msvc6/scummvm.dsp b/dists/msvc6/scummvm.dsp
index b04886b2fa..b543edf893 100644
--- a/dists/msvc6/scummvm.dsp
+++ b/dists/msvc6/scummvm.dsp
@@ -645,7 +645,7 @@ SOURCE=..\..\icons\scummvm.ico
# End Source File
# Begin Source File
-SOURCE=..\..\scummvm.rc
+SOURCE=..\..\dists\scummvm.rc
# End Source File
# End Target
# End Project
diff --git a/dists/msvc7/scummvm.vcproj b/dists/msvc7/scummvm.vcproj
index c323a3f4f5..5e90070bad 100644
--- a/dists/msvc7/scummvm.vcproj
+++ b/dists/msvc7/scummvm.vcproj
@@ -449,7 +449,7 @@
RelativePath="..\..\icons\scummvm.ico">
+ RelativePath="..\..\dists\scummvm.rc">
+ RelativePath="..\..\dists\scummvm.rc">
diff --git a/dists/scummvm.rc b/dists/scummvm.rc
new file mode 100644
index 0000000000..a18e4bd76f
--- /dev/null
+++ b/dists/scummvm.rc
@@ -0,0 +1,37 @@
+#include "winresrc.h"
+
+IDI_ICON ICON DISCARDABLE "icons/scummvm.ico"
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 0,9,0,0
+ PRODUCTVERSION 0,9,0,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904b0"
+ BEGIN
+ VALUE "Comments", "Look! A three headed monkey (TM)! .. Nice use of the TM!\0"
+ VALUE "FileDescription", "http://www.scummvm.org/\0"
+ VALUE "FileVersion", "0.9.0svn\0"
+ VALUE "InternalName", "scummvm\0"
+ VALUE "LegalCopyright", "Copyright © 2001-2006 The ScummVM Team\0"
+ VALUE "LegalTrademarks", "'SCUMM', and all SCUMM games are a TM of LucasArts. Simon The Sorcerer is a TM of AdventureSoft. Beneath a Steel Sky and Broken Sword are a TM of Revolution. Flight of the Amazon Queen is a TM of John Passfield and Steve Stamatiadis. \0"
+ VALUE "OriginalFilename", "scummvm.exe\0"
+ VALUE "ProductName", "ScummVM\0"
+ VALUE "ProductVersion", "0.9.0svn\0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
diff --git a/dists/scummvm.rc.in b/dists/scummvm.rc.in
new file mode 100644
index 0000000000..6cc4818be0
--- /dev/null
+++ b/dists/scummvm.rc.in
@@ -0,0 +1,37 @@
+#include "winresrc.h"
+
+IDI_ICON ICON DISCARDABLE "icons/scummvm.ico"
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION @VER_MAJOR@,@VER_MINOR@,@VER_PATCH@,0
+ PRODUCTVERSION @VER_MAJOR@,@VER_MINOR@,@VER_PATCH@,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904b0"
+ BEGIN
+ VALUE "Comments", "Look! A three headed monkey (TM)! .. Nice use of the TM!\0"
+ VALUE "FileDescription", "http://www.scummvm.org/\0"
+ VALUE "FileVersion", "@VERSION@\0"
+ VALUE "InternalName", "scummvm\0"
+ VALUE "LegalCopyright", "Copyright © 2001-2005 The ScummVM Team\0"
+ VALUE "LegalTrademarks", "'SCUMM', and all SCUMM games are a TM of LucasArts. Simon The Sorcerer is a TM of AdventureSoft. Beneath a Steel Sky and Broken Sword are a TM of Revolution. Flight of the Amazon Queen is a TM of John Passfield and Steve Stamatiadis. \0"
+ VALUE "OriginalFilename", "scummvm.exe\0"
+ VALUE "ProductName", "ScummVM\0"
+ VALUE "ProductVersion", "@VERSION@\0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
diff --git a/scummvm.rc b/scummvm.rc
deleted file mode 100644
index a18e4bd76f..0000000000
--- a/scummvm.rc
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "winresrc.h"
-
-IDI_ICON ICON DISCARDABLE "icons/scummvm.ico"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,9,0,0
- PRODUCTVERSION 0,9,0,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "Comments", "Look! A three headed monkey (TM)! .. Nice use of the TM!\0"
- VALUE "FileDescription", "http://www.scummvm.org/\0"
- VALUE "FileVersion", "0.9.0svn\0"
- VALUE "InternalName", "scummvm\0"
- VALUE "LegalCopyright", "Copyright © 2001-2006 The ScummVM Team\0"
- VALUE "LegalTrademarks", "'SCUMM', and all SCUMM games are a TM of LucasArts. Simon The Sorcerer is a TM of AdventureSoft. Beneath a Steel Sky and Broken Sword are a TM of Revolution. Flight of the Amazon Queen is a TM of John Passfield and Steve Stamatiadis. \0"
- VALUE "OriginalFilename", "scummvm.exe\0"
- VALUE "ProductName", "ScummVM\0"
- VALUE "ProductVersion", "0.9.0svn\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
diff --git a/scummvm.rc.in b/scummvm.rc.in
deleted file mode 100644
index 6cc4818be0..0000000000
--- a/scummvm.rc.in
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "winresrc.h"
-
-IDI_ICON ICON DISCARDABLE "icons/scummvm.ico"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION @VER_MAJOR@,@VER_MINOR@,@VER_PATCH@,0
- PRODUCTVERSION @VER_MAJOR@,@VER_MINOR@,@VER_PATCH@,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "Comments", "Look! A three headed monkey (TM)! .. Nice use of the TM!\0"
- VALUE "FileDescription", "http://www.scummvm.org/\0"
- VALUE "FileVersion", "@VERSION@\0"
- VALUE "InternalName", "scummvm\0"
- VALUE "LegalCopyright", "Copyright © 2001-2005 The ScummVM Team\0"
- VALUE "LegalTrademarks", "'SCUMM', and all SCUMM games are a TM of LucasArts. Simon The Sorcerer is a TM of AdventureSoft. Beneath a Steel Sky and Broken Sword are a TM of Revolution. Flight of the Amazon Queen is a TM of John Passfield and Steve Stamatiadis. \0"
- VALUE "OriginalFilename", "scummvm.exe\0"
- VALUE "ProductName", "ScummVM\0"
- VALUE "ProductVersion", "@VERSION@\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
diff --git a/tools/update-version.pl b/tools/update-version.pl
index 8d20ef84ba..7787fb905b 100755
--- a/tools/update-version.pl
+++ b/tools/update-version.pl
@@ -31,10 +31,10 @@ print "Setting version to '$VERSION'\n";
# List of the files in which we need to perform substitution.
my @subs_files = qw(
- scummvm.rc
base/internal_version.h
dists/macosx/Info.plist
dists/redhat/scummvm.spec
+ dists/scummvm.rc
);
# The following files also contain version data and should possible be modified
--
cgit v1.2.3