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

Merge branch 'AltCompilers' of https://github.com/LightDrake/SingularityViewer

Browse Source
This commit is contained in:
Lirusaito
2012-08-10 23:30:56 -04:00
parent 0770150455 0be43cf1c2
commit fda34fea46
4 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llmath/lloctree.h
View File

@@ -457,7 +457,7 @@ public:
mDataEnd = NULL; mDataEnd = NULL;
} }
notifyRemoval(data); this->notifyRemoval(data);
checkAlive(); checkAlive();
} }

7
indra/llmessage/llcurl.cpp
View File

@@ -199,8 +199,9 @@ void LLCurl::Responder::completedHeader(U32 status, const std::string& reason, c
} }
namespace boost // DONT UNCOMMENT THIS IT BREAKS GCC47
{ //namespace boost
//{
void intrusive_ptr_add_ref(LLCurl::Responder* p) void intrusive_ptr_add_ref(LLCurl::Responder* p)
{ {
++p->mReferenceCount; ++p->mReferenceCount;
@@ -213,7 +214,7 @@ namespace boost
delete p; delete p;
} }
} }
}; //};
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////

7
indra/llmessage/llcurl.h
View File

@@ -304,11 +304,12 @@ private:
easy_free_list_t mEasyFreeList; easy_free_list_t mEasyFreeList;
}; };
namespace boost // DONT UNCOMMENT BREAKS GCC47
{ //namespace boost
//{
void intrusive_ptr_add_ref(LLCurl::Responder* p); void intrusive_ptr_add_ref(LLCurl::Responder* p);
void intrusive_ptr_release(LLCurl::Responder* p); void intrusive_ptr_release(LLCurl::Responder* p);
}; //};
class LLCurlRequest class LLCurlRequest

10
indra/newview/viewer_manifest.py
View File

@@ -854,6 +854,16 @@ class Linux_x86_64Manifest(LinuxManifest):
self.path("libopenal.so*") self.path("libopenal.so*")
self.path("libalut.so*") self.path("libalut.so*")
if self.args['extra_libraries'] != None:
print self.args['extra_libraries']
path_list = self.args['extra_libraries'].split('|')
for path in path_list:
path = os.path.realpath(path)
path_pair = path.rsplit('/', 1)
if self.prefix(src=path_pair[0], dst="lib64"):
self.path(path_pair[1])
self.end_prefix()
self.end_prefix("lib64") self.end_prefix("lib64")
# Vivox runtimes and libs # Vivox runtimes and libs