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

[zbychs at users.sourceforge.net]

Revision: 27894
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27894&view=rev
Author:   zbychs
Date:     2007-07-03 19:50:15 -0700 (Tue, 03 Jul 2007)

Log Message:
-----------
More Linux compatibility - still problems.

Modified Paths:
--------------
    scummex/branches/gsoc2007-gameresbrowser/gcc/Makefile
    scummex/branches/gsoc2007-gameresbrowser/src/gui/DirectoryPresenter.cpp
    scummex/branches/gsoc2007-gameresbrowser/src/plugins/Directories.cpp
    scummex/branches/gsoc2007-gameresbrowser/src/plugins/GUIIntf.cpp

Modified: scummex/branches/gsoc2007-gameresbrowser/gcc/Makefile
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/gcc/Makefile	2007-07-04 02:28:24 UTC (rev 27893)
+++ scummex/branches/gsoc2007-gameresbrowser/gcc/Makefile	2007-07-04 02:50:15 UTC (rev 27894)
@@ -142,10 +142,10 @@
 
 gui: gui_dir $(GUI_TARGET)
 
-HACK_OBJ = $(CORE_OUTPUT)/CoreFileTypes.o
+HACK_OBJS = $(CORE_OUTPUT)/CoreFileTypes.o $(CORE_OUTPUT)/CoreIntf.o 
 
 $(GUI_TARGET): $(GUI_OBJECTS) core plugins
-	g++ $(CFLAGS) -o $@ $(GUI_OBJECTS) $(HACK_OBJ) $(WX_LIBS) -L$(CORE_OUTPUT) -L$(PLUGINS_OUTPUT) -l$(CORE_LIB) -l$(PLUGINS_LIB)
+	g++ $(CFLAGS) -o $@ $(GUI_OBJECTS) $(HACK_OBJS) $(WX_LIBS) -L$(CORE_OUTPUT) -L$(PLUGINS_OUTPUT) -l$(CORE_LIB) -l$(PLUGINS_LIB)
 
 ###########################################################################################
 

Modified: scummex/branches/gsoc2007-gameresbrowser/src/gui/DirectoryPresenter.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/gui/DirectoryPresenter.cpp	2007-07-04 02:28:24 UTC (rev 27893)
+++ scummex/branches/gsoc2007-gameresbrowser/src/gui/DirectoryPresenter.cpp	2007-07-04 02:50:15 UTC (rev 27894)
@@ -60,7 +60,10 @@
 
 	//is this in the right place? after the kids unrealisation? probably.
 	VirtualNode* node = _inodeprovider->getNode();
-	ExplorationTree::_getTree()->DeleteChildren( node->getTreeItem() );
+	if ( ! node->getTreeItem().IsOk() )
+		std::cout << "ERROR: DirectoryPresenter::unrealize(): bad tree item." << std::endl;
+	else
+		ExplorationTree::_getTree()->DeleteChildren( node->getTreeItem() );
 
 	_directorySlot->releaseInterface();
 	_nodeSlot->releaseInterface();

Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/Directories.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/Directories.cpp	2007-07-04 02:28:24 UTC (rev 27893)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/Directories.cpp	2007-07-04 02:50:15 UTC (rev 27894)
@@ -168,15 +168,18 @@
 #else
 	#ifndef _DIRENT_HAVE_D_TYPE
 		#error Must have dirent.d_type field.
+		%^*&()(
 	#endif
 
 	DIR *DirectoryPointer;
 	DirectoryPointer = opendir( _directoryPath.c_str() );
 	while(true) {
-		dirent* dp = readdir(DirectoryPointer)
+		dirent* dp = readdir(DirectoryPointer);
 		if (dp == NULL)
 			break;
 		std::string fullpath = _directoryPath + NATIVE_SLASH + dp->d_name;
+		std::cout << "IDiskDirectoryImpl::create(): d_name " << dp->d_name << std::endl;
+		std::cout << "IDiskDirectoryImpl::create(): d_type " << (int)(dp->d_type) << " DT_REG = " << DT_REG << " DT_DIR = " << DT_DIR << std::endl;
 		if (dp->d_type == DT_DIR)
 			addSubDir(dp->d_name, fullpath);
 		else

Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/GUIIntf.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/GUIIntf.cpp	2007-07-04 02:28:24 UTC (rev 27893)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/GUIIntf.cpp	2007-07-04 02:50:15 UTC (rev 27894)
@@ -7,6 +7,8 @@
 
 #include <iostream>
 
+#include <wx/image.h>
+
 #include "debugmem.h"
 
 namespace Browser {


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