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/FreeType.cmake
+++ b/indra/cmake/FreeType.cmake
@@ -11,7 +11,11 @@ else (STANDALONE)
    set(FREETYPE_INCLUDE_DIRS
        ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
  else (LINUX)
-    set(FREETYPE_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+    if(MSVC12)
+      set(FREETYPE_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/freetype2)
+    else(MSVC12)
+      set(FREETYPE_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+	endif (MSVC12)
  endif (LINUX)

  set(FREETYPE_LIBRARIES freetype)