diff options
author | Geenz <geenz@geenzo.com> | 2013-05-13 22:22:51 -0400 |
---|---|---|
committer | Geenz <geenz@geenzo.com> | 2013-05-13 22:22:51 -0400 |
commit | 3779e51bfc2010877960d11b463c7316514bf991 (patch) | |
tree | ab528a6e7f78f136f9d0f0f7e939264897a44ae1 /indra/llkdu | |
parent | b27899ee0e035ebd4072a5e6162678f2afe81053 (diff) | |
parent | 4dd245055f3417d8f8fb611a198ed5671dbce292 (diff) |
Merged with https://bitbucket.org/lindenlab/viewer-beta
Diffstat (limited to 'indra/llkdu')
-rwxr-xr-x[-rw-r--r--] | indra/llkdu/CMakeLists.txt | 5 | ||||
-rwxr-xr-x[-rw-r--r--] | indra/llkdu/llimagej2ckdu.cpp | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | indra/llkdu/llimagej2ckdu.h | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | indra/llkdu/llkdumem.cpp | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | indra/llkdu/llkdumem.h | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | indra/llkdu/tests/llimagej2ckdu_test.cpp | 0 |
6 files changed, 4 insertions, 1 deletions
diff --git a/indra/llkdu/CMakeLists.txt b/indra/llkdu/CMakeLists.txt index bdac2eded7..b8f8b420c3 100644..100755 --- a/indra/llkdu/CMakeLists.txt +++ b/indra/llkdu/CMakeLists.txt @@ -41,7 +41,10 @@ set_source_files_properties(${llkdu_HEADER_FILES} list(APPEND llkdu_SOURCE_FILES ${llkdu_HEADER_FILES}) if (USE_KDU) - add_library (${LLKDU_LIBRARIES} ${llkdu_SOURCE_FILES}) + add_library (llkdu ${llkdu_SOURCE_FILES}) + + target_link_libraries(llkdu + ${KDU_LIBRARY}) # Add tests if (LL_TESTS) diff --git a/indra/llkdu/llimagej2ckdu.cpp b/indra/llkdu/llimagej2ckdu.cpp index 0c0a844b73..0c0a844b73 100644..100755 --- a/indra/llkdu/llimagej2ckdu.cpp +++ b/indra/llkdu/llimagej2ckdu.cpp diff --git a/indra/llkdu/llimagej2ckdu.h b/indra/llkdu/llimagej2ckdu.h index fb1f6535ba..fb1f6535ba 100644..100755 --- a/indra/llkdu/llimagej2ckdu.h +++ b/indra/llkdu/llimagej2ckdu.h diff --git a/indra/llkdu/llkdumem.cpp b/indra/llkdu/llkdumem.cpp index 0347475559..0347475559 100644..100755 --- a/indra/llkdu/llkdumem.cpp +++ b/indra/llkdu/llkdumem.cpp diff --git a/indra/llkdu/llkdumem.h b/indra/llkdu/llkdumem.h index dbdf88b2d9..dbdf88b2d9 100644..100755 --- a/indra/llkdu/llkdumem.h +++ b/indra/llkdu/llkdumem.h diff --git a/indra/llkdu/tests/llimagej2ckdu_test.cpp b/indra/llkdu/tests/llimagej2ckdu_test.cpp index 62c245f125..62c245f125 100644..100755 --- a/indra/llkdu/tests/llimagej2ckdu_test.cpp +++ b/indra/llkdu/tests/llimagej2ckdu_test.cpp |