Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Linux compile fixes

Browse Source 
Reapplies a fix from c3e593c20e

Updates libraries (FMOD Studio 1.08.01)

Don't use boost chrono, the standard has chrono!
This commit is contained in:
Lirusaito
2016-05-02 21:17:36 -04:00
parent f0a6ffcabf
commit f14ad54c84
9 changed files with 18 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llrender/llglheaders.h
View File

@@ -379,6 +379,8 @@ extern PFNGLGETQUERYIVARBPROC glGetQueryivARB;
extern PFNGLGETQUERYOBJECTIVARBPROC glGetQueryObjectivARB;
extern PFNGLGETQUERYOBJECTUIVARBPROC glGetQueryObjectuivARB;
extern PFNGLGETQUERYOBJECTUI64VEXTPROC glGetQueryObjectui64vEXT;
// GL_ARB_point_parameters
extern PFNGLPOINTPARAMETERFARBPROC glPointParameterfARB;
extern PFNGLPOINTPARAMETERFVARBPROC glPointParameterfvARB;

3
indra/llrender/llshadermgr.cpp
View File

@@ -882,7 +882,8 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade
{ //dump every 128 lines
LL_WARNS("ShaderLoading") << "\n" << ostr.str() << LL_ENDL;
ostr = std::stringstream();
ostr.clear();
ostr.str(LLStringUtil::null);
}
}