diff options
| author | Don Kjer <don@lindenlab.com> | 2012-09-13 22:53:16 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-09-13 22:53:16 +0000 |
| commit | 9307810e7e8edcf18f7c27abda5d0b94ed13bcf7 (patch) | |
| tree | 07e50119806f3b1789295f5c92f62c7f6f5c6fab | |
| parent | 72fac2172ac9631702cf13a012553ef6449ce670 (diff) | |
Fix for merge build error. Attempt to cleanup cmake warnings regarding incorrect target_link_libraries
| -rw-r--r-- | indra/llrender/CMakeLists.txt | 14 | ||||
| -rwxr-xr-x | indra/newview/llvoavatar.cpp | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/indra/llrender/CMakeLists.txt b/indra/llrender/CMakeLists.txt index d47129a67b..fc38f56957 100644 --- a/indra/llrender/CMakeLists.txt +++ b/indra/llrender/CMakeLists.txt @@ -105,13 +105,13 @@ add_library (llrender ${llrender_SOURCE_FILES}) # Libraries on which this library depends, needed for Linux builds # Sort by high-level to low-level target_link_libraries(llrender - ${LLCOMMON_INCLUDE_DIRS} - ${LLIMAGE_INCLUDE_DIRS} - ${LLMATH_INCLUDE_DIRS} - ${LLRENDER_INCLUDE_DIRS} - ${LLVFS_INCLUDE_DIRS} - ${LLXML_INCLUDE_DIRS} - ${LLVFS_INCLUDE_DIRS} + ${LLCOMMON_LIBRARIES} + ${LLIMAGE_LIBRARIES} + ${LLMATH_LIBRARIES} + ${LLRENDER_LIBRARIES} + ${LLVFS_LIBRARIES} + ${LLXML_LIBRARIES} + ${LLVFS_LIBRARIES} ${LLWINDOW_LIBRARIES} ${FREETYPE_LIBRARIES} ${OPENGL_LIBRARIES}) diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index bec67c1695..1b185ed508 100755 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -6853,7 +6853,7 @@ void LLVOAvatar::dumpArchetypeXML(const std::string& prefix, bool group_by_weara for (U8 te = 0; te < TEX_NUM_INDICES; te++) { - if (LLVOAvatarDictionary::getTEWearableType((ETextureIndex)te) == type) + if (LLAvatarAppearanceDictionary::getTEWearableType((ETextureIndex)te) == type) { // MULTIPLE_WEARABLES: extend to multiple wearables? LLViewerTexture* te_image = getImage((ETextureIndex)te, 0); |