[Scummvm-cvs-logs] SF.net SVN: scummvm:[46241] tools/branches/gsoc2009-gui/dist/msvc9
strangerke at users.sourceforge.net
strangerke at users.sourceforge.net
Wed Dec 2 22:33:59 CET 2009
Revision: 46241
http://scummvm.svn.sourceforge.net/scummvm/?rev=46241&view=rev
Author: strangerke
Date: 2009-12-02 21:33:59 +0000 (Wed, 02 Dec 2009)
Log Message:
-----------
Gsoc Tools - Fix compiling of toolscli under MSVC9
Modified Paths:
--------------
tools/branches/gsoc2009-gui/dist/msvc9/toolscli.rc
tools/branches/gsoc2009-gui/dist/msvc9/toolscli.vcproj
Modified: tools/branches/gsoc2009-gui/dist/msvc9/toolscli.rc
===================================================================
--- tools/branches/gsoc2009-gui/dist/msvc9/toolscli.rc 2009-12-02 21:30:43 UTC (rev 46240)
+++ tools/branches/gsoc2009-gui/dist/msvc9/toolscli.rc 2009-12-02 21:33:59 UTC (rev 46241)
@@ -2,22 +2,22 @@
//
#include "resource_cli.h"
-#define APSTUDIO_READONLY_SYMBOLS
+//#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
-#include "afxres.h"
+//#include "afxres.h"
/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
+//#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
+//LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
@@ -54,13 +54,13 @@
// 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"
+IDI_ICON1 ICON DISCARDABLE "../../gui/media/scummvmtools.ico"
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
-#ifndef APSTUDIO_INVOKED
+//#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
@@ -68,5 +68,5 @@
/////////////////////////////////////////////////////////////////////////////
-#endif // not APSTUDIO_INVOKED
+//#endif // not APSTUDIO_INVOKED
Modified: tools/branches/gsoc2009-gui/dist/msvc9/toolscli.vcproj
===================================================================
--- tools/branches/gsoc2009-gui/dist/msvc9/toolscli.vcproj 2009-12-02 21:30:43 UTC (rev 46240)
+++ tools/branches/gsoc2009-gui/dist/msvc9/toolscli.vcproj 2009-12-02 21:33:59 UTC (rev 46241)
@@ -60,7 +60,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="zlib.lib libpng.lib ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib"
+ AdditionalDependencies="zlib.lib libpng.lib libogg_static.lib libvorbis_static.lib libvorbisenc_static.lib libFLAC_static.lib"
LinkIncremental="2"
IgnoreDefaultLibraryNames="LIBCMT;MSVCRT"
GenerateDebugInformation="true"
@@ -134,7 +134,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="zlib.lib ogg_static.lib vorbis_static.lib vorbisenc_static.lib libFLAC_static.lib comctl32.lib Rpcrt4.lib"
+ AdditionalDependencies="zlib.lib libogg_static.lib libvorbis_static.lib libvorbisenc_static.lib libFLAC_static.lib comctl32.lib Rpcrt4.lib"
LinkIncremental="1"
IgnoreDefaultLibraryNames="LIBCMT"
GenerateDebugInformation="true"
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