Changeset 12

Timestamp:

12/29/09 00:22:48 (2 years ago)

Author:

nktug

Message:

Update code for Linux compatibility with OPENAL, PLSM and OGRENEWT
Add checking librairies but compilation is not tested

Location:

trunk

Files:

• SConstruct (modified) (9 diffs)
• include/dreamforge/GameSerializer.hh (modified) (1 diff)
• src/LevelEditor.cc (modified) (4 diffs)
• src/LevelEditor.hh (modified) (1 diff)
• src/ObjectEditor.cc (modified) (1 diff)
• src/Properties.hh (modified) (3 diffs)
• src/SConscript (modified) (1 diff)
• src/Workbench.cc (modified) (1 diff)
• src/Workbench.hh (modified) (3 diffs)
• src/dreamforge/GameObjectManager.cc (modified) (1 diff)
• src/treemodel.cpp (modified) (12 diffs)
• src/treemodel.h (modified) (4 diffs)

trunk/SConstruct

@@ -33 +33 @@
 
         PathOption('prefix_xerces', 'xerces-c prefix', default_path, PathOption.PathIsDir),
-
+        PathOption('prefix_log', 'DFLog prefix', default_path, PathOption.PathIsDir),
         PathOption('prefix_boost', 'boost-c prefix', default_path, PathOption.PathIsDir),
         ('boost_version', 'Boost version used', '1.37.0'),
-
+        PathOption('prefix_openal', 'OPENAL prefix', default_path, PathOption.PathIsDir),
         PathOption('prefix_ogre', 'OGRE prefix', default_path, PathOption.PathIsDir),
-        PathOption('prefix_openal', 'OPENAL prefix', default_path, PathOption.PathIsDir)
+        PathOption('prefix_qt', 'QT prefix', default_path, PathOption.PathIsDir)
 )
 
@@ -45 +45 @@
 #------------------------------------
 
-env = Environment(ENV=os.environ, options=opt, tools = ['default', 'revision', 'version', 'custom_tests', 'writeConfigH', 'qt'], toolpath = ['scons'])
+if sys.platform == 'win32':
+  env = Environment(ENV=os.environ, options=opt, tools = ['default', 'revision', 'version', 'custom_tests', 'writeConfigH', 'qt'], toolpath = ['scons'])
+else:
+  env = Environment(ENV=os.environ, options=opt, tools = ['default', 'revision', 'version', 'custom_tests', 'writeConfigH'], toolpath = ['scons'])
 
 #
@@ -96 +99 @@
 
 if sys.platform == 'win32':
-        bin_install_dir  = top_install_dir
-        lib_install_dir  = top_install_dir
-        data_install_dir = os.path.join(top_install_dir, 'share')
-
-else:
-        bin_install_dir  = os.path.join(top_install_dir, 'bin')
-        lib_install_dir  = os.path.join(top_install_dir, 'lib')
-        data_install_dir = os.path.join(top_install_dir, 'share', 'gameforge')
+  bin_install_dir  = top_install_dir
+  lib_install_dir  = top_install_dir
+  data_install_dir = '../data/'
+  log_install_dir = '../log/'
+else:
+  bin_install_dir  = os.path.join(top_install_dir, 'bin')
+  lib_install_dir  = top_install_dir
+  data_install_dir = '../data/'
+  log_install_dir = '../log/'
+
+#if sys.platform == 'win32':
+#       bin_install_dir  = top_install_dir
+#       lib_install_dir  = top_install_dir
+#       data_install_dir = os.path.join(top_install_dir, 'share')
+#else:
+#       bin_install_dir  = os.path.join(top_install_dir, 'bin')
+#       lib_install_dir  = os.path.join(top_install_dir, 'lib')
+#       data_install_dir = os.path.join(top_install_dir, 'share', 'gameforge')
 
 #------------------------------------
@@ -114 +127 @@
         "#/include",
         env["build"],
-        os.path.join(env['prefix_xerces'], 'include'), 
-        os.path.join(env['prefix_boost'], 'include'), 
-        os.path.join(env['prefix_ogre'], 'include', 'OGRE'), 
-        os.path.join(env['prefix_openal'], 'include', 'AL')
+        os.path.join(env['prefix_xerces'], 'include'),
+        os.path.join(env['prefix_log'], 'include'), 
+        os.path.join(env['prefix_ogre'], 'include', 'OGRE'),
+        os.path.join(env['prefix_openal'], 'include', 'AL')
 ]
 
 lib_path = [
-        os.path.join(env['prefix_xerces'], 'lib'), 
-        os.path.join(env['prefix_boost'], 'lib'), 
+        os.path.join(env['prefix_xerces'], 'lib'),
         os.path.join(env['prefix_ogre'], 'lib'), 
-        os.path.join(env['prefix_openal'], 'lib')
+        os.path.join(env['prefix_openal'], 'lib'),
+        os.path.join(env['prefix_qt'], 'lib')
 ]
