Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some warnings and errors

Browse Source
This commit is contained in:
Lirusaito
2019-04-19 17:29:55 -04:00
parent f2beb4443a
commit 564410ac7e
3 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
indra/cmake/Copy3rdPartyLibs.cmake
View File

@@ -6,6 +6,8 @@
include(CMakeCopyIfDifferent) include(CMakeCopyIfDifferent)
include(Linking) include(Linking)
include(Variables)
include(LLCommon)
################################################################### ###################################################################
# set up platform specific lists of files that need to be copied # set up platform specific lists of files that need to be copied
@@ -46,7 +48,7 @@ if(WINDOWS)
libhunspell.dll libhunspell.dll
) )
if(WORD_SIZE STREQUAL 64) if(ADDRESS_SIZE EQUAL 64)
list(APPEND debug_files list(APPEND debug_files
libcrypto-1_1-x64.dll libcrypto-1_1-x64.dll
libssl-1_1-x64.dll libssl-1_1-x64.dll
@@ -55,7 +57,7 @@ if(WINDOWS)
libcrypto-1_1-x64.dll libcrypto-1_1-x64.dll
libssl-1_1-x64.dll libssl-1_1-x64.dll
) )
else(WORD_SIZE STREQUAL 64) else(ADDRESS_SIZE EQUAL 64)
list(APPEND debug_files list(APPEND debug_files
libcrypto-1_1.dll libcrypto-1_1.dll
libssl-1_1.dll libssl-1_1.dll
@@ -64,7 +66,7 @@ if(WINDOWS)
libcrypto-1_1.dll libcrypto-1_1.dll
libssl-1_1.dll libssl-1_1.dll
) )
endif(WORD_SIZE STREQUAL 64) endif(ADDRESS_SIZE EQUAL 64)
if(NOT DISABLE_TCMALLOC) if(NOT DISABLE_TCMALLOC)
set(debug_files ${debug_files} libtcmalloc_minimal-debug.dll) set(debug_files ${debug_files} libtcmalloc_minimal-debug.dll)
@@ -72,14 +74,15 @@ if(WINDOWS)
endif(NOT DISABLE_TCMALLOC) endif(NOT DISABLE_TCMALLOC)
if (FMODSTUDIO) if (FMODSTUDIO)
if(WORD_SIZE STREQUAL 64) if(ADDRESS_SIZE STREQUAL 64)
set(debug_files ${debug_files} fmodL64.dll) set(debug_files ${debug_files} fmodL64.dll)
set(release_files ${release_files} fmod64.dll) set(release_files ${release_files} fmod64.dll)
else(WORD_SIZE STREQUAL 64) else(ADDRESS_SIZE STREQUAL 64)
set(debug_files ${debug_files} fmodL.dll) set(debug_files ${debug_files} fmodL.dll)
set(release_files ${release_files} fmod.dll) set(release_files ${release_files} fmod.dll)
endif(WORD_SIZE STREQUAL 64) endif(ADDRESS_SIZE STREQUAL 64)
endif (FMODSTUDIO) endif (FMODSTUDIO)
elseif(DARWIN) elseif(DARWIN)
set(SHARED_LIB_STAGING_DIR_DEBUG "${SHARED_LIB_STAGING_DIR}/Debug/Resources") set(SHARED_LIB_STAGING_DIR_DEBUG "${SHARED_LIB_STAGING_DIR}/Debug/Resources")
set(SHARED_LIB_STAGING_DIR_RELWITHDEBINFO "${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/Resources") set(SHARED_LIB_STAGING_DIR_RELWITHDEBINFO "${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/Resources")
@@ -113,8 +116,8 @@ elseif(DARWIN)
) )
if (FMODSTUDIO) if (FMODSTUDIO)
set(debug_files ${debug_files} libfmodL.dylib) list(APPEND debug_files libfmodL.dylib)
set(release_files ${release_files} libfmod.dylib) list(APPEND release_files libfmod.dylib)
endif (FMODSTUDIO) endif (FMODSTUDIO)
elseif(LINUX) elseif(LINUX)
@@ -132,7 +135,6 @@ elseif(LINUX)
libvivoxplatform.so libvivoxplatform.so
libvivoxsdk.so libvivoxsdk.so
SLVoice SLVoice
# ca-bundle.crt #No cert for linux. It is actually still 3.2SDK.
) )
# *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables
# or ARCH_PREBUILT_DIRS # or ARCH_PREBUILT_DIRS
@@ -221,13 +223,13 @@ set(third_party_targets ${third_party_targets} ${out_targets})
copy_if_different( #copy_if_different(
${debug_src_dir} # ${debug_src_dir}
"${SHARED_LIB_STAGING_DIR_DEBUG}" # "${SHARED_LIB_STAGING_DIR_DEBUG}"
out_targets # out_targets
${debug_files} # ${debug_files}
) # )
set(third_party_targets ${third_party_targets} ${out_targets}) #set(third_party_targets ${third_party_targets} ${out_targets})
copy_if_different( copy_if_different(
${release_src_dir} ${release_src_dir}

2
indra/llcommon/llstring.cpp
View File

@@ -809,7 +809,7 @@ wchar_t* ll_convert_string_to_wide(const std::string& in, unsigned int code_page
w_out[real_output_str_len] = 0; w_out[real_output_str_len] = 0;
return w_out; return w_out;
return {&w_out[0]}; // return {&w_out[0]};
} }
S32 wchartchars_to_llwchar(const std::wstring::value_type* inchars, llwchar* outchar) S32 wchartchars_to_llwchar(const std::wstring::value_type* inchars, llwchar* outchar)

10
indra/llinventory/llsettingssky.cpp
View File

@@ -719,9 +719,9 @@ LLSD LLSettingsSky::defaults(const LLSettingsBase::TrackPosition& position)
moonquat = convert_azimuth_and_altitude_to_quat(altitude + (F_PI * 0.125f), azimuth + (F_PI * 0.125f)); moonquat = convert_azimuth_and_altitude_to_quat(altitude + (F_PI * 0.125f), azimuth + (F_PI * 0.125f));
// Magic constants copied form dfltsetting.xml // Magic constants copied form dfltsetting.xml
dfltsetting[SETTING_CLOUD_COLOR] = LLColor4(0.4099, 0.4099, 0.4099, 0.0).getValue(); dfltsetting[SETTING_CLOUD_COLOR] = LLColor4(0.4099f, 0.4099f, 0.4099f, 0.0f).getValue();
dfltsetting[SETTING_CLOUD_POS_DENSITY1] = LLColor4(1.0000, 0.5260, 1.0000, 0.0).getValue(); dfltsetting[SETTING_CLOUD_POS_DENSITY1] = LLColor4(1.0000f, 0.5260f, 1.0000f, 0.0f).getValue();
dfltsetting[SETTING_CLOUD_POS_DENSITY2] = LLColor4(1.0000, 0.5260, 1.0000, 0.0).getValue(); dfltsetting[SETTING_CLOUD_POS_DENSITY2] = LLColor4(1.0000f, 0.5260f, 1.0000f, 0.0f).getValue();
dfltsetting[SETTING_CLOUD_SCALE] = LLSD::Real(0.4199); dfltsetting[SETTING_CLOUD_SCALE] = LLSD::Real(0.4199);
dfltsetting[SETTING_CLOUD_SCROLL_RATE] = LLSDArray(0.0f)(0.0f); dfltsetting[SETTING_CLOUD_SCROLL_RATE] = LLSDArray(0.0f)(0.0f);
dfltsetting[SETTING_CLOUD_SHADOW] = LLSD::Real(0.2699); dfltsetting[SETTING_CLOUD_SHADOW] = LLSD::Real(0.2699);
@@ -730,14 +730,14 @@ LLSD LLSettingsSky::defaults(const LLSettingsBase::TrackPosition& position)
dfltsetting[SETTING_DOME_OFFSET] = LLSD::Real(0.96f); dfltsetting[SETTING_DOME_OFFSET] = LLSD::Real(0.96f);
dfltsetting[SETTING_DOME_RADIUS] = LLSD::Real(15000.f); dfltsetting[SETTING_DOME_RADIUS] = LLSD::Real(15000.f);
dfltsetting[SETTING_GAMMA] = LLSD::Real(1.0); dfltsetting[SETTING_GAMMA] = LLSD::Real(1.0);
dfltsetting[SETTING_GLOW] = LLColor4(5.000, 0.0010, -0.4799, 1.0).getValue(); dfltsetting[SETTING_GLOW] = LLColor4(5.000f, 0.0010f, -0.4799f, 1.0f).getValue();
dfltsetting[SETTING_MAX_Y] = LLSD::Real(1605); dfltsetting[SETTING_MAX_Y] = LLSD::Real(1605);
dfltsetting[SETTING_MOON_ROTATION] = moonquat.getValue(); dfltsetting[SETTING_MOON_ROTATION] = moonquat.getValue();
dfltsetting[SETTING_MOON_BRIGHTNESS] = LLSD::Real(0.5f); dfltsetting[SETTING_MOON_BRIGHTNESS] = LLSD::Real(0.5f);
dfltsetting[SETTING_STAR_BRIGHTNESS] = LLSD::Real(256.0000); dfltsetting[SETTING_STAR_BRIGHTNESS] = LLSD::Real(256.0000);
dfltsetting[SETTING_SUNLIGHT_COLOR] = LLColor4(0.7342, 0.7815, 0.8999, 0.0).getValue(); dfltsetting[SETTING_SUNLIGHT_COLOR] = LLColor4(0.7342f, 0.7815f, 0.8999f, 0.0f).getValue();
dfltsetting[SETTING_SUN_ROTATION] = sunquat.getValue(); dfltsetting[SETTING_SUN_ROTATION] = sunquat.getValue();
dfltsetting[SETTING_BLOOM_TEXTUREID] = GetDefaultBloomTextureId(); dfltsetting[SETTING_BLOOM_TEXTUREID] = GetDefaultBloomTextureId();