diff options
| author | Kelly Washington <kelly@lindenlab.com> | 2013-05-03 21:48:17 +0000 |
|---|---|---|
| committer | Kelly Washington <kelly@lindenlab.com> | 2013-05-03 21:48:17 +0000 |
| commit | 06f9f7b2d9d867934d952ac7500711c25f346c1e (patch) | |
| tree | 5fdac0288bf1fb02b640394c6630fdc42f3ccc83 /indra/linux_crash_logger | |
| parent | 8d0d645cd66e43a104089729685c3aa6c8c18917 (diff) | |
| parent | 06f5872741d2ba5e5197ba7861c946b18ccf27ab (diff) | |
merge
Diffstat (limited to 'indra/linux_crash_logger')
| -rwxr-xr-x[-rw-r--r--] | indra/linux_crash_logger/CMakeLists.txt | 3 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/linux_crash_logger/linux_crash_logger.cpp | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/linux_crash_logger/llcrashloggerlinux.cpp | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/linux_crash_logger/llcrashloggerlinux.h | 0 |
4 files changed, 3 insertions, 0 deletions
diff --git a/indra/linux_crash_logger/CMakeLists.txt b/indra/linux_crash_logger/CMakeLists.txt index e0d0c9fc69..41b92b00e0 100644..100755 --- a/indra/linux_crash_logger/CMakeLists.txt +++ b/indra/linux_crash_logger/CMakeLists.txt @@ -12,6 +12,7 @@ include(LLVFS) include(LLXML) include(Linking) include(UI) +include(FreeType) include_directories( ${LLCOMMON_INCLUDE_DIRS} @@ -19,6 +20,7 @@ include_directories( ${LLMATH_INCLUDE_DIRS} ${LLVFS_INCLUDE_DIRS} ${LLXML_INCLUDE_DIRS} + ${FREETYPE_INCLUDE_DIRS} ) include_directories(SYSTEM ${LLCOMMON_SYSTEM_INCLUDE_DIRS} @@ -57,6 +59,7 @@ target_link_libraries(linux-crash-logger ${LLCOMMON_LIBRARIES} ${UI_LIBRARIES} ${DB_LIBRARIES} + ${FREETYPE_LIBRARIES} ) add_custom_target(linux-crash-logger-target ALL diff --git a/indra/linux_crash_logger/linux_crash_logger.cpp b/indra/linux_crash_logger/linux_crash_logger.cpp index 99d0ad7e14..99d0ad7e14 100644..100755 --- a/indra/linux_crash_logger/linux_crash_logger.cpp +++ b/indra/linux_crash_logger/linux_crash_logger.cpp diff --git a/indra/linux_crash_logger/llcrashloggerlinux.cpp b/indra/linux_crash_logger/llcrashloggerlinux.cpp index 62465f9937..62465f9937 100644..100755 --- a/indra/linux_crash_logger/llcrashloggerlinux.cpp +++ b/indra/linux_crash_logger/llcrashloggerlinux.cpp diff --git a/indra/linux_crash_logger/llcrashloggerlinux.h b/indra/linux_crash_logger/llcrashloggerlinux.h index dae6c46651..dae6c46651 100644..100755 --- a/indra/linux_crash_logger/llcrashloggerlinux.h +++ b/indra/linux_crash_logger/llcrashloggerlinux.h |