+
+if sys.platform == 'win32':
+  env.AppendUnique(CPPPATH = [os.path.join(env['prefix_boost'], 'include', 'boost'), 
+                              os.path.join(env['prefix_qt'], 'include', 'qt4')])
+
+#env.AppendUnique(CPPPATH = [os.path.join(env['prefix_newton'], 'include', 'NEWTON')])
+##env.AppendUnique(LIBPATH = [os.path.join(env['prefix_newton'], 'lib')])  
+else:
+  env.AppendUnique(CPPPATH = [os.path.join(env['prefix_boost'], 'include', 'boost-1_37'), 
+                              os.path.join(env['prefix_qt'], 'include')])
+#env.AppendUnique(CPPPATH = [env['prefix_newton']])
+#env.AppendUnique(LIBPATH = [env['prefix_newton']])
 
 for path in cpp_path:
@@ -153 +178 @@
         print "'%s' isn't a compiler supported !"%CXX
         Exit(1)
+
+#
+## Do not display deprecated messsage
+env.Append(CXXFLAGS = ['-Wno-deprecated'])
+
 #------------------------------------
 # Platform
@@ -172 +202 @@
 #
 # Qt defines and envionnment
-env.Append(CPPDEFINES = ['QT_DLL', 'QT_NO_DEBUG', 'QT_GUI_LIB', 'QT_CORE_LIB', 'QT_THREAD_SUPPORT'])
-
-env['QT_LIB'] = 'qtmain'
+
+if sys.platform == 'win32':
+  env.Append(CPPDEFINES = ['QT_DLL', 'QT_NO_DEBUG', 'QT_GUI_LIB', 'QT_CORE_LIB', 'QT_THREAD_SUPPORT'])
+  env['QT_LIB'] = 'qtmain'
+else:
+  env.Append(CPPDEFINES = ['QT_NO_DEBUG', 'QT_GUI_LIB', 'QT_CORE_LIB', 'QT_THREAD_SUPPORT', 'QT_SHARED'])
+
 env['QT_AUTOSCAN'] = 1
-env['MOC_DIR'] = '.moc'
-env['RCC_DIR'] = '.rcc'
-env['UI_DIR'] = '.ui'
-env['RESOURCES'] = 'application.qrc'
+#env['MOC_DIR'] = '*.moc'
+#env['RCC_DIR'] = '*.rcc'
+#env['UI_DIR'] = '*.ui'
+#env['RESOURCES'] = 'application.qrc'
+
+#env['QTDIR'] = '/usr/local/Trolltech/QtEmbedded-4.4.3-generic'
+
 #
 #
@@ -187 +224 @@
 #
 # Check QT lib name
-for hd in ['QtCore4', 'QtGui4']:#, 'QtUiTools', 'Qt3Support4', 'QtDesigner4', 'QtHelp4', 'QtDesignerComponents4']:
-  if not conf.CheckLibWithHeader(hd, 'QtGui/QApplication', 'c++', 'QApplication qapp();'):
-    print "Not found Qt4 library"
-    Exit(1)
-
-#for hd in ['al.h', 'alc.h', 'alut.h']:
-#       if not conf.CheckCXXHeader(hd):
-#               print "Did not find OpenAL header '%s' !"%hd
-#               Exit(1)
-
-#for hd in ['al.h', 'alc.h', 'alut.h']:   
-#               if conf.CheckLib(lib, language="C++"):
-#                       found = True
-#                       break       
-    
+
+if sys.platform == 'win32':
+  qt_header = ['QtCore4', 'QtGui4', 'QtUiTools', 'Qt3Support4', 'QtDesigner4', 'QtHelp4', 'QtDesignerComponents4']
+else:
+  qt_header = ['QtCore', 'QtGui', 'QtUiTools', 'Qt3Support', 'QtDesigner', 'QtHelp', 'QtDesignerComponents']
+
+for hd in qt_header:
+   if not conf.CheckLibWithHeader(hd, 'QtGui/QApplication', 'c++', 'QApplication qapp();'):
+      print "Not found Qt4 library"
+      Exit(1)
+
 #
 # Check Xerces lib name
@@ -243 +276 @@
   boost_compiler = ('vc', 'vc90')
 else:
