Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Apr 28, 2011, 7:15:14 AM (14 years ago)
Author:
rgrieder
Message:

Merged kicklib2 branch back to trunk (includes former branches ois_update, mac_osx and kicklib).

Notes for updating

Linux:
You don't need an extra package for CEGUILua and Tolua, it's already shipped with CEGUI.
However you do need to make sure that the OgreRenderer is installed too with CEGUI 0.7 (may be a separate package).
Also, Orxonox now recognises if you install the CgProgramManager (a separate package available on newer Ubuntu on Debian systems).

Windows:
Download the new dependency packages versioned 6.0 and use these. If you have problems with that or if you don't like the in game console problem mentioned below, you can download the new 4.3 version of the packages (only available for Visual Studio 2005/2008).

Key new features:

  • *Support for Mac OS X*
  • Visual Studio 2010 support
  • Bullet library update to 2.77
  • OIS library update to 1.3
  • Support for CEGUI 0.7 —> Support for Arch Linux and even SuSE
  • Improved install target
  • Compiles now with GCC 4.6
  • Ogre Cg Shader plugin activated for Linux if available
  • And of course lots of bug fixes

There are also some regressions:

  • No support for CEGUI 0.5, Ogre 1.4 and boost 1.35 - 1.39 any more
  • In game console is not working in main menu for CEGUI 0.7
  • Tolua (just the C lib, not the application) and CEGUILua libraries are no longer in our repository. —> You will need to get these as well when compiling Orxonox
  • And of course lots of new bugs we don't yet know about
