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

Merge branch 'V2MultiWear' of bitbucket.org:Lirusaito/singularityviewer into AltCompilers

Browse Source 
Conflicts:
	indra/cmake/00-Common.cmake
	indra/newview/llvovolume.cpp
This commit is contained in:
Drake Arconis
2012-07-02 20:16:56 +00:00
parent ece9dda7b4 e6689f830a
commit c464a8da30
93 changed files with 3912 additions and 2204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/cmake/00-Common.cmake
View File

@@ -330,6 +330,10 @@ endif (STANDALONE)
if(1 EQUAL 1)
add_definitions(-DOPENSIM_RULES=1)
add_definitions(-DMESH_ENABLED=1)
add_definitions(-DENABLE_CLASSIC_CLOUDS=1)
if (NOT "$ENV{SHY_MOD}" STREQUAL "")
add_definitions(-DSHY_MOD=1)
endif (NOT "$ENV{SHY_MOD}" STREQUAL "")
endif(1 EQUAL 1)
SET( CMAKE_EXE_LINKER_FLAGS_RELEASESSE2