diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2012-09-20 18:03:45 +0000 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2012-09-20 18:03:45 +0000 |
| commit | c708fb892c7d934c917a2c868644e626f5a7da14 (patch) | |
| tree | 34f4c7fc44608a64b8029c39b5c3c50aec81c029 | |
| parent | e9e459c89cdfc57f32ffc7c421e01f43348f3b6c (diff) | |
| parent | 8edf8b002db02af0abca1b06802bc0041f25c379 (diff) | |
merge
| -rw-r--r-- | autobuild.xml | 4 | ||||
| -rw-r--r-- | indra/llrender/CMakeLists.txt | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/autobuild.xml b/autobuild.xml index 81969ab750..63f281f9b9 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -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> diff --git a/indra/llrender/CMakeLists.txt b/indra/llrender/CMakeLists.txt index 638ab23bd6..f31446924f 100644 --- a/indra/llrender/CMakeLists.txt +++ b/indra/llrender/CMakeLists.txt @@ -89,7 +89,6 @@ if ((SERVER OR BAKING) AND NOT WINDOWS AND NOT DARWIN) llrender ) - set_source_files_properties( ${server_SOURCE_FILES} PROPERTIES @@ -99,12 +98,8 @@ if ((SERVER OR BAKING) AND NOT WINDOWS AND NOT DARWIN) ${llrender_SOURCE_FILES} ${server_SOURCE_FILES} ) -endif ((SERVER OR BAKING) AND NOT WINDOWS AND NOT DARWIN) -add_library (llrender ${llrender_SOURCE_FILES}) -# Libraries on which this library depends, needed for Linux builds -# Sort by high-level to low-level -target_link_libraries(llrender +target_link_libraries(llrenderheadless ${LLCOMMON_LIBRARIES} ${LLIMAGE_LIBRARIES} ${LLMATH_LIBRARIES} @@ -113,10 +108,14 @@ target_link_libraries(llrender ${LLXML_LIBRARIES} ${LLVFS_LIBRARIES} ${LLWINDOW_LIBRARIES} - ${FREETYPE_LIBRARIES} ${OPENGL_LIBRARIES}) -target_link_libraries(llrenderheadless +endif ((SERVER OR BAKING) AND NOT WINDOWS AND NOT DARWIN) + +add_library (llrender ${llrender_SOURCE_FILES}) +# Libraries on which this library depends, needed for Linux builds +# Sort by high-level to low-level +target_link_libraries(llrender ${LLCOMMON_LIBRARIES} ${LLIMAGE_LIBRARIES} ${LLMATH_LIBRARIES} @@ -125,5 +124,6 @@ target_link_libraries(llrenderheadless ${LLXML_LIBRARIES} ${LLVFS_LIBRARIES} ${LLWINDOW_LIBRARIES} + ${FREETYPE_LIBRARIES} ${OPENGL_LIBRARIES}) |