diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-06-03 13:59:11 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-06-03 13:59:11 -0400 |
| commit | bad06f68fc3122b5b83f21f1fa8bc7e7ec53bfc8 (patch) | |
| tree | cdf1bdc9f6c665eba22645ce4a1fdf7c34d55321 /indra/lscript/lscript_library | |
| parent | 211d1dfb770aa029d77cd231815a5848640b54a6 (diff) | |
| parent | af8c2bc94868e056908b4ae2fc285925cd68b56b (diff) | |
Merge. Refresh from viewer-release merged with in-progress work.
Diffstat (limited to 'indra/lscript/lscript_library')
| -rwxr-xr-x[-rw-r--r--] | indra/lscript/lscript_library/CMakeLists.txt | 3 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/lscript/lscript_library/lscript_alloc.cpp | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/lscript/lscript_library/lscript_export.cpp | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/lscript/lscript_library/lscript_library.cpp | 0 |
4 files changed, 3 insertions, 0 deletions
diff --git a/indra/lscript/lscript_library/CMakeLists.txt b/indra/lscript/lscript_library/CMakeLists.txt index f6bc67a994..5af850c41b 100644..100755 --- a/indra/lscript/lscript_library/CMakeLists.txt +++ b/indra/lscript/lscript_library/CMakeLists.txt @@ -28,5 +28,8 @@ include_directories( ${LLMATH_INCLUDE_DIRS} ${LSCRIPT_INCLUDE_DIRS} ) +include_directories(SYSTEM + ${LLCOMMON_SYSTEM_INCLUDE_DIRS} + ) add_library (lscript_library ${lscript_library_SOURCE_FILES}) diff --git a/indra/lscript/lscript_library/lscript_alloc.cpp b/indra/lscript/lscript_library/lscript_alloc.cpp index 92b1ab70fb..92b1ab70fb 100644..100755 --- a/indra/lscript/lscript_library/lscript_alloc.cpp +++ b/indra/lscript/lscript_library/lscript_alloc.cpp diff --git a/indra/lscript/lscript_library/lscript_export.cpp b/indra/lscript/lscript_library/lscript_export.cpp index 0ed85e3686..0ed85e3686 100644..100755 --- a/indra/lscript/lscript_library/lscript_export.cpp +++ b/indra/lscript/lscript_library/lscript_export.cpp diff --git a/indra/lscript/lscript_library/lscript_library.cpp b/indra/lscript/lscript_library/lscript_library.cpp index 7ffe53a307..7ffe53a307 100644..100755 --- a/indra/lscript/lscript_library/lscript_library.cpp +++ b/indra/lscript/lscript_library/lscript_library.cpp |