livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

meow-7.2.2
Nyx Linden 2012-09-20 18:03:45 +00:00
parent e9e459c89c 8edf8b002d
commit c708fb892c
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
autobuild.xml
View File

@ -1432,9 +1432,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>021e538c261e1a74c86bbe3b690a8469</string>
<string>7c908e4fc031e13e65484d8cfd9a0be5</string>
<key>url</key>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-mesa/rev/264880/arch/Linux/installer/mesa-7.11.1-linux-20120918.tar.bz2</string>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-mesa/rev/264880/arch/Linux/installer/mesa-7.11.1-linux-20120920.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>

24
indra/llrender/CMakeLists.txt
View File

@ -89,7 +89,6 @@ if ((SERVER OR BAKING) AND NOT WINDOWS AND NOT DARWIN)
llrender
)
set_source_files_properties(
${server_SOURCE_FILES}
PROPERTIES
@ -99,6 +98,18 @@ if ((SERVER OR BAKING) AND NOT WINDOWS AND NOT DARWIN)
${llrender_SOURCE_FILES}
${server_SOURCE_FILES}
)
target_link_libraries(llrenderheadless
${LLCOMMON_LIBRARIES}
${LLIMAGE_LIBRARIES}
${LLMATH_LIBRARIES}
${LLRENDER_LIBRARIES}
${LLVFS_LIBRARIES}
${LLXML_LIBRARIES}
${LLVFS_LIBRARIES}
${LLWINDOW_LIBRARIES}
${OPENGL_LIBRARIES})
endif ((SERVER OR BAKING) AND NOT WINDOWS AND NOT DARWIN)
add_library (llrender ${llrender_SOURCE_FILES})
@ -116,14 +127,3 @@ target_link_libraries(llrender
${FREETYPE_LIBRARIES}
${OPENGL_LIBRARIES})
target_link_libraries(llrenderheadless
${LLCOMMON_LIBRARIES}
${LLIMAGE_LIBRARIES}
${LLMATH_LIBRARIES}
${LLRENDER_LIBRARIES}
${LLVFS_LIBRARIES}
${LLXML_LIBRARIES}
${LLVFS_LIBRARIES}
${LLWINDOW_LIBRARIES}
${OPENGL_LIBRARIES})