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

[aquadran at users.sourceforge.net]

Revision: 32717
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32717&view=rev
Author:   aquadran
Date:     2008-06-15 23:41:23 -0700 (Sun, 15 Jun 2008)

Log Message:
-----------
enabled support for icons

Modified Paths:
--------------
    residual/trunk/configure
    residual/trunk/dists/residual.rc
    residual/trunk/dists/residual.rc.in
    residual/trunk/ports.mk

Modified: residual/trunk/configure
===================================================================
--- residual/trunk/configure	2008-06-16 06:35:50 UTC (rev 32716)
+++ residual/trunk/configure	2008-06-16 06:41:23 UTC (rev 32717)
@@ -722,7 +722,7 @@
 	cygwin*)
 		DEFINES="$DEFINES -mno-cygwin -DWIN32"
 		LIBS="$LIBS -mno-cygwin -lmingw32 -lopengl32 -lglu32"
-		#OBJS="$OBJS residualico.o"
+		OBJS="$OBJS residualico.o"
 		;;
 	os2-emx*)
 		DEFINES="$DEFINES -DUNIX"

Modified: residual/trunk/dists/residual.rc
===================================================================
--- residual/trunk/dists/residual.rc	2008-06-16 06:35:50 UTC (rev 32716)
+++ residual/trunk/dists/residual.rc	2008-06-16 06:41:23 UTC (rev 32717)
@@ -1,9 +1,9 @@
 #include "winresrc.h"
 
 #if defined (__MINGW32__) || defined(__CYGWIN32__)
-//IDI_ICON               ICON    DISCARDABLE     "icons/residual.ico"
+IDI_ICON               ICON    DISCARDABLE     "icons/residual.ico"
 #else
-//IDI_ICON               ICON    DISCARDABLE     "../../icons/residual.ico"
+IDI_ICON               ICON    DISCARDABLE     "../../icons/residual.ico"
 #endif
 
 VS_VERSION_INFO VERSIONINFO

Modified: residual/trunk/dists/residual.rc.in
===================================================================
--- residual/trunk/dists/residual.rc.in	2008-06-16 06:35:50 UTC (rev 32716)
+++ residual/trunk/dists/residual.rc.in	2008-06-16 06:41:23 UTC (rev 32717)
@@ -1,9 +1,9 @@
 #include "winresrc.h"
 
 #if defined (__MINGW32__) || defined(__CYGWIN32__)
-//IDI_ICON               ICON    DISCARDABLE     "icons/residual.ico"
+IDI_ICON               ICON    DISCARDABLE     "icons/residual.ico"
 #else
-//IDI_ICON               ICON    DISCARDABLE     "../../icons/residual.ico"
+IDI_ICON               ICON    DISCARDABLE     "../../icons/residual.ico"
 #endif
 
 VS_VERSION_INFO VERSIONINFO

Modified: residual/trunk/ports.mk
===================================================================
--- residual/trunk/ports.mk	2008-06-16 06:35:50 UTC (rev 32716)
+++ residual/trunk/ports.mk	2008-06-16 06:41:23 UTC (rev 32717)
@@ -132,7 +132,7 @@
 # Windows specific
 #
 
-residualico.o: 
+residualico.o: $(srcdir)/icons/residual.ico
 	$(WINDRES) -I$(srcdir) $(srcdir)/dists/residual.rc residualico.o
 
 # Special target to create a win32 snapshot binary


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