diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-12-18 09:48:44 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-12-18 09:48:44 -0500 |
| commit | e7fca4af5064911dbec311770d953b8ae93b63d8 (patch) | |
| tree | 90e962dc90463d480b44137c24cb6970bd119eb3 /indra/cmake | |
| parent | 7b2045e734d802839a86a874098be77d41acba1c (diff) | |
| parent | df5006eac948fff1104a15b8fa09f4ab53501ca2 (diff) | |
merge latest changes for windows
Diffstat (limited to 'indra/cmake')
| -rwxr-xr-x | indra/cmake/Havok.cmake | 2 | ||||
| -rwxr-xr-x | indra/cmake/JsonCpp.cmake | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/cmake/Havok.cmake b/indra/cmake/Havok.cmake index fceca13962..99e7334118 100755 --- a/indra/cmake/Havok.cmake +++ b/indra/cmake/Havok.cmake @@ -3,7 +3,7 @@ include(Prebuilt) if(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED) set(${CMAKE_CURRENT_LIST_FILE}_INCLUDED "YES") -use_prebuilt_binary(havok_source) +use_prebuilt_binary(havok-source) set(Havok_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/havok/Source) list(APPEND Havok_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/havok/Demo) diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake index bf2d470269..079619adf8 100755 --- a/indra/cmake/JsonCpp.cmake +++ b/indra/cmake/JsonCpp.cmake @@ -11,8 +11,8 @@ else (USESYSTEMLIBS) use_prebuilt_binary(jsoncpp) if (WINDOWS) set(JSONCPP_LIBRARIES - debug json_libmtd.lib - optimized json_libmt) + debug json_libmdd.lib + optimized json_libmd.lib) elseif (DARWIN) set(JSONCPP_LIBRARIES libjson_darwin_libmt.a) elseif (LINUX) |