All your codebase are belong to us.

2014-08-22 00:15:09 -04:00
parent 2a64c07215
commit 948ebe5213
110 changed files with 661 additions and 611 deletions
--- a/indra/cmake/EXPAT.cmake
+++ b/indra/cmake/EXPAT.cmake
@@ -9,7 +9,11 @@ if (STANDALONE)
 else (STANDALONE)
    use_prebuilt_binary(expat)
    if (WINDOWS)
-        set(EXPAT_LIBRARIES libexpatMT)
+        if (MSVC12)
+          set(EXPAT_LIBRARIES expat)
+        else (MSVC12)
+          set(EXPAT_LIBRARIES libexpatMT)
+        endif (MSVC12)
    else (WINDOWS)
        set(EXPAT_LIBRARIES expat)
    endif (WINDOWS)