-  boost_compiler = ('gcc', 'gcc41')
+  boost_compiler = ('gcc', 'gcc43')
 
 boost_version = env['boost_version'].replace('.', '_').replace('_0', '')
@@ -331 +364 @@
         os.path.join('src','SConscript'),
         exports=['env', 'top_dir', 'bin_install_dir', 'lib_install_dir', 'data_install_dir'],
-        build_dir=os.path.join(env['build'], 'src'),
+        build_dir=os.path.join(env['build'], 'src'), 
         duplicate=0)
 

trunk/include/dreamforge/GameSerializer.hh

@@ -19 +19 @@
 # define __GAME_SERIALIZER_HH__
 
-#include        <xercesc/util/Xerces_autoconf_config.hpp>
+#if (OGRE_PLATFORM  == OGRE_PLATFORM_WIN32)
+  #include      <xercesc/util/Xerces_autoconf_config.hpp>
+#endif
+
 #include        <xercesc/sax2/Attributes.hpp>
   

trunk/src/LevelEditor.cc

@@ -17 +17 @@
 
 #if (OGRE_PLATFORM  == OGRE_PLATFORM_LINUX)
-  #include <QX11Info>
+  #include <QtGui/QX11Info>
 #endif
 //#include <OGRE/OgreStringConverter.h>
@@ -107 +107 @@
 
 //------------------------------------------------------------------------------------------------ 
