diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-08-24 12:42:38 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-08-24 12:42:38 -0700 |
| commit | f6d0f9952b19c5a41a63accd3aa265b30d982853 (patch) | |
| tree | 6ea0c4f8f1464574a10b224053401829d9951330 | |
| parent | 940737802d7edbdae5d411839fd374570b8b4519 (diff) | |
Modified llkdu pointer for all platforms, cleaned up unused kdu-binaries references, fixed llkdu cmake to simply point to lib and build
| -rw-r--r-- | indra/cmake/LLKDU.cmake | 15 | ||||
| -rw-r--r-- | install.xml | 48 |
2 files changed, 5 insertions, 58 deletions
diff --git a/indra/cmake/LLKDU.cmake b/indra/cmake/LLKDU.cmake index fbe410c25f..27c8ada686 100644 --- a/indra/cmake/LLKDU.cmake +++ b/indra/cmake/LLKDU.cmake @@ -3,18 +3,5 @@ include(Prebuilt) if (INSTALL_PROPRIETARY AND NOT STANDALONE) use_prebuilt_binary(kdu) - if (EXISTS ${LIBS_CLOSED_DIR}/llkdu) - if (WINDOWS) - set(KDU_LIBRARY debug kdu_cored optimized kdu_core) - else (WINDOWS) - set(KDU_LIBRARY kdu) - endif (WINDOWS) - - set(KDU_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) - - set(LLKDU_LIBRARY llkdu) - set(LLKDU_STATIC_LIBRARY llkdu_static) - set(LLKDU_LIBRARIES ${LLKDU_LIBRARY}) - set(LLKDU_STATIC_LIBRARIES ${LLKDU_STATIC_LIBRARY}) - endif (EXISTS ${LIBS_CLOSED_DIR}/llkdu) + set(LLKDU_LIBRARY llkdu) endif (INSTALL_PROPRIETARY AND NOT STANDALONE) diff --git a/install.xml b/install.xml index 435a5611f6..3a9dc5f6d1 100644 --- a/install.xml +++ b/install.xml @@ -790,23 +790,16 @@ <key>darwin</key> <map> <key>md5sum</key> - <string>3b40e7170dea82c1443e8d90cd44a13d</string> + <string>ae18dd120807a46ac961b881a631ad94</string> <key>url</key> - <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/kdu-4.2.1-darwin-20080926.tar.bz2</uri> + <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/indra_private-2.1.1-darwin-20100820.tar.bz2</uri> </map> <key>linux</key> <map> <key>md5sum</key> - <string>a6d2f0995c25d7f53bd12b8ec0d6b462</string> + <string>b379063f5f03374f85620e87ce48e497</string> <key>url</key> - <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/kdu-4.2.1-linux-20080930.tar.bz2</uri> - </map> - <key>linux64</key> - <map> - <key>md5sum</key> - <string>f4e2e2b3440594527729a8c85119e508</string> - <key>url</key> - <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/kdu-5.2.1-linux64-20080926.tar.bz2</uri> + <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/indra_private-2.1.1-linux-20100820.tar.bz2</uri> </map> <key>windows</key> <map> @@ -817,39 +810,6 @@ </map> </map> </map> - <key>kdu-binaries</key> - <map> - <key>copyright</key> - <string>see kdu</string> - <key>description</key> - <string>see kdu</string> - <key>license</key> - <string>kdu</string> - <key>packages</key> - <map> - <key>darwin</key> - <map> - <key>md5sum</key> - <string>480fbeeb47c9b9c4a2f947e310c9821c</string> - <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/kdu-binaries-5.2.1-darwin-20080617.tar.bz2</uri> - </map> - <key>linux</key> - <map> - <key>md5sum</key> - <string>ca87644e377a6cf16db4ba6dbd2f8689</string> - <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/kdu-binaries-5.2.1-linux-20080617.tar.bz2</uri> - </map> - <key>windows</key> - <map> - <key>md5sum</key> - <string>c4cf53deda9148549e6534a98b56e866</string> - <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/kdu-binaries-4.2-windows-20080723.tar.bz2</uri> - </map> - </map> - </map> <key>libmono</key> <map> <key>copyright</key> |