yade-dev team mailing list archive

[eudoxos at BerliOS <eudoxos@xxxxxxxxxxxxxxx>]

Author: eudoxos
Date: 2009-07-29 22:05:42 +0200 (Wed, 29 Jul 2009)
New Revision: 1904

Modified:
   trunk/gui/SConscript
   trunk/gui/qt3/QtGUI.cpp
   trunk/gui/qt3/QtSimulationPlayer.hpp
Log:
1. Fix for https://bugs.launchpad.net/yade/+bug/406343 (at least for me)


Modified: trunk/gui/SConscript
===================================================================
--- trunk/gui/SConscript	2009-07-29 15:50:47 UTC (rev 1903)
+++ trunk/gui/SConscript	2009-07-29 20:05:42 UTC (rev 1904)
@@ -9,18 +9,18 @@
 				'qt3/GLViewer.cpp',
 				'qt3/MessageDialog.cpp',
 				'qt3/QtFileGenerator.cpp',
-				'qt3/QtFileGeneratorController.ui',
 				'qt3/QtGUI.cpp',
 				'qt3/QtGUIPreferences.cpp',
-				'qt3/QtGeneratedMessageDialog.ui',
-				'qt3/QtGeneratedSimulationController.ui',
 				'qt3/SimulationController.cpp',
-				'qt3/YadeQtGeneratedMainWindow.ui',
 				'qt3/YadeQtMainWindow.cpp',
 				'qt3/YadeCamera.cpp',
 				'qt3/GLSimulationPlayerViewer.cpp',
+				'qt3/QtSimulationPlayer.cpp',
+				'qt3/QtGeneratedSimulationController.ui',
 				'qt3/QtGeneratedSimulationPlayer.ui',
-				'qt3/QtSimulationPlayer.cpp',
+				'qt3/QtGeneratedMessageDialog.ui',
+				'qt3/YadeQtGeneratedMainWindow.ui',
+				'qt3/QtFileGeneratorController.ui',
 				],
 			LIBS=(['PythonUI'] if 'YADE_PYTHON' in env['CPPDEFINES'] else [])+[
 				'yade-serialization-qt',
@@ -30,6 +30,12 @@
 		),
 		env.SharedLibrary('SnapshotEngine',['qt3/SnapshotEngine.cpp'],LIBS=env['LIBS']+['QtGUI','$QGLVIEWER_LIB'],CPPPATH=env['CPPPATH']+['qt3']),
 	])
+	###
+	### HACK that works around https://bugs.launchpad.net/yade/+bug/406343
+	### (not clear why scons is not picking up the dependency automatically, though)
+	###
+	gens=['$buildDir/gui/qt3/'+h for h in 'QtGeneratedSimulationController.h','QtGeneratedSimulationPlayer.h','QtGeneratedMessageDialog.h','YadeQtGeneratedMainWindow.h','QtFileGeneratorController.h']
+	env.Depends(['qt3/FileDialog.cpp','qt3/GLViewer.cpp','qt3/MessageDialog.cpp','qt3/QtFileGenerator.cpp','qt3/QtGUI.cpp','qt3/QtGUIPreferences.cpp','qt3/SimulationController.cpp','qt3/YadeQtMainWindow.cpp','qt3/YadeCamera.cpp','qt3/GLSimulationPlayerViewer.cpp','qt3/QtSimulationPlayer.cpp'],gens)
 
 import os.path
 

Modified: trunk/gui/qt3/QtGUI.cpp
===================================================================
--- trunk/gui/qt3/QtGUI.cpp	2009-07-29 15:50:47 UTC (rev 1903)
+++ trunk/gui/qt3/QtGUI.cpp	2009-07-29 20:05:42 UTC (rev 1904)
@@ -7,19 +7,19 @@
 *************************************************************************/
 
 #include"QtGUI.hpp"
-#include"YadeQtMainWindow.hpp"
-#include"GLViewer.hpp"
+#include<yade/gui-qt3/YadeQtMainWindow.hpp>
+#include<yade/gui-qt3/GLViewer.hpp>
 #include<boost/algorithm/string.hpp>
 #include<boost/bind.hpp>
-#include <boost/filesystem/operations.hpp>
-#include <boost/filesystem/convenience.hpp>
+#include<boost/filesystem/operations.hpp>
+#include<boost/filesystem/convenience.hpp>
 //#ifdef HAVE_CONFIG_H
 //	#include <config.h>
 //#endif
 //#ifdef Q_WS_X11
-	#include <X11/Xlib.h>
+	#include<X11/Xlib.h>
 //#endif
-#include <qapplication.h>
+#include<qapplication.h>
 
 #ifdef YADE_PYTHON
 	#include<yade/gui-py/PythonUI.hpp>

Modified: trunk/gui/qt3/QtSimulationPlayer.hpp
===================================================================
--- trunk/gui/qt3/QtSimulationPlayer.hpp	2009-07-29 15:50:47 UTC (rev 1903)
+++ trunk/gui/qt3/QtSimulationPlayer.hpp	2009-07-29 20:05:42 UTC (rev 1904)
@@ -11,7 +11,7 @@
 #include<yade/core/Omega.hpp>
 #include<yade/lib-factory/Factorable.hpp>
 #include<yade/lib-serialization-qt/QtGUIGenerator.hpp>
-#include <QtGeneratedSimulationPlayer.h>
+#include"QtGeneratedSimulationPlayer.h"
 #include<qlayout.h>
 #include<qframe.h>
 #include<qscrollview.h>