Fix appearance utility build on windows

Author: Rye

indra/CMakeLists.txt

@@ -85,17 +85,7 @@ if (ENABLE_MEDIA_PLUGINS)
 add_subdirectory(${LIBS_OPEN_PREFIX}media_plugins)
 endif (ENABLE_MEDIA_PLUGINS)
 
-# if (LINUX)
-#   if (INSTALL_PROPRIETARY)
-#       include(LLAppearanceUtility)
-#       add_subdirectory(${LLAPPEARANCEUTILITY_SRC_DIR} ${LLAPPEARANCEUTILITY_BIN_DIR})
-#   endif (INSTALL_PROPRIETARY)
-# elseif (WINDOWS)
-#   # cmake EXISTS requires an absolute path, see indra/cmake/Variables.cmake
-#   if (EXISTS ${VIEWER_DIR}win_setup)
-#     add_subdirectory(${VIEWER_DIR}win_setup)
-#   endif (EXISTS ${VIEWER_DIR}win_setup)
-# endif (LINUX)
+add_subdirectory(${VIEWER_PREFIX}llappearanceutility)
 
 if (WINDOWS)
     # cmake EXISTS requires an absolute path, see indra/cmake/Variables.cmake

indra/llappearanceutility/CMakeLists.txt

@@ -10,8 +10,6 @@ include(LLImage)
 include(LLMath)
 include(LLWindow)
 include(Linking)
-#include(GooglePerfTools)
-
 
 set(appearance_utility_SOURCE_FILES
     appearance_utility.cpp
@@ -65,10 +63,6 @@ target_link_libraries(appearance-utility-bin
     llxml
     )
 
-add_custom_target(appearance-utility-bin-target ALL
-                  DEPENDS appearance-utility-bin)
-
-
 if (BUILD_HEADLESS)
   add_executable(appearance-utility-headless-bin ${appearance_utility_SOURCE_FILES})
 
@@ -80,8 +74,5 @@ if (BUILD_HEADLESS)
     llrenderheadless
     llxml
     )
-  
-  add_custom_target(appearance-utility-headless-bin-target ALL
-                    DEPENDS appearance-utility-headless-bin)
 endif (BUILD_HEADLESS)
 

indra/llappearanceutility/llprocessparams.cpp

@@ -237,7 +237,7 @@ bool LLProcessParams::processInputDataForJointInfo( LLBakingAvatar& avatar )
         //  pelvisOffset = skin["pelvis_offset"].asReal();
         //}
         // Now apply the extracted joint data to the avatar
-        U32 jointCount = jointNames.size();
+        U32 jointCount = narrow(jointNames.size());
 
         if ( jointOffsets.size() < jointCount )
         {

indra/llappearanceutility/llprocessskin.cpp

@@ -84,7 +84,7 @@ void LLProcessSkin::process(std::ostream& output)
                 {
                     for (U32 k = 0; k < 4; k++)
                     {
-                        mat.mMatrix[j][k] = (*iter)[j*4+k].asReal();
+                        mat.mMatrix[j][k] = static_cast<F32>((*iter)[j*4+k].asReal());
                     }
                 }
                 joint_offsets.append( ll_sd_from_vector3( mat.getTranslation() ));

indra/llwindow/CMakeLists.txt

@@ -121,6 +121,7 @@ if (WINDOWS)
        lldragdropwin32.h
        )
   list(APPEND llwindow_LINK_LIBRARIES
+       wbemuuid
        comdlg32     # Common Dialogs for ChooseColor
        ole32
        dxgi