[Scummvm-cvs-logs] SF.net SVN: scummvm: [29700] scummvm/trunk

[knakos at users.sourceforge.net]

Revision: 29700
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29700&view=rev
Author:   knakos
Date:     2007-12-02 04:08:45 -0800 (Sun, 02 Dec 2007)

Log Message:
-----------
fixes for cygwin build

Modified Paths:
--------------
    scummvm/trunk/backends/plugins/win32/win32-provider.cpp
    scummvm/trunk/dists/scummvm.rc

Modified: scummvm/trunk/backends/plugins/win32/win32-provider.cpp
===================================================================
--- scummvm/trunk/backends/plugins/win32/win32-provider.cpp	2007-12-02 11:49:29 UTC (rev 29699)
+++ scummvm/trunk/backends/plugins/win32/win32-provider.cpp	2007-12-02 12:08:45 UTC (rev 29700)
@@ -86,10 +86,10 @@
 		#endif
 	
 		if (!_dlHandle) {
-			debug("Failed loading plugin '%s' (error code %d)", _filename.c_str(), GetLastError());
+			debug("Failed loading plugin '%s' (error code %d)", _filename.c_str(), (int32) GetLastError());
 			return false;
 		} else {
-			debug(1, "Success loading plugin '%s', handle %08X", _filename.c_str(), _dlHandle);
+			debug(1, "Success loading plugin '%s', handle %08X", _filename.c_str(), (uint32) _dlHandle);
 		}
 
 		return DynamicPlugin::loadPlugin();

Modified: scummvm/trunk/dists/scummvm.rc
===================================================================
--- scummvm/trunk/dists/scummvm.rc	2007-12-02 11:49:29 UTC (rev 29699)
+++ scummvm/trunk/dists/scummvm.rc	2007-12-02 12:08:45 UTC (rev 29700)
@@ -1,6 +1,6 @@
 #include "winresrc.h"
 
-#if defined (__MINGW32__)
+#if defined (__MINGW32__) || defined(__CYGWIN32__)
 IDI_ICON               ICON    DISCARDABLE     "icons/scummvm.ico"
 #else
 IDI_ICON               ICON    DISCARDABLE     "../../icons/scummvm.ico"


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