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

Fixing Win compile. (Partial)

Browse Source
This commit is contained in:
Shyotl
2011-05-08 12:46:42 -05:00
committed by Siana Gearz
parent e2e576e550
commit 1a099167ae
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/cmake/ViewerMiscLibs.cmake
View File

@@ -2,9 +2,9 @@
include(Prebuilt) include(Prebuilt)
if (NOT STANDALONE) if (NOT STANDALONE)
use_prebuilt_binary(libuuid)
use_prebuilt_binary(vivox) use_prebuilt_binary(vivox)
if(LINUX) if(LINUX)
use_prebuilt_binary(libuuid)
if (${ARCH} STREQUAL "x86_64") if (${ARCH} STREQUAL "x86_64")
use_prebuilt_binary(32bitcompatibilitylibs) use_prebuilt_binary(32bitcompatibilitylibs)
endif (${ARCH} STREQUAL "x86_64") endif (${ARCH} STREQUAL "x86_64")

2
indra/llcommon/aithreadsafe.h
View File

@@ -288,7 +288,7 @@ protected:
//! Constructor used by AIWriteAccess. //! Constructor used by AIWriteAccess.
AIReadAccess(AIThreadSafe<T>& wrapper, state_type state) : AIReadAccessConst<T>(wrapper, state) { } AIReadAccess(AIThreadSafe<T>& wrapper, state_type state) : AIReadAccessConst<T>(wrapper, state) { }
friend class AIWriteAccess<T>; friend struct AIWriteAccess<T>;
}; };
/** /**