Location:
code/trunk/src/external/tinyxml
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • code/trunk/src/external/tinyxml/CMakeLists.txt

    r7163 r8351  
    3636  ORXONOX_EXTERNAL
    3737  NO_DLL_INTERFACE
    38   VERSION
    39     2.5.3
    4038  SOURCE_FILES
    4139    ${TINYXML_FILES}

  • code/trunk/src/external/tinyxml/VERSION

    r6620 r8351  
    1 TinyXML++ trunk checkout revision 106. Built on top of TinyXML 2.5.3
     1TinyXML++ trunk checkout revision 122 (version 0.04a).
     2Built with TinyXML 2.5.3.

  • code/trunk/src/external/tinyxml/changes_orxonox.diff

    r5781 r8351  
    1 --- ticpp.h     Tue Nov  4 21:55:49 2008
    2 +++ ticpp.h     Sat Jan 10 14:48:41 2009
    3 @@ -1229,6 +1229,7 @@
     1--- ticpp.h
     2+++ ticpp.h
     3@@ -38,9 +38,7 @@
     4 @todo add TYPECOUNT support. See ticpp::NodeFactory.
     5 @todo Add a quick reference
     6 */
     7-#ifndef TIXML_USE_TICPP
     8-       #define TIXML_USE_TICPP
     9-#endif
     10+#ifdef TIXML_USE_TICPP
     11 
     12 #ifndef TICPP_INCLUDED
     13 #define TICPP_INCLUDED
     14@@ -1231,6 +1229,7 @@
    415 
    516                T* m_tiXmlPointer;              /**< Internal pointer to the TiXml Class which is being wrapped */
    617 
    7 +    public:
     18+       public:
    819                /**
    920                @internal
    1021                Gets the internal TinyXML pointer.
    11 @@ -1240,6 +1241,7 @@
     22@@ -1242,6 +1241,7 @@
    1223                        ValidatePointer();
    1324                        return m_tiXmlPointer;
    1425                }
    15 +    protected:
     26+       protected:
    1627 
    1728                /**
    1829                @internal
     30@@ -1903,3 +1903,5 @@
     31 }
     32 
     33 #endif // TICPP_INCLUDED
     34+
     35+#endif // TIXML_USE_TICPP

  • code/trunk/src/external/tinyxml/ticpp.cpp

    r5781 r8351  
    370370}
    371371
    372 Node* Node::InsertEndChild( Node& addThis )
     372Node* Node::InsertEndChild( const Node& addThis )
    373373{
    374374        if ( addThis.Type() == TiXmlNode::DOCUMENT )
    … …  
    404404}
    405405
    406 Node* Node::InsertBeforeChild( Node* beforeThis, Node& addThis )
     406Node* Node::InsertBeforeChild( Node* beforeThis, const Node& addThis )
    407407{
    408408        if ( addThis.Type() == TiXmlNode::DOCUMENT )
    … …  
    423423}
    424424
    425 Node* Node::InsertAfterChild( Node* afterThis, Node& addThis )
     425Node* Node::InsertAfterChild( Node* afterThis, const Node& addThis )
    426426{
    427427        if ( addThis.Type() == TiXmlNode::DOCUMENT )
    … …  
    442442}
    443443
    444 Node* Node::ReplaceChild( Node* replaceThis, Node& withThis )
     444Node* Node::ReplaceChild( Node* replaceThis, const Node& withThis )
    445445{
    446446        if ( withThis.Type() == TiXmlNode::DOCUMENT )

  • code/trunk/src/external/tinyxml/ticpp.h

    r5781 r8351  
    225225                        return ( GetBasePointer() == rhs.GetBasePointer() );
    226226                }
    227                
     227
    228228                /**
    229229                Compare internal TiXml pointers to determine is both are wrappers around the same node
    … …  
    233233                        return ( GetBasePointer() != rhs.GetBasePointer() );
    234234                }
    235                
     235
    236236                /**
    237237                Builds detailed error string using TiXmlDocument::Error() and others
    … …  
    250250                                        {
    251251                                                full_message    << "\nDescription: " << doc->ErrorDesc()
    252                                                                                 << "\nFile: " << (strlen( doc->Value() ) > 0 ? doc->Value() : "<unnamed-file>") 
    253                                                                                 << "\nLine: " << doc->ErrorRow() 
     252                                                                                << "\nFile: " << (strlen( doc->Value() ) > 0 ? doc->Value() : "<unnamed-file>")
     253                                                                                << "\nLine: " << doc->ErrorRow()
    254254                                                                                << "\nColumn: " << doc->ErrorCol();
    255255                                        }
    … …  
    287287                                TICPPTHROW( "Internal TiXml Pointer is NULL" );
    288288                        }
    289                 }               
     289                }
    290290
    291291                /**
    … …  
    617617                @see TiXmlNode::InsertEndChild
    618618                */
    619                 Node* InsertEndChild( Node& addThis );
     619                Node* InsertEndChild( const Node& addThis );
    620620
    621621                /**
    … …  
    642642                @see TiXmlNode::InsertBeforeChild
    643643                */
    644                 Node* InsertBeforeChild( Node* beforeThis, Node& addThis );
     644                Node* InsertBeforeChild( Node* beforeThis, const Node& addThis );
    645645
    646646                /**
    … …  
    655655                @see TiXmlNode::InsertAfterChild
    656656                */
    657                 Node* InsertAfterChild( Node* afterThis, Node& addThis );
     657                Node* InsertAfterChild( Node* afterThis, const Node& addThis );
    658658
    659659                /**
    … …  
    667667                @see TiXmlNode::ReplaceChild
    668668                */
    669                 Node* ReplaceChild( Node* replaceThis, Node& withThis );
     669                Node* ReplaceChild( Node* replaceThis, const Node& withThis );
    670670
    671671                /**
    … …  
    11631163                /** Sets internal pointer to the Previous Sibling, or Iterator::END, if there are no prior siblings */
    11641164                Iterator operator--(int)
    1165                 {                       
     1165                {
    11661166                        Iterator tmp(*this);
    11671167                        --(*this);
    … …  
    12301230                T* m_tiXmlPointer;              /**< Internal pointer to the TiXml Class which is being wrapped */
    12311231
    1232     public:
     1232        public:
    12331233                /**
    12341234                @internal
    … …  
    12421242                        return m_tiXmlPointer;
    12431243                }
    1244     protected:
     1244        protected:
    12451245
    12461246                /**
    … …  
    14001400
    14011401                /**
    1402                 Constructor.
    1403                 Create a document with a name. The name of the document is also the filename of the xml.
    1404 
    1405                 @param documentName Name to set in the Document.
    1406                 */
     1402                 * Constructor.
     1403                 * Create a document with a name. The name of the document is also the filename of the xml.
     1404                 * @param documentName Name to set in the Document.
     1405                 * @note LoadFile() needs to be called to actually load the data from the file specified by documentName
     1406                 *               SaveFile() needs to be called to save data to file specified by documentName.
     1407                 */
    14071408                Document( const std::string& documentName );
    14081409
    … …  
    17491750                                if ( throwIfNotFound )
    17501751                                {
    1751                                         TICPPTHROW( "Attribute does not exist" );
     1752                                        const std::string error( std::string( "Attribute '" ) + name + std::string( "' does not exist" ) );
     1753                                        TICPPTHROW( error );
    17521754                                }
    17531755                        }
    … …  
    17811783                                if ( throwIfNotFound )
    17821784                                {
    1783                                         TICPPTHROW( "Attribute does not exist" );
     1785                                        const std::string error( std::string( "Attribute '" ) + name + std::string( "' does not exist" ) );
     1786                                        TICPPTHROW( error );
    17841787                                }
    17851788                                else
Note: See TracChangeset for help on using the changeset viewer.