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

[fingolfin at users.sourceforge.net]

Revision: 43878
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43878&view=rev
Author:   fingolfin
Date:     2009-09-01 13:00:25 +0000 (Tue, 01 Sep 2009)

Log Message:
-----------
Fix new GUI tool on Mac OS X

Modified Paths:
--------------
    tools/branches/gsoc2009-gui/Makefile
    tools/branches/gsoc2009-gui/gui/main.cpp

Modified: tools/branches/gsoc2009-gui/Makefile
===================================================================
--- tools/branches/gsoc2009-gui/Makefile	2009-09-01 07:44:21 UTC (rev 43877)
+++ tools/branches/gsoc2009-gui/Makefile	2009-09-01 13:00:25 UTC (rev 43878)
@@ -90,9 +90,7 @@
 	mkdir -p $(bundle_name)/Contents/Resources
 	echo "APPL????" > $(bundle_name)/Contents/PkgInfo
 	cp $(srcdir)/dist/macosx/Info.plist $(bundle_name)/Contents/
-	cp $(srcdir)/gui/media/tile.gif $(bundle_name)/Contents/Resources
-	cp $(srcdir)/gui/media/logo.jpg $(bundle_name)/Contents/Resources
-	cp $(srcdir)/gui/media/scummvmtools.icns $(bundle_name)/Contents/Resources
+	cp $(srcdir)/gui/media/*.* $(bundle_name)/Contents/Resources
 	cp tools_gui$(EXEEXT) $(bundle_name)/Contents/MacOS/
 
 #compress_agos$(EXEEXT): compress_agos.o compress.o util.o tool.o

Modified: tools/branches/gsoc2009-gui/gui/main.cpp
===================================================================
--- tools/branches/gsoc2009-gui/gui/main.cpp	2009-09-01 07:44:21 UTC (rev 43877)
+++ tools/branches/gsoc2009-gui/gui/main.cpp	2009-09-01 13:00:25 UTC (rev 43878)
@@ -520,7 +520,7 @@
 		wxImage::AddHandler(new wxGIFHandler);
 
 	// Load image files
-#ifdef __WXWINDOWS__
+#ifdef __WXMSW__
 	// Windows likes subfolders for media files
 	_logo.LoadFile(wxT("media/") + logo, wxBITMAP_TYPE_JPEG);
 	_tile.LoadFile(wxT("media/") + tile, wxBITMAP_TYPE_GIF);


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