[Scummvm-cvs-logs] SF.net SVN: scummvm:[43317] tools/branches/gsoc2009-gui

Remere at users.sourceforge.net Remere at users.sourceforge.net
Wed Aug 12 15:59:11 CEST 2009


Revision: 43317
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43317&view=rev
Author:   Remere
Date:     2009-08-12 13:59:11 +0000 (Wed, 12 Aug 2009)

Log Message:
-----------
*Added icon (merged ScummVM 'S' icon with GPL tool icon from wikipedia).

Modified Paths:
--------------
    tools/branches/gsoc2009-gui/dist/msvc9/toolscli.vcproj
    tools/branches/gsoc2009-gui/dist/msvc9/toolsgui.vcproj

Added Paths:
-----------
    tools/branches/gsoc2009-gui/dist/msvc9/resource_cli.h
    tools/branches/gsoc2009-gui/dist/msvc9/resource_gui.h
    tools/branches/gsoc2009-gui/dist/msvc9/toolscli.rc
    tools/branches/gsoc2009-gui/dist/msvc9/toolsgui.rc
    tools/branches/gsoc2009-gui/gui/media/scummvmtools.ico
    tools/branches/gsoc2009-gui/gui/media/scummvmtools_128.png

Added: tools/branches/gsoc2009-gui/dist/msvc9/resource_cli.h
===================================================================
--- tools/branches/gsoc2009-gui/dist/msvc9/resource_cli.h	                        (rev 0)
+++ tools/branches/gsoc2009-gui/dist/msvc9/resource_cli.h	2009-08-12 13:59:11 UTC (rev 43317)
@@ -0,0 +1,16 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by toolscli.rc
+//
+#define IDI_ICON1                       101
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        102
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif


Property changes on: tools/branches/gsoc2009-gui/dist/msvc9/resource_cli.h
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Added: tools/branches/gsoc2009-gui/dist/msvc9/resource_gui.h
===================================================================
--- tools/branches/gsoc2009-gui/dist/msvc9/resource_gui.h	                        (rev 0)
+++ tools/branches/gsoc2009-gui/dist/msvc9/resource_gui.h	2009-08-12 13:59:11 UTC (rev 43317)
@@ -0,0 +1,16 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by toolsgui.rc
+//
+#define IDI_ICON1                       101
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        102
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif


Property changes on: tools/branches/gsoc2009-gui/dist/msvc9/resource_gui.h
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Added: tools/branches/gsoc2009-gui/dist/msvc9/toolscli.rc
===================================================================
--- tools/branches/gsoc2009-gui/dist/msvc9/toolscli.rc	                        (rev 0)
+++ tools/branches/gsoc2009-gui/dist/msvc9/toolscli.rc	2009-08-12 13:59:11 UTC (rev 43317)
@@ -0,0 +1,72 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource_cli.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.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
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource_cli.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON1               ICON                    "F:\\Projects\\scummvm\\tools\\branches\\gsoc2009-gui\\gui\\media\\scummvmtools.ico"
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+


Property changes on: tools/branches/gsoc2009-gui/dist/msvc9/toolscli.rc
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Modified: tools/branches/gsoc2009-gui/dist/msvc9/toolscli.vcproj
===================================================================
--- tools/branches/gsoc2009-gui/dist/msvc9/toolscli.vcproj	2009-08-12 09:26:00 UTC (rev 43316)
+++ tools/branches/gsoc2009-gui/dist/msvc9/toolscli.vcproj	2009-08-12 13:59:11 UTC (rev 43317)
@@ -134,7 +134,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="zlib.lib ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib comctl32.lib Rpcrt4.lib"
 				LinkIncremental="1"
+				IgnoreDefaultLibraryNames="LIBCMT"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
@@ -525,6 +527,18 @@
 				>
 			</File>
 		</Filter>
+		<File
+			RelativePath=".\resource_cli.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\gui\media\scummvmtools.ico"
+			>
+		</File>
+		<File
+			RelativePath=".\toolscli.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>

Added: tools/branches/gsoc2009-gui/dist/msvc9/toolsgui.rc
===================================================================
--- tools/branches/gsoc2009-gui/dist/msvc9/toolsgui.rc	                        (rev 0)
+++ tools/branches/gsoc2009-gui/dist/msvc9/toolsgui.rc	2009-08-12 13:59:11 UTC (rev 43317)
@@ -0,0 +1,72 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource_gui.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.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
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource_gui.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON1               ICON                    "F:\\Projects\\scummvm\\tools\\branches\\gsoc2009-gui\\gui\\media\\scummvmtools.ico"
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+


Property changes on: tools/branches/gsoc2009-gui/dist/msvc9/toolsgui.rc
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Modified: tools/branches/gsoc2009-gui/dist/msvc9/toolsgui.vcproj
===================================================================
--- tools/branches/gsoc2009-gui/dist/msvc9/toolsgui.vcproj	2009-08-12 09:26:00 UTC (rev 43316)
+++ tools/branches/gsoc2009-gui/dist/msvc9/toolsgui.vcproj	2009-08-12 13:59:11 UTC (rev 43317)
@@ -127,6 +127,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="zlib.lib ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib comctl32.lib Rpcrt4.lib"
+				IgnoreDefaultLibraryNames="LIBCMT"
 				GenerateDebugInformation="true"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -526,6 +528,18 @@
 				>
 			</File>
 		</Filter>
+		<File
+			RelativePath=".\resource_gui.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\gui\media\scummvmtools.ico"
+			>
+		</File>
+		<File
+			RelativePath=".\toolsgui.rc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>

Added: tools/branches/gsoc2009-gui/gui/media/scummvmtools.ico
===================================================================
(Binary files differ)


Property changes on: tools/branches/gsoc2009-gui/gui/media/scummvmtools.ico
___________________________________________________________________
Added: svn:mime-type
   + image/x-icon

Added: tools/branches/gsoc2009-gui/gui/media/scummvmtools_128.png
===================================================================
(Binary files differ)


Property changes on: tools/branches/gsoc2009-gui/gui/media/scummvmtools_128.png
___________________________________________________________________
Added: svn:mime-type
   + image/png


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list