[Scummvm-cvs-logs] SF.net SVN: scummvm: [28041] scummex/branches/gsoc2007-gameresbrowser

[zbychs at users.sourceforge.net]

Revision: 28041
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28041&view=rev
Author:   zbychs
Date:     2007-07-11 23:36:53 -0700 (Wed, 11 Jul 2007)

Log Message:
-----------
Plugins work under Win and Linux

Modified Paths:
--------------
    scummex/branches/gsoc2007-gameresbrowser/gcc/Makefile
    scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummBlockInfoPresenter.cpp

Modified: scummex/branches/gsoc2007-gameresbrowser/gcc/Makefile
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/gcc/Makefile	2007-07-12 06:06:08 UTC (rev 28040)
+++ scummex/branches/gsoc2007-gameresbrowser/gcc/Makefile	2007-07-12 06:36:53 UTC (rev 28041)
@@ -13,7 +13,7 @@
 	    dirs
 
 
-all: tell browserapp basic copy_so copy_data
+all: tell browserapp basic scumm copy_so copy_data
 
 ###########################################################################################
 
@@ -26,11 +26,10 @@
 CORE_DIR = $(SOURCES_DIR)/core
 BROWSER_DIR = $(SOURCES_DIR)/browser
 BASIC_DIR = $(SOURCES_DIR)/plugins/basic
-#SCUMM_DIR = $(SOURCES_DIR)/plugins/scumm
-SCUMM_DIR = 
+SCUMM_DIR = $(SOURCES_DIR)/plugins/scumm
 BROWSERAPP_DIR = $(SOURCES_DIR)/browserapp
 
-ALL_DIRS = $(CORE_DIR) $(BROWSER_DIR) $(BASIC_DIR) $(SCUMM_DIR) $(BROWSERAPP_DIR) 
+ALL_DIRS = $(CORE_DIR) $(BROWSER_DIR) $(SOURCES_DIR)/plugins $(BASIC_DIR) $(SCUMM_DIR) $(BROWSERAPP_DIR) 
 
 #VPATH = $(CORE_DIR):$(BROWSER_DIR):$(BASIC_DIR):$(SCUMM_DIR):$(BROWSERAPP_DIR) 
 
@@ -155,7 +154,7 @@
 #	cp mac/res/* GameResourceBrowser.app/Contents/Resources/
 	cp -f -R $(SOURCES_DIR)/data GameResourceBrowser.app/Contents/Resources/data
 	cp -f -R $(SOURCES_DIR)/help GameResourceBrowser.app/Contents/Resources/help
-	cp -f -R $(SOURCES_DIR)/so/* GameResourceBrowser.app/Contents/PlugIns
+	cp -f -R $(SO_OUTPUT)/*.so GameResourceBrowser.app/Contents/PlugIns
 
 
 ###########################################################################################
@@ -202,7 +201,7 @@
 	cp -f -R $(CORE_TARGET) $(SO_OUTPUT)/lib$(CORE_LIB).so
 	cp -f -R $(BROWSER_TARGET) $(SO_OUTPUT)/lib$(BROWSER_LIB).so
 	cp -f -R $(BASIC_TARGET) $(SO_OUTPUT)/lib$(BASIC_LIB).so
-#	cp -f -R $(SCUMM_TARGET) $(SO_OUTPUT)/lib$(SCUMM_LIB).so
+	cp -f -R $(SCUMM_TARGET) $(SO_OUTPUT)/lib$(SCUMM_LIB).so
 
 ###########################################################################################
 

Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummBlockInfoPresenter.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummBlockInfoPresenter.cpp	2007-07-12 06:06:08 UTC (rev 28040)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummBlockInfoPresenter.cpp	2007-07-12 06:36:53 UTC (rev 28041)
@@ -136,7 +136,9 @@
 		_text << wxT("Description: ") << binfo->description << wxEndl();
 		_text << wxT("Help: ") << binfo->htmlfile << wxEndl();
 		_text << wxT("Icon: ") << binfo->iconid << wxEndl();
-		_url = PluginUtil::getResourcePath(toString(binfo->htmlfile));
+		_url = toString(binfo->htmlfile);
+		if (!_url.IsEmpty())
+		    _url = PluginUtil::getResourcePath(_url);
 	} else {
 		_text << wxT("Could not find block info.") << wxEndl();
 		_url = wxT("");


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