diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-09-09 16:55:54 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-09-09 16:55:54 -0500 |
| commit | ac7ac2adec18ba3ba429a15fc3bf2750e92360e8 (patch) | |
| tree | 56ac5e156977cbd0a8877fdc06e4e035e47084c0 | |
| parent | 97474e38fef1bf4ee3d3b5b0190f711a4980d7be (diff) | |
GLOD update for windows, poke CMakeLists.txt to copy shared libs over if glod is touched.
| -rw-r--r-- | indra/newview/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | install.xml | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 304ef4bd59..73f752b218 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1469,6 +1469,9 @@ if (WINDOWS) ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/libapr-1.dll ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/libaprutil-1.dll ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/libapriconv-1.dll + ${SHARED_LIB_STAGING_DIR}/Release/glod.dll + ${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/glod.dll + ${SHARED_LIB_STAGING_DIR}/Debug/glod.dll ${SHARED_LIB_STAGING_DIR}/Release/openjpeg.dll ${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/openjpeg.dll ${SHARED_LIB_STAGING_DIR}/Debug/openjpegd.dll diff --git a/install.xml b/install.xml index ac4b7a0457..074147c027 100644 --- a/install.xml +++ b/install.xml @@ -70,9 +70,9 @@ <key>windows</key> <map> <key>md5sum</key> - <string>39fae44d406aa56a0b3d00f5433bbf15</string> + <string>5f993f8092ddf4424ec3133dae9424dd</string> <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/GLOD-1.0pre4-windows-20100129.tar.bz2</uri> + <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glod-1.0pre4-windows-20100908a.tar.bz2</uri> </map> </map> </map> @@ -1011,9 +1011,9 @@ anguage Infrstructure (CLI) international standard</string> <key>windows</key> <map> <key>md5sum</key> - <string>afd03c92ac261134237b648896c5e537</string> + <string>a68bd49c01710edc4b9c902376844317</string> <key>url</key> - <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/llconvexdecomposition-0.1-windows-20100628.tar.bz2</uri> + <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/llconvexdecomposition-0.1-windows-20100909.tar.bz2</uri> </map> <key>linux</key> <map> |