Menu
▾
▴
[Hgengine-cvs] SF.net SVN: hgengine:[177] Mercury2
|
From: <axl...@us...> - 2009-03-08 04:19:59
|
Revision: 177
http://hgengine.svn.sourceforge.net/hgengine/?rev=177&view=rev
Author: axlecrusher
Date: 2009-03-08 04:19:56 +0000 (Sun, 08 Mar 2009)
Log Message:
-----------
Update to fix compile on ubuntu
Modified Paths:
--------------
Mercury2/mercury2.kdevelop
Mercury2/scenegraph.xml
Mercury2/src/AlignedBuffer.h
Mercury2/src/BMPLoader.cpp
Mercury2/src/BoundingBox.cpp
Mercury2/src/BoundingBox.h
Mercury2/src/MercuryFileDriverDirect.cpp
Mercury2/src/MercuryFileDriverPacked.cpp
Mercury2/src/MercuryFileDriverZipped.cpp
Mercury2/src/MercuryMessageManager.h
Mercury2/src/RenderableNode.cpp
Mercury2/src/RenderableNode.h
Modified: Mercury2/mercury2.kdevelop
===================================================================
--- Mercury2/mercury2.kdevelop 2009-03-04 00:46:51 UTC (rev 176)
+++ Mercury2/mercury2.kdevelop 2009-03-08 04:19:56 UTC (rev 177)
@@ -2,7 +2,7 @@
<kdevelop>
<general>
<author>Joshua Allen</author>
- <email></email>
+ <email/>
<version>2.0</version>
<projectmanagement>KDevAutoProject</projectmanagement>
<primarylanguage>C++</primarylanguage>
@@ -14,8 +14,8 @@
<projectname>Mercury2</projectname>
<projectdirectory>.</projectdirectory>
<absoluteprojectpath>false</absoluteprojectpath>
- <description></description>
- <defaultencoding></defaultencoding>
+ <description/>
+ <defaultencoding/>
<versioncontrol/>
</general>
<kdevautoproject>
@@ -24,10 +24,10 @@
<useconfiguration>debug</useconfiguration>
</general>
<run>
- <mainprogram>/home/josh/Mercury2/debug/src/mercury2</mainprogram>
+ <mainprogram/>
<terminal>false</terminal>
- <programargs></programargs>
- <globaldebugarguments></globaldebugarguments>
+ <programargs/>
+ <globaldebugarguments/>
<globalcwd>/home/josh/Mercury2</globalcwd>
<useglobalprogram>true</useglobalprogram>
<autocompile>false</autocompile>
@@ -59,16 +59,16 @@
<ccompiler>kdevgccoptions</ccompiler>
<cxxcompiler>kdevgppoptions</cxxcompiler>
<f77compiler>kdevg77options</f77compiler>
- <cxxflags>-O0 -g -Wall</cxxflags>
+ <cxxflags>-O2 -g -Wall</cxxflags>
<envvars/>
- <topsourcedir></topsourcedir>
- <cppflags>-Isrc/ -I/usr/include/libxml2/ -DHGENGINE -DRUN_FROM_START_FOLDER</cppflags>
+ <topsourcedir/>
+ <cppflags>-Isrc/ -I/usr/include/libxml2/ -DHGENGINE -DRUN_FROM_START_FOLDER -DUSE_SSE</cppflags>
<ldflags>-lpthread -lX11 -lGL -lxml2 -lpng</ldflags>
- <ccompilerbinary></ccompilerbinary>
- <cxxcompilerbinary></cxxcompilerbinary>
- <f77compilerbinary></f77compilerbinary>
+ <ccompilerbinary/>
+ <cxxcompilerbinary/>
+ <f77compilerbinary/>
<cflags>-O0 -g -Wall</cflags>
- <f77flags></f77flags>
+ <f77flags/>
</debug>
<default>
<envvars/>
@@ -193,8 +193,8 @@
<includestyle>3</includestyle>
<root>/usr/qt/3</root>
<designerintegration>EmbeddedKDevDesigner</designerintegration>
- <qmake>/usr/qt/3/bin/qmake</qmake>
- <designer>/usr/qt/3/bin/designer</designer>
+ <qmake></qmake>
+ <designer></designer>
<designerpluginpaths/>
</qt>
<references/>
@@ -222,7 +222,7 @@
<includePaths>.;</includePaths>
</codecompletion>
<creategettersetter>
- <prefixGet></prefixGet>
+ <prefixGet/>
<prefixSet>set</prefixSet>
<prefixVariable>m_,_</prefixVariable>
<parameterName>theValue</parameterName>
@@ -243,11 +243,11 @@
</cppsupportpart>
<kdevdebugger>
<general>
- <gdbpath></gdbpath>
+ <gdbpath/>
<dbgshell>libtool</dbgshell>
- <configGdbScript></configGdbScript>
- <runShellScript></runShellScript>
- <runGdbScript></runGdbScript>
+ <configGdbScript/>
+ <runShellScript/>
+ <runGdbScript/>
<breakonloadinglibs>true</breakonloadinglibs>
<separatetty>false</separatetty>
<floatingtoolbar>false</floatingtoolbar>
Modified: Mercury2/scenegraph.xml
===================================================================
--- Mercury2/scenegraph.xml 2009-03-04 00:46:51 UTC (rev 176)
+++ Mercury2/scenegraph.xml 2009-03-08 04:19:56 UTC (rev 177)
@@ -22,8 +22,8 @@
</node>
<node type="rotatornode" movy="0" movz="-2" scalex="0.25" scaley="0.25" scalez="0.25" >
<node type="renderablenode">
- <asset type="texture" file="gunther.png"/>
- <asset type="hgmdlmodel" file="gunther.hgmdl"/>
+ <asset type="texture" file="test.bmp"/>
+ <asset type="hgmdlmodel" file="beerhall.hgmdl"/>
</node>
</node>
</SceneGraph>
Modified: Mercury2/src/AlignedBuffer.h
===================================================================
--- Mercury2/src/AlignedBuffer.h 2009-03-04 00:46:51 UTC (rev 176)
+++ Mercury2/src/AlignedBuffer.h 2009-03-08 04:19:56 UTC (rev 177)
@@ -1,6 +1,8 @@
#ifndef ALIGNEDBUFFER_H
#define ALIGNEDBUFFER_H
+#include <stdint.h>
+
template <typename T>
class AlignedBuffer
{
Modified: Mercury2/src/BMPLoader.cpp
===================================================================
--- Mercury2/src/BMPLoader.cpp 2009-03-04 00:46:51 UTC (rev 176)
+++ Mercury2/src/BMPLoader.cpp 2009-03-08 04:19:56 UTC (rev 177)
@@ -1,6 +1,7 @@
#include <RawImageData.h>
#include <MercuryUtil.h>
#include <ImageLoader.h>
+#include <string.h>
using namespace std;
Modified: Mercury2/src/BoundingBox.cpp
===================================================================
--- Mercury2/src/BoundingBox.cpp 2009-03-04 00:46:51 UTC (rev 176)
+++ Mercury2/src/BoundingBox.cpp 2009-03-08 04:19:56 UTC (rev 177)
@@ -1,7 +1,7 @@
#include <GL/gl.h>
#include <GL/glext.h>
#include <BoundingBox.h>
-
+#include <string.h>
#include <Viewport.h>
BoundingBox::BoundingBox(const MercuryVertex& center, const MercuryVertex& extend)
@@ -50,8 +50,6 @@
void RenderableBoundingBox::Render(MercuryNode* node)
{
- const BoundingBox& bb = *m_bb;
-
BoundingBox gbb = m_bb->Transform( GetGlobalMatrix() );
if ( FRUSTUM->Clip( gbb ) ) return;
Modified: Mercury2/src/BoundingBox.h
===================================================================
--- Mercury2/src/BoundingBox.h 2009-03-04 00:46:51 UTC (rev 176)
+++ Mercury2/src/BoundingBox.h 2009-03-08 04:19:56 UTC (rev 177)
@@ -4,6 +4,7 @@
#include <MercuryAsset.h>
#include <MercuryVertex.h>
#include <MercuryMatrix.h>
+#include <stdint.h>
class BoundingBox
{
Modified: Mercury2/src/MercuryFileDriverDirect.cpp
===================================================================
--- Mercury2/src/MercuryFileDriverDirect.cpp 2009-03-04 00:46:51 UTC (rev 176)
+++ Mercury2/src/MercuryFileDriverDirect.cpp 2009-03-08 04:19:56 UTC (rev 177)
@@ -14,6 +14,8 @@
#define FSHEADER ""
#endif
+#include <string.h>
+
//Core base only.
MercuryFile::MercuryFile()
{
Modified: Mercury2/src/MercuryFileDriverPacked.cpp
===================================================================
--- Mercury2/src/MercuryFileDriverPacked.cpp 2009-03-04 00:46:51 UTC (rev 176)
+++ Mercury2/src/MercuryFileDriverPacked.cpp 2009-03-08 04:19:56 UTC (rev 177)
@@ -1,4 +1,5 @@
#include <MercuryFileDriverPacked.h>
+#include <string.h>
const MString PackagePrefix = "Packages/";
Modified: Mercury2/src/MercuryFileDriverZipped.cpp
===================================================================
--- Mercury2/src/MercuryFileDriverZipped.cpp 2009-03-04 00:46:51 UTC (rev 176)
+++ Mercury2/src/MercuryFileDriverZipped.cpp 2009-03-08 04:19:56 UTC (rev 177)
@@ -3,6 +3,7 @@
//For the store compression on zips
#include <zlib.h>
+#include <string.h>
const MString PackagePrefix = "Packages/";
Modified: Mercury2/src/MercuryMessageManager.h
===================================================================
--- Mercury2/src/MercuryMessageManager.h 2009-03-04 00:46:51 UTC (rev 176)
+++ Mercury2/src/MercuryMessageManager.h 2009-03-08 04:19:56 UTC (rev 177)
@@ -7,6 +7,7 @@
#include <PriorityQueue.h>
#include <MercuryString.h>
#include <MercuryUtil.h>
+#include <stdint.h>
/* This message system uses absolute integer time values to fire off events.
This ensures accuarate firing times while eliminating floating point error.
Modified: Mercury2/src/RenderableNode.cpp
===================================================================
--- Mercury2/src/RenderableNode.cpp 2009-03-04 00:46:51 UTC (rev 176)
+++ Mercury2/src/RenderableNode.cpp 2009-03-08 04:19:56 UTC (rev 177)
@@ -2,6 +2,7 @@
#include <assert.h>
#include <GL/gl.h>
#include <TransformNode.h>
+#include <unistd.h>
using namespace std;
Modified: Mercury2/src/RenderableNode.h
===================================================================
--- Mercury2/src/RenderableNode.h 2009-03-04 00:46:51 UTC (rev 176)
+++ Mercury2/src/RenderableNode.h 2009-03-08 04:19:56 UTC (rev 177)
@@ -6,6 +6,7 @@
#include <MercuryAsset.h>
#include <MercuryMatrix.h>
#include <MSemaphore.h>
+#include <stdint.h>
#define MCHECKASSETS
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