-void LevelEdWidget::saveObjectToFile(std::string& savefile)
+void LevelEdWidget::saveObjectToFile(const std::string& savefile)
 {
   CSaveFile::getInstance()->setFileName(savefile);
@@ -123 +123 @@
 
 //------------------------------------------------------------------------------------------------ 
-void LevelEdWidget::loadObjectFromFile(std::string& loadfile)
+void LevelEdWidget::loadObjectFromFile(const std::string& loadfile)
 {
         // Destroy all object loaded in game
@@ -417 +417 @@
 
 //------------------------------------------------------------------------------------------------ 
-void LevelEdWidget::createTempObject(std::string& name, std::string& file, std::string& type)
+void LevelEdWidget::createTempObject(const std::string& name, const std::string& file, const std::string& type)
 {
   mName = name;

trunk/src/LevelEditor.hh

@@ -29 +29 @@
     ~LevelEdWidget(void);
     
-    void createTempObject(std::string& name, std::string& file, std::string& type);
+    void createTempObject(const std::string& name, const std::string& file, const std::string& type);
     void changeInsertionMode(bool val);
-    void saveObjectToFile(std::string& savefile);
-    void loadObjectFromFile(std::string& loadfile);  
+    void saveObjectToFile(const std::string& savefile);
+    void loadObjectFromFile(const std::string& loadfile);  
     
     inline Ogre::Root* getRoot(void) { return mRoot; }

trunk/src/ObjectEditor.cc

@@ -10 +10 @@
 
 #if (OGRE_PLATFORM  == OGRE_PLATFORM_LINUX)
-  #include <QX11Info>
+  #include <QtGui/QX11Info>
 #endif
 

trunk/src/Properties.hh

@@ -20 +20 @@
     public:
       SelectedObjProp(QWidget *parent = 0);
-      ~SelectedObjProp();
+      virtual ~SelectedObjProp();
       
       QTreeView* objectView;
@@ -53 +53 @@
     public:
       ObjEdProp(QWidget *parent = 0);
-      ~ObjEdProp();
+      virtual ~ObjEdProp();
 
       // CARACTERITICS
@@ -95 +95 @@
     public:
       ResourcesProp(QWidget *parent = 0);
-      ~ResourcesProp();
+      virtual ~ResourcesProp();
     
     protected:

trunk/src/SConscript

@@ -29 +29 @@
 bin_game_env.AppendUnique(LIBS="libDFLog")
 bin_game_env.AppendUnique(LIBPATH=["../../../../freequest/trunk/build/src"])
-bin = bin_game_env.Program("dreamforge", bin_files)
+
+bin = bin_game_env.Program("dforge", bin_files)
 
 #

trunk/src/Workbench.cc

@@ -1 +1 @@
 
 #ifdef HAVE_CONFIG_HH
-#include "config.h"
+  #include "config.h"
 #endif
 
 // use for object global variables
-#define GLOBAL  
-
+#define GLOBAL
 
 #include <QtCore/QDir>
-//#include <QVBoxLayout>
-//#include <QFrame>
+// #include <QVBoxLayout>
+// #include <QFrame>
 
 #include "Workbench.hh"
-
 
 using namespace dreamforge;

trunk/src/Workbench.hh

@@ -1 @@
-#ifndef __WORKBENCH_HH__
- #define __WORKBENCH_HH__
- 
+#ifndef __WORKBENCH_HH__
+  #define __WORKBENCH_HH__
+
 #include <QtGui/QMainWindow>
 #include <QtGui/QtGui>
-
 
 #include "LevelEditor.hh"
@@ -15 +14 @@
 namespace dreamforge 
 { 
- 
+
  /***
    Our Workbench which represente the Qt MainWindow.
@@ -74 +73 @@
  };
 
-}// namespace dreamforge  
- 
- #endif
+}// namespace dreamforge 
+
+#endif
+
+

trunk/src/dreamforge/GameObjectManager.cc

@@ -74 +74 @@
         {
                 obj->destroy();
-    mObjectList.erase(it);
+    mObjectList.erase(it->first);
         }       
 }

trunk/src/treemodel.cpp

@@ -43 +43 @@
 using namespace dreamforge;
 
-//! [0]
+
 TreeModel::TreeModel(const QStringList &headers, const QString &data,
                      QObject *parent)
@@ -55 +55 @@
     setupModelData(data.split(QString("\n")), rootItem);
 }
-//! [0]
-
-//! [1]
+
 TreeModel::~TreeModel()
 {
     delete rootItem;
 }
-//! [1]
-
-//! [2]
+
 int TreeModel::columnCount(const QModelIndex &parent) const
 {
     return rootItem->columnCount();
 }
-//! [2]
 
 QVariant TreeModel::data(const QModelIndex &index, int role) const
@@ -84 +79 @@
 }
 
-//! [3]
 Qt::ItemFlags TreeModel::flags(const QModelIndex &index) const
 {
@@ -92 +86 @@
     return Qt::ItemIsEditable | Qt::ItemIsEnabled | Qt::ItemIsSelectable;
 }
-//! [3]
-
-//! [4]
+
 TreeItem *TreeModel::getItem(const QModelIndex &index) const
 {
@@ -103 +95 @@
     return rootItem;
 }
-//! [4]
 
 QVariant TreeModel::headerData(int section, Qt::Orientation orientation,
@@ -114 +105 @@
 }
 
-//! [5]
 QModelIndex TreeModel::index(int row, int column, const QModelIndex &parent) const
 {
     if (parent.isValid() && parent.column() != 0)
         return QModelIndex();
-//! [5]
-
-//! [6]
+
     TreeItem *parentItem = getItem(parent);
 
@@ -130 +118 @@
         return QModelIndex();
 }
-//! [6]
 
 bool TreeModel::insertColumns(int position, int columns, const QModelIndex &parent)
@@ -155 +142 @@
 }
 
-//! [7]
 QModelIndex TreeModel::parent(const QModelIndex &index) const
 {
@@ -169 +155 @@
     return createIndex(parentItem->childNumber(), 0, parentItem);
 }
-//! [7]
 
 bool TreeModel::removeColumns(int position, int columns, const QModelIndex &parent)
@@ -197 +182 @@
 }
 
-//! [8]
 int TreeModel::rowCount(const QModelIndex &parent) const
 {
@@ -204 +188 @@
     return parentItem->childCount();
 }
-//! [8]
 
 bool TreeModel::setData(const QModelIndex &index, const QVariant &value,
@@ -286 +269 @@
     }
 }
+
+#include "treemodel.moc"

trunk/src/treemodel.h

@@ -43 +43 @@
 #include <QtCore/QVariant>
 
-
 namespace dreamforge 
 {
   
 class TreeItem;  
-//! [0]
+
 class TreeModel : public QAbstractItemModel
 {
@@ -54 +53 @@
 
 public:
-    TreeModel(const QStringList &headers, const QString &data,
-              QObject *parent = 0);
-    ~TreeModel();
-//! [0] //! [1]
+    TreeModel(const QStringList &headers, const QString &data, QObject *parent = 0);
+    virtual ~TreeModel( void );
 
     QVariant data(const QModelIndex &index, int role) const;
@@ -69 +66 @@
     int rowCount(const QModelIndex &parent = QModelIndex()) const;
     int columnCount(const QModelIndex &parent = QModelIndex()) const;
-//! [1]
 
-//! [2]
     Qt::ItemFlags flags(const QModelIndex &index) const;
     bool setData(const QModelIndex &index, const QVariant &value,
@@ -93 +88 @@
     TreeItem *rootItem;
 };
-//! [2]
 
 }