Menu
▾
▴
[Hgengine-cvs] SF.net SVN: hgengine:[630] Mercury2
|
From: <axl...@us...> - 2009-12-21 19:10:32
|
Revision: 630
http://hgengine.svn.sourceforge.net/hgengine/?rev=630&view=rev
Author: axlecrusher
Date: 2009-12-21 19:10:26 +0000 (Mon, 21 Dec 2009)
Log Message:
-----------
fix windows compile
renders very slow
Modified Paths:
--------------
Mercury2/Mercury2.vcproj
Mercury2/modules/ParticleEmitter.cpp
Mercury2/src/GLHeaders.h
Mercury2/src/MercuryMath.h
Mercury2/src/OGLExtensions.cpp
Mercury2/src/OGLExtensions.h
Mercury2/src/StateChanger.cpp
Mercury2/src/StateChanger.h
Mercury2/src/global.h
Modified: Mercury2/Mercury2.vcproj
===================================================================
--- Mercury2/Mercury2.vcproj 2009-12-14 22:00:23 UTC (rev 629)
+++ Mercury2/Mercury2.vcproj 2009-12-21 19:10:26 UTC (rev 630)
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=".;src;src/include;src/include/png;src/include/zlib"
+ AdditionalIncludeDirectories="modules;.;src;src/include;src/include/png;src/include/zlib;src/DataStructures;src/DataTypes"
PreprocessorDefinitions="HGENGINE;WIN32;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -172,6 +172,10 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
+ RelativePath=".\src\AlignedBuffer.h"
+ >
+ </File>
+ <File
RelativePath=".\src\BMPLoader.cpp"
>
</File>
@@ -180,401 +184,395 @@
>
</File>
<File
- RelativePath=".\src\Camera.cpp"
+ RelativePath=".\src\BoundingBox.h"
>
</File>
<File
- RelativePath=".\src\Frustum.cpp"
+ RelativePath=".\src\Callback.h"
>
</File>
<File
- RelativePath=".\src\FullscreenQuad.cpp"
+ RelativePath=".\src\Camera.cpp"
>
</File>
<File
- RelativePath=".\src\GLHelpers.cpp"
+ RelativePath=".\src\Camera.h"
>
</File>
<File
- RelativePath=".\src\HGMDLMesh.cpp"
+ RelativePath=".\src\Frustum.cpp"
>
</File>
<File
- RelativePath=".\src\HGMDLModel.cpp"
+ RelativePath=".\src\Frustum.h"
>
</File>
<File
- RelativePath=".\src\ImageLoader.cpp"
+ RelativePath=".\src\FullscreenQuad.cpp"
>
</File>
<File
- RelativePath=".\src\Mercury2.cpp"
+ RelativePath=".\src\FullscreenQuad.h"
>
</File>
<File
- RelativePath=".\src\MercuryAsset.cpp"
+ RelativePath=".\src\glext.h"
>
</File>
<File
- RelativePath=".\src\MercuryBacktrace.c"
+ RelativePath=".\src\GLHeaders.h"
>
</File>
<File
- RelativePath=".\src\MercuryCrash.c"
+ RelativePath=".\src\GLHelpers.cpp"
>
</File>
<File
- RelativePath=".\src\MercuryFBO.cpp"
+ RelativePath=".\src\GLHelpers.h"
>
</File>
<File
- RelativePath=".\src\MercuryFile.cpp"
+ RelativePath=".\src\global.h"
>
</File>
<File
- RelativePath=".\src\MercuryFileDriverDirect.cpp"
+ RelativePath=".\src\HGMDLMesh.cpp"
>
</File>
<File
- RelativePath=".\src\MercuryFileDriverMem.cpp"
+ RelativePath=".\src\HGMDLMesh.h"
>
</File>
<File
- RelativePath=".\src\MercuryFileDriverPacked.cpp"
+ RelativePath=".\src\HGMDLModel.cpp"
>
</File>
<File
- RelativePath=".\src\MercuryFileDriverZipped.cpp"
+ RelativePath=".\src\HGMDLModel.h"
>
</File>
<File
- RelativePath=".\src\MercuryInput.cpp"
+ RelativePath=".\src\ImageLoader.cpp"
>
</File>
<File
- RelativePath=".\src\MercuryMath.cpp"
+ RelativePath=".\src\ImageLoader.h"
>
</File>
<File
- RelativePath=".\src\MercuryMatrix.cpp"
+ RelativePath=".\src\Light.cpp"
>
</File>
<File
- RelativePath=".\src\MercuryMessageManager.cpp"
+ RelativePath=".\src\Light.h"
>
</File>
<File
- RelativePath=".\src\MercuryNamedResource.cpp"
+ RelativePath=".\src\MAutoPtr.h"
>
</File>
<File
- RelativePath=".\src\MercuryNode.cpp"
+ RelativePath=".\src\Mercury2.cpp"
>
</File>
<File
- RelativePath=".\src\MercuryPlane.cpp"
+ RelativePath=".\src\MercuryAsset.cpp"
>
</File>
<File
- RelativePath=".\src\MercuryPrefs.cpp"
+ RelativePath=".\src\MercuryAsset.h"
>
</File>
<File
- RelativePath=".\src\MercuryString.cpp"
+ RelativePath=".\src\MercuryBacktrace.c"
>
</File>
<File
- RelativePath=".\src\MercuryTheme.cpp"
+ RelativePath=".\src\MercuryBacktrace.h"
>
</File>
<File
- RelativePath=".\src\MercuryThreads.cpp"
+ RelativePath=".\src\MercuryCrash.c"
>
</File>
<File
- RelativePath=".\src\MercuryTimer.cpp"
+ RelativePath=".\src\MercuryCrash.h"
>
</File>
<File
- RelativePath=".\src\MercuryUtil.cpp"
+ RelativePath=".\src\MercuryCTA.cpp"
>
</File>
<File
- RelativePath=".\src\MercuryVBO.cpp"
+ RelativePath=".\src\MercuryCTA.h"
>
</File>
<File
- RelativePath=".\src\MercuryVertex.cpp"
+ RelativePath=".\src\MercuryFBO.cpp"
>
</File>
<File
- RelativePath=".\src\MercuryWindow.cpp"
+ RelativePath=".\src\MercuryFBO.h"
>
</File>
<File
- RelativePath=".\src\ModuleManager.cpp"
+ RelativePath=".\src\MercuryFile.cpp"
>
</File>
<File
- RelativePath=".\src\MQuaternion.cpp"
+ RelativePath=".\src\MercuryFile.h"
>
</File>
<File
- RelativePath=".\src\MSemaphore.cpp"
+ RelativePath=".\src\MercuryFileDriverDirect.cpp"
>
</File>
<File
- RelativePath=".\src\OGLExtensions.cpp"
+ RelativePath=".\src\MercuryFileDriverDirect.h"
>
</File>
<File
- RelativePath=".\src\PNGLoader.cpp"
+ RelativePath=".\src\MercuryFileDriverMem.cpp"
>
</File>
<File
- RelativePath=".\src\Quad.cpp"
+ RelativePath=".\src\MercuryFileDriverMem.h"
>
</File>
<File
- RelativePath=".\src\RawImageData.cpp"
+ RelativePath=".\src\MercuryFileDriverPacked.cpp"
>
</File>
<File
- RelativePath=".\src\RenderGraph.cpp"
+ RelativePath=".\src\MercuryFileDriverPacked.h"
>
</File>
<File
- RelativePath=".\src\Shader.cpp"
+ RelativePath=".\src\MercuryFileDriverZipped.cpp"
>
</File>
<File
- RelativePath=".\src\Texture.cpp"
+ RelativePath=".\src\MercuryFileDriverZipped.h"
>
</File>
<File
- RelativePath=".\src\TransformNode.cpp"
+ RelativePath=".\src\MercuryHash.h"
>
</File>
<File
- RelativePath=".\src\UpdateThreader.cpp"
+ RelativePath=".\src\MercuryInput.cpp"
>
</File>
<File
- RelativePath=".\src\Viewport.cpp"
+ RelativePath=".\src\MercuryInput.h"
>
</File>
<File
- RelativePath=".\src\Win32Window.cpp"
+ RelativePath=".\src\MercuryList.h"
>
</File>
<File
- RelativePath=".\src\XMLParser.cpp"
+ RelativePath=".\src\MercuryLog.cpp"
>
</File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
<File
- RelativePath=".\src\AlignedBuffer.h"
+ RelativePath=".\src\MercuryMath.cpp"
>
</File>
<File
- RelativePath=".\src\BoundingBox.h"
+ RelativePath=".\src\MercuryMath.h"
>
</File>
<File
- RelativePath=".\src\Callback.h"
+ RelativePath=".\src\MercuryMatrix.cpp"
>
</File>
<File
- RelativePath=".\src\Camera.h"
+ RelativePath=".\src\MercuryMatrix.h"
>
</File>
<File
- RelativePath=".\src\Frustum.h"
+ RelativePath=".\src\MercuryMessageManager.cpp"
>
</File>
<File
- RelativePath=".\src\FullscreenQuad.h"
+ RelativePath=".\src\MercuryMessageManager.h"
>
</File>
<File
- RelativePath=".\src\glext.h"
+ RelativePath=".\src\MercuryNamedResource.cpp"
>
</File>
<File
- RelativePath=".\src\GLHeaders.h"
+ RelativePath=".\src\MercuryNamedResource.h"
>
</File>
<File
- RelativePath=".\src\GLHelpers.h"
+ RelativePath=".\src\MercuryNode.cpp"
>
</File>
<File
- RelativePath=".\src\global.h"
+ RelativePath=".\src\MercuryNode.h"
>
</File>
<File
- RelativePath=".\src\HGMDLMesh.h"
+ RelativePath=".\src\MercuryPlane.cpp"
>
</File>
<File
- RelativePath=".\src\HGMDLModel.h"
+ RelativePath=".\src\MercuryPlane.h"
>
</File>
<File
- RelativePath=".\src\ImageLoader.h"
+ RelativePath=".\src\MercuryPrefs.cpp"
>
</File>
<File
- RelativePath=".\src\MAutoPtr.h"
+ RelativePath=".\src\MercuryPrefs.h"
>
</File>
<File
- RelativePath=".\src\MercuryAsset.h"
+ RelativePath=".\src\MercurySound.cpp"
>
</File>
<File
- RelativePath=".\src\MercuryBacktrace.h"
+ RelativePath=".\src\MercurySound.h"
>
</File>
<File
- RelativePath=".\src\MercuryCrash.h"
+ RelativePath=".\src\MercuryString.cpp"
>
</File>
<File
- RelativePath=".\src\MercuryFBO.h"
+ RelativePath=".\src\MercuryString.h"
>
</File>
<File
- RelativePath=".\src\MercuryFile.h"
+ RelativePath=".\src\MercuryTheme.cpp"
>
</File>
<File
- RelativePath=".\src\MercuryFileDriverDirect.h"
+ RelativePath=".\src\MercuryTheme.h"
>
</File>
<File
- RelativePath=".\src\MercuryFileDriverMem.h"
+ RelativePath=".\src\MercuryThreads.cpp"
>
</File>
<File
- RelativePath=".\src\MercuryFileDriverPacked.h"
+ RelativePath=".\src\MercuryThreads.h"
>
</File>
<File
- RelativePath=".\src\MercuryFileDriverZipped.h"
+ RelativePath=".\src\MercuryTimer.cpp"
>
</File>
<File
- RelativePath=".\src\MercuryHash.h"
+ RelativePath=".\src\MercuryTimer.h"
>
</File>
<File
- RelativePath=".\src\MercuryInput.h"
+ RelativePath=".\src\MercuryUtil.cpp"
>
</File>
<File
- RelativePath=".\src\MercuryList.h"
+ RelativePath=".\src\MercuryUtil.h"
>
</File>
<File
- RelativePath=".\src\MercuryMath.h"
+ RelativePath=".\src\MercuryVBO.cpp"
>
</File>
<File
- RelativePath=".\src\MercuryMatrix.h"
+ RelativePath=".\src\MercuryVBO.h"
>
</File>
<File
- RelativePath=".\src\MercuryMessageManager.h"
+ RelativePath=".\src\MercuryVector.h"
>
</File>
<File
- RelativePath=".\src\MercuryNamedResource.h"
+ RelativePath=".\src\MercuryVertex.cpp"
>
</File>
<File
- RelativePath=".\src\MercuryNode.h"
+ RelativePath=".\src\MercuryVertex.h"
>
</File>
<File
- RelativePath=".\src\MercuryPlane.h"
+ RelativePath=".\src\MercuryWindow.cpp"
>
</File>
<File
- RelativePath=".\src\MercuryPrefs.h"
+ RelativePath=".\src\MercuryWindow.h"
>
</File>
<File
- RelativePath=".\src\MercuryString.h"
+ RelativePath=".\src\MessageHandler.h"
>
</File>
<File
- RelativePath=".\src\MercuryTheme.h"
+ RelativePath=".\src\Mint.h"
>
</File>
<File
- RelativePath=".\src\MercuryThreads.h"
+ RelativePath=".\src\ModuleManager.cpp"
>
</File>
<File
- RelativePath=".\src\MercuryTimer.h"
+ RelativePath=".\src\ModuleManager.h"
>
</File>
<File
- RelativePath=".\src\MercuryUtil.h"
+ RelativePath=".\src\MQuaternion.cpp"
>
</File>
<File
- RelativePath=".\src\MercuryVBO.h"
+ RelativePath=".\src\MQuaternion.h"
>
</File>
<File
- RelativePath=".\src\MercuryVector.h"
+ RelativePath=".\src\MQueue.h"
>
</File>
<File
- RelativePath=".\src\MercuryVertex.h"
+ RelativePath=".\src\MScopedArray.h"
>
</File>
<File
- RelativePath=".\src\MercuryWindow.h"
+ RelativePath=".\src\MSemaphore.cpp"
>
</File>
<File
- RelativePath=".\src\MessageHandler.h"
+ RelativePath=".\src\MSemaphore.h"
>
</File>
<File
- RelativePath=".\src\Mint.h"
+ RelativePath=".\src\DataTypes\MTriangle.cpp"
>
</File>
<File
- RelativePath=".\src\ModuleManager.h"
+ RelativePath=".\src\DataTypes\MTriangle.h"
>
</File>
<File
- RelativePath=".\src\MQuaternion.h"
+ RelativePath=".\src\OGLExtensions.cpp"
>
</File>
<File
- RelativePath=".\src\MQueue.h"
+ RelativePath=".\src\OGLExtensions.h"
>
</File>
<File
- RelativePath=".\src\MScopedArray.h"
+ RelativePath=".\src\Orthographic.cpp"
>
</File>
<File
- RelativePath=".\src\MSemaphore.h"
+ RelativePath=".\src\Orthographic.h"
>
</File>
<File
- RelativePath=".\src\OGLExtensions.h"
+ RelativePath=".\src\PNGLoader.cpp"
>
</File>
<File
@@ -582,10 +580,18 @@
>
</File>
<File
+ RelativePath=".\src\Quad.cpp"
+ >
+ </File>
+ <File
RelativePath=".\src\Quad.h"
>
</File>
<File
+ RelativePath=".\src\RawImageData.cpp"
+ >
+ </File>
+ <File
RelativePath=".\src\RawImageData.h"
>
</File>
@@ -594,34 +600,86 @@
>
</File>
<File
+ RelativePath=".\src\RenderDeferredLights.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\RenderDeferredLights.h"
+ >
+ </File>
+ <File
+ RelativePath=".\src\RenderGraph.cpp"
+ >
+ </File>
+ <File
RelativePath=".\src\RenderGraph.h"
>
</File>
<File
+ RelativePath=".\src\Shader.cpp"
+ >
+ </File>
+ <File
RelativePath=".\src\Shader.h"
>
</File>
<File
+ RelativePath=".\src\StateChanger.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\src\StateChanger.h"
+ >
+ </File>
+ <File
+ RelativePath=".\src\stdint.h"
+ >
+ </File>
+ <File
+ RelativePath=".\src\Texture.cpp"
+ >
+ </File>
+ <File
RelativePath=".\src\Texture.h"
>
</File>
<File
+ RelativePath=".\src\TransformNode.cpp"
+ >
+ </File>
+ <File
RelativePath=".\src\TransformNode.h"
>
</File>
<File
+ RelativePath=".\src\UpdateThreader.cpp"
+ >
+ </File>
+ <File
RelativePath=".\src\UpdateThreader.h"
>
</File>
<File
+ RelativePath=".\src\Viewport.cpp"
+ >
+ </File>
+ <File
RelativePath=".\src\Viewport.h"
>
</File>
<File
+ RelativePath=".\src\Win32Window.cpp"
+ >
+ </File>
+ <File
RelativePath=".\src\Win32Window.h"
>
</File>
<File
+ RelativePath=".\src\XMLParser.cpp"
+ >
+ </File>
+ <File
RelativePath=".\src\XMLParser.h"
>
</File>
@@ -644,6 +702,34 @@
>
</File>
<File
+ RelativePath=".\modules\Cu2.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\modules\Cu2.h"
+ >
+ </File>
+ <File
+ RelativePath=".\src\MercuryLog.h"
+ >
+ </File>
+ <File
+ RelativePath=".\modules\ParticleEmitter.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\modules\ParticleEmitter.h"
+ >
+ </File>
+ <File
+ RelativePath=".\modules\Terrain.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\modules\Terrain.h"
+ >
+ </File>
+ <File
RelativePath=".\modules\TextNode.cpp"
>
</File>
@@ -651,6 +737,14 @@
RelativePath=".\modules\TextNode.h"
>
</File>
+ <File
+ RelativePath=".\modules\TextPlate.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\modules\TextPlate.h"
+ >
+ </File>
</Filter>
<File
RelativePath=".\scenegraph.xml"
Modified: Mercury2/modules/ParticleEmitter.cpp
===================================================================
--- Mercury2/modules/ParticleEmitter.cpp 2009-12-14 22:00:23 UTC (rev 629)
+++ Mercury2/modules/ParticleEmitter.cpp 2009-12-21 19:10:26 UTC (rev 630)
@@ -126,7 +126,7 @@
p->m_lifespan = m_particleMinLife;
- p->m_lifespan = (rand()%(int(m_particleMaxLife*1000) - int(m_particleMinLife*1000)))/1000.0f;
+ p->m_lifespan += (rand()%(int(m_particleMaxLife*1000) - int(m_particleMinLife*1000)))/1000.0f;
p->m_seed1 = rand()%100000;
p->m_seed2 = rand()%100000;
// +((rand()%((m_particleMaxLife*1000)-(m_particleMinLife*1000)))/1000.0f);
Modified: Mercury2/src/GLHeaders.h
===================================================================
--- Mercury2/src/GLHeaders.h 2009-12-14 22:00:23 UTC (rev 629)
+++ Mercury2/src/GLHeaders.h 2009-12-21 19:10:26 UTC (rev 630)
@@ -1,12 +1,11 @@
#ifndef GLHEADERS_H
#define GLHEADERS_H
-#include <configuration.h>
-
#ifdef WIN32
#include <windows.h>
#else
#define GL_GLEXT_PROTOTYPES
+#include <configuration.h>
#endif
#include <GL/gl.h>
Modified: Mercury2/src/MercuryMath.h
===================================================================
--- Mercury2/src/MercuryMath.h 2009-12-14 22:00:23 UTC (rev 629)
+++ Mercury2/src/MercuryMath.h 2009-12-21 19:10:26 UTC (rev 630)
@@ -3,8 +3,10 @@
#include <math.h>
#ifdef HGENGINE
+#ifndef WIN32
#include <configuration.h>
#endif
+#endif
#ifdef USE_SSE
#include <xmmintrin.h>
Modified: Mercury2/src/OGLExtensions.cpp
===================================================================
--- Mercury2/src/OGLExtensions.cpp 2009-12-14 22:00:23 UTC (rev 629)
+++ Mercury2/src/OGLExtensions.cpp 2009-12-21 19:10:26 UTC (rev 630)
@@ -32,6 +32,7 @@
PFNGLPROGRAMPARAMETERIEXTPROC glProgramParameteriEXT;
PFNGLGETACTIVEUNIFORMARBPROC glGetActiveUniformARB;
PFNGLUNIFORM1IARBPROC glUniform1iARB;
+PFNGLUNIFORM1FARBPROC glUniform1fARB;
PFNGLUNIFORM4FVARBPROC glUniform4fvARB;
PFNGLUNIFORM4IVARBPROC glUniform4ivARB;
@@ -88,6 +89,7 @@
EXTENSION( PFNGLPROGRAMPARAMETERIEXTPROC,glProgramParameteriEXT );
EXTENSION( PFNGLGETACTIVEUNIFORMARBPROC,glGetActiveUniformARB );
EXTENSION( PFNGLUNIFORM1IARBPROC,glUniform1iARB );
+EXTENSION( PFNGLUNIFORM1FARBPROC,glUniform1fARB );
EXTENSION( PFNGLUNIFORM4FVARBPROC,glUniform4fvARB );
EXTENSION( PFNGLUNIFORMMATRIX4FVARBPROC, glUniformMatrix4fvARB );
Modified: Mercury2/src/OGLExtensions.h
===================================================================
--- Mercury2/src/OGLExtensions.h 2009-12-14 22:00:23 UTC (rev 629)
+++ Mercury2/src/OGLExtensions.h 2009-12-21 19:10:26 UTC (rev 630)
@@ -27,6 +27,7 @@
extern PFNGLPROGRAMPARAMETERIEXTPROC glProgramParameteriEXT;
extern PFNGLGETACTIVEUNIFORMARBPROC glGetActiveUniformARB;
extern PFNGLUNIFORM1IARBPROC glUniform1iARB;
+extern PFNGLUNIFORM1FARBPROC glUniform1fARB;
extern PFNGLUNIFORM4FVARBPROC glUniform4fvARB;
extern PFNGLUNIFORM4IVARBPROC glUniform4ivARB;
extern PFNGLUNIFORMMATRIX4FVARBPROC glUniformMatrix4fvARB;
Modified: Mercury2/src/StateChanger.cpp
===================================================================
--- Mercury2/src/StateChanger.cpp 2009-12-14 22:00:23 UTC (rev 629)
+++ Mercury2/src/StateChanger.cpp 2009-12-21 19:10:26 UTC (rev 630)
@@ -143,10 +143,10 @@
REGISTER_STATECHANGE( DepthWrite );
//////////////////////////////////////STATE CHANGE CHUNK//////////////////////////////////////
-StateChangeRegister * StateChangeRegister::m_Instance;
StateChangeRegister & StateChangeRegister::Instance()
{
+ static StateChangeRegister* m_Instance = NULL;
if( !m_Instance )
m_Instance = new StateChangeRegister();
return *m_Instance;
@@ -286,7 +286,6 @@
MVector< MVector< MAutoPtr< StateChange > > > StateChanger::m_StateSet;
-
/****************************************************************************
* Copyright (C) 2008 - 2009 by Joshua Allen *
* Charles Lohr *
Modified: Mercury2/src/StateChanger.h
===================================================================
--- Mercury2/src/StateChanger.h 2009-12-14 22:00:23 UTC (rev 629)
+++ Mercury2/src/StateChanger.h 2009-12-21 19:10:26 UTC (rev 630)
@@ -27,6 +27,9 @@
class StateChangeRegister
{
public:
+ StateChangeRegister()
+ :m_iStateCount(0)
+ {}
static StateChangeRegister & Instance();
int RegisterGenerator( const MString & name, StateChange*(*gn)( const MVector< MString > &sParameters ) );
MAutoPtr< StateChange > Create( const MString & name, const MVector< MString > & sParameters );
@@ -35,7 +38,7 @@
int GetStateCount() { return m_iStateCount; }
private:
MHash< StateChange*(*)(const MVector< MString > &sParameters) > m_Generators;
- static StateChangeRegister * m_Instance;
+// static StateChangeRegister * m_Instance;
MHash< int > m_hStateIDs;
int m_iStateCount;
};
Modified: Mercury2/src/global.h
===================================================================
--- Mercury2/src/global.h 2009-12-14 22:00:23 UTC (rev 629)
+++ Mercury2/src/global.h 2009-12-21 19:10:26 UTC (rev 630)
@@ -3,8 +3,9 @@
#ifdef WIN32
#pragma warning( disable : 4100 )
+#else
+#include <configuration.h>
#endif
-#include <configuration.h>
#include <Mint.h>
-#endif
+#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
