TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes for dedicated build on linux.

Browse source 
Thx @Bloodknigh for Signal fix.
This commit is contained in:
LuisAntonRebollo 2014-05-30 12:35:39 +02:00
parent ef4e7ec975
commit 6450294855
8 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/core/util/tSignal.h
View file

@ -149,7 +149,7 @@ public:
}
protected:
friend class SignalSig;
friend class SignalBaseT< Signature >;
void _setSignal(SignalSig *sig)
{

2
Engine/source/lighting/advanced/advancedLightingFeatures.cpp
View file

@ -55,7 +55,7 @@ void AdvancedLightingFeatures::registerFeatures( const GFXFormat &prepassTargetF
if(GFX->getAdapterType() == OpenGL)
{
#if defined( TORQUE_OS_MAC ) || defined( TORQUE_OS_LINUX )
cond = new GBufferConditionerGLSL( prepassTargetFormat );
cond = new GBufferConditionerGLSL( prepassTargetFormat, GBufferConditionerGLSL::ViewSpace );
FEATUREMGR->registerFeature(MFT_PrePassConditioner, cond);
FEATUREMGR->registerFeature(MFT_RTLighting, new DeferredRTLightingFeatGLSL());
FEATUREMGR->registerFeature(MFT_NormalMap, new DeferredBumpFeatGLSL());

1
Engine/source/materials/miscShdrDat.h
View file

@ -41,6 +41,7 @@ enum RegisterType
RT_NORMAL,
RT_BINORMAL,
RT_TANGENT,
RT_TANGENTW,
RT_COLOR,
RT_TEXCOORD,
RT_VPOS,

2
Engine/source/platform/types.gcc.h
View file

@ -60,7 +60,7 @@ typedef unsigned long long U64;
# define TORQUE_OS_WIN
# define TORQUE_OS_WIN64
# include "platform/types.win.h"
#if defined(__WIN32__) || defined(_WIN32)
#elif defined(__WIN32__) || defined(_WIN32)
# define TORQUE_OS_STRING "Win32"
# define TORQUE_OS_WIN
# define TORQUE_OS_WIN32

4
Engine/source/platformPOSIX/posixVolume.cpp
View file

@ -251,7 +251,7 @@ Path PosixFile::getName() const
return _path;
}
FileNode::Status PosixFile::getStatus() const
FileNode::NodeStatus PosixFile::getStatus() const
{
return _status;
}
@ -536,7 +536,7 @@ bool PosixDirectory::getAttributes(Attributes* attr)
return true;
}
FileNode::Status PosixDirectory::getStatus() const
FileNode::NodeStatus PosixDirectory::getStatus() const
{
return _status;
}

8
Engine/source/platformPOSIX/posixVolume.h
View file

@ -68,7 +68,7 @@ class PosixFile: public File
Path _path;
String _name;
FILE* _handle;
Status _status;
NodeStatus _status;
PosixFile(const Path& path,String name);
bool _updateInfo();
@ -78,7 +78,7 @@ public:
~PosixFile();
Path getName() const;
Status getStatus() const;
NodeStatus getStatus() const;
bool getAttributes(Attributes*);
U32 getPosition();
@ -103,7 +103,7 @@ class PosixDirectory: public Directory
Path _path;
String _name;
DIR* _handle;
Status _status;
NodeStatus _status;
PosixDirectory(const Path& path,String name);
void _updateStatus();
@ -112,7 +112,7 @@ public:
~PosixDirectory();
Path getName() const;
Status getStatus() const;
NodeStatus getStatus() const;
bool getAttributes(Attributes*);
bool open();

18
Engine/source/platformX86UNIX/x86UNIXFileio.cpp
View file

@ -469,7 +469,7 @@ bool dPathCopy(const char *fromName, const char *toName, bool nooverwrite)
// Sets capability appropriate to the openMode.
// Returns the currentStatus of the file.
//-----------------------------------------------------------------------------
File::Status File::open(const char *filename, const AccessMode openMode)
File::FileStatus File::open(const char *filename, const AccessMode openMode)
{
AssertFatal(NULL != filename, "File::open: NULL filename");
AssertWarn(NULL == handle, "File::open: handle already valid");
@ -584,7 +584,7 @@ bool dPathCopy(const char *fromName, const char *toName, bool nooverwrite)
//
// Returns the currentStatus of the file.
//-----------------------------------------------------------------------------
File::Status File::setPosition(S32 position, bool absolutePos)
File::FileStatus File::setPosition(S32 position, bool absolutePos)
{
AssertFatal(Closed != currentStatus, "File::setPosition: file closed");
AssertFatal(NULL != handle, "File::setPosition: invalid file handle");
@ -645,7 +645,7 @@ bool dPathCopy(const char *fromName, const char *toName, bool nooverwrite)
// It is an error to flush a read-only file.
// Returns the currentStatus of the file.
//-----------------------------------------------------------------------------
File::Status File::flush()
File::FileStatus File::flush()
{
AssertFatal(Closed != currentStatus, "File::flush: file closed");
AssertFatal(NULL != handle, "File::flush: invalid file handle");
@ -662,7 +662,7 @@ bool dPathCopy(const char *fromName, const char *toName, bool nooverwrite)
//
// Returns the currentStatus
//-----------------------------------------------------------------------------
File::Status File::close()
File::FileStatus File::close()
{
// if the handle is non-NULL, close it if necessary and free it
if (NULL != handle)
@ -684,7 +684,7 @@ bool dPathCopy(const char *fromName, const char *toName, bool nooverwrite)
//-----------------------------------------------------------------------------
// Self-explanatory.
//-----------------------------------------------------------------------------
File::Status File::getStatus() const
File::FileStatus File::getStatus() const
{
return currentStatus;
}
@ -692,7 +692,7 @@ bool dPathCopy(const char *fromName, const char *toName, bool nooverwrite)
//-----------------------------------------------------------------------------
// Sets and returns the currentStatus when an error has been encountered.
//-----------------------------------------------------------------------------
File::Status File::setStatus()
File::FileStatus File::setStatus()
{
Con::printf("File IO error: %s", strerror(errno));
return currentStatus = IOError;
@ -701,7 +701,7 @@ bool dPathCopy(const char *fromName, const char *toName, bool nooverwrite)
//-----------------------------------------------------------------------------
// Sets and returns the currentStatus to status.
//-----------------------------------------------------------------------------
File::Status File::setStatus(File::Status status)
File::FileStatus File::setStatus(File::FileStatus status)
{
return currentStatus = status;
}
@ -712,7 +712,7 @@ bool dPathCopy(const char *fromName, const char *toName, bool nooverwrite)
// The number of bytes read is available in bytesRead if a non-Null pointer is
// provided.
//-----------------------------------------------------------------------------
File::Status File::read(U32 size, char *dst, U32 *bytesRead)
File::FileStatus File::read(U32 size, char *dst, U32 *bytesRead)
{
#ifdef DEBUG
// fprintf(stdout,"reading %d bytes\n",size);fflush(stdout);
@ -770,7 +770,7 @@ bool dPathCopy(const char *fromName, const char *toName, bool nooverwrite)
// The number of bytes written is available in bytesWritten if a non-Null
// pointer is provided.
//-----------------------------------------------------------------------------
File::Status File::write(U32 size, const char *src, U32 *bytesWritten)
File::FileStatus File::write(U32 size, const char *src, U32 *bytesWritten)
{
// JMQ: despite the U32 parameters, the maximum filesize supported by this
// function is probably the max value of S32, due to the unix syscall

4
Engine/source/shaderGen/GLSL/shaderCompGLSL.h
View file

@ -40,6 +40,7 @@ public:
virtual void reset();
virtual void sortVars();
virtual void print( Stream &stream) {} // TODO OPENGL temporal fix for dedicated build on Linux
virtual void print( Stream &stream, bool isVerterShader );
void printStructDefines( Stream &stream, bool in );
virtual void printOnMain( Stream &stream, bool isVerterShader );
@ -55,6 +56,7 @@ public:
virtual void reset();
virtual void sortVars();
virtual void print( Stream &stream) {} // TODO OPENGL temporal fix for dedicated build on Linux
virtual void print( Stream &stream, bool isVerterShader );
virtual void printOnMain( Stream &stream, bool isVerterShader );
};
@ -73,4 +75,4 @@ public:
virtual void print( Stream &stream, bool isVerterShader );
};
#endif // _SHADERCOMP_GLSL_H_
#endif // _SHADERCOMP_GLSL_H_