livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Synchronize with viewer64 source.

meow-7.2.2
Nicky 2017-01-11 15:36:33 +01:00
parent 0dca87fcde
commit 688bf1e547
18 changed files with 40 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/cmake/00-Common.cmake
View File

@ -99,13 +99,6 @@ if (WINDOWS)
if (NOT VS_DISABLE_FATAL_WARNINGS)
add_definitions(/WX)
endif (NOT VS_DISABLE_FATAL_WARNINGS)
if( ND_BUILD64BIT_ARCH )
add_definitions("/wd4267 /DND_BUILD64BIT_ARCH" )
else( ND_BUILD64BIT_ARCH )
add_definitions("/fp:fast" )
endif( ND_BUILD64BIT_ARCH )
endif (WINDOWS)

6
indra/cmake/BerkeleyDB.cmake
View File

@ -8,10 +8,8 @@ if (USESYSTEMLIBS)
else (USESYSTEMLIBS)
if (LINUX)
# Need to add dependency pthread explicitely to support ld.gold.
if( NOT ND_BUILD64BIT_ARCH )
use_prebuilt_binary(db)
set(DB_LIBRARIES db-5.1 pthread)
endif( NOT ND_BUILD64BIT_ARCH )
use_prebuilt_binary(db)
set(DB_LIBRARIES db-5.1 pthread)
else (LINUX)
set(DB_LIBRARIES db-4.2)
endif (LINUX)

4
indra/cmake/BuildPackagesInfo.cmake
View File

@ -2,6 +2,10 @@
# Construct the version and copyright information based on package data.
include(Python)
# packages-formatter.py runs autobuild install --versions, which needs to know
# the build_directory, which (on Windows) depends on AUTOBUILD_ADDRSIZE.
# Within an autobuild build, AUTOBUILD_ADDRSIZE is already set. But when
# building in an IDE, it probably isn't. Set it explicitly using
# run_build_test.py.
add_custom_command(OUTPUT packages-info.txt
COMMENT Generating packages-info.txt for the about box

9
indra/cmake/CURL.cmake
View File

@ -8,21 +8,12 @@ if (USESYSTEMLIBS)
include(FindCURL)
else (USESYSTEMLIBS)
use_prebuilt_binary(curl)
# if (DARWIN)
# use_prebuilt_binary(libidn)
# endif (DARWIN)
if (WINDOWS)
set(CURL_LIBRARIES
debug libcurld.lib
optimized libcurl.lib)
else (WINDOWS)
set(CURL_LIBRARIES libcurl.a)
# if (DARWIN)
# list(APPEND CURL_LIBRARIES
# idn
# iconv
# )
# endif (DARWIN)
if (LINUX)
list(APPEND CURL_LIBRARIES
pthread

12
indra/cmake/FMODEX.cmake
View File

@ -26,29 +26,29 @@ if (FMODEX)
include(Prebuilt)
use_prebuilt_binary(fmodex)
if (WINDOWS)
if( NOT ND_BUILD64BIT_ARCH )
if( ADDRESS_SIZE EQUAL 32 )
set(FMODEX_LIBRARY
debug fmodexL_vc
optimized fmodex_vc)
else( NOT ND_BUILD64BIT_ARCH )
else( )
set(FMODEX_LIBRARY
debug fmodexL64_vc
optimized fmodex64_vc)
endif( NOT ND_BUILD64BIT_ARCH )
endif( )
elseif (DARWIN)
set(FMODEX_LIBRARY
debug fmodexL
optimized fmodex)
elseif (LINUX)
if(ND_BUILD64BIT_ARCH)
if( ADDRESS_SIZE EQUAL 64 )
set(FMODEX_LIBRARY
debug fmodexL64
optimized fmodex64)
else(ND_BUILD64BIT_ARCH)
else( )
set(FMODEX_LIBRARY
debug fmodexL
optimized fmodex)
endif(ND_BUILD64BIT_ARCH)
endif( )
endif (WINDOWS)
set(FMODEX_LIBRARIES ${FMODEX_LIBRARY})
set(FMODEX_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/fmodex)

18
indra/cmake/JsonCpp.cmake
View File

@ -10,23 +10,17 @@ if (USESYSTEMLIBS)
else (USESYSTEMLIBS)
use_prebuilt_binary(jsoncpp)
if (WINDOWS)
if (ND_BUILD64BIT_ARCH)
set(JSONCPP_LIBRARIES
debug json_libmtd.lib
optimized json_libmt.lib)
else (ND_BUILD64BIT_ARCH)
set(JSONCPP_LIBRARIES
debug json_libmdd.lib
optimized json_libmd.lib)
endif (ND_BUILD64BIT_ARCH)
set(JSONCPP_LIBRARIES
debug json_libmdd.lib
optimized json_libmd.lib)
elseif (DARWIN)
set(JSONCPP_LIBRARIES libjson_darwin_libmt.a)
elseif (LINUX)
if (ND_BUILD64BIT_ARCH)
if ( ADDRESS_SIZE EQUAL 64 )
set(JSONCPP_LIBRARIES libjson_linux-gcc-4.6_libmt.a)
else (ND_BUILD64BIT_ARCH)
else ( )
set(JSONCPP_LIBRARIES libjson_linux-gcc-4.1.3_libmt.a)
endif (ND_BUILD64BIT_ARCH)
endif ( )
endif (WINDOWS)
set(JSONCPP_INCLUDE_DIR "${LIBS_PREBUILT_DIR}/include/jsoncpp" "${LIBS_PREBUILT_DIR}/include/json")
endif (USESYSTEMLIBS)

5
indra/cmake/LLKDU.cmake
View File

@ -8,13 +8,12 @@ if (INSTALL_PROPRIETARY)
endif (INSTALL_PROPRIETARY)
set( ND_KDU_SUFFIX "" )
if( ND_BUILD64BIT_ARCH )
if( ADDRESS_SIZE EQUAL 64 )
if( WINDOWS OR LINUX )
set( ND_KDU_SUFFIX "_x64" )
endif( WINDOWS OR LINUX )
endif( ND_BUILD64BIT_ARCH )
endif( ADDRESS_SIZE EQUAL 64 )
if (USE_KDU)
if (USESYSTEMLIBS)
include(FindKDU)

6
indra/cmake/NVAPI.cmake
View File

@ -6,11 +6,7 @@ set(NVAPI ON CACHE BOOL "Use NVAPI.")
if (NVAPI)
if (WINDOWS)
use_prebuilt_binary(nvapi)
if( NOT ND_BUILD64BIT_ARCH )
set(NVAPI_LIBRARY nvapi)
else( NOT ND_BUILD64BIT_ARCH )
set(NVAPI_LIBRARY nvapi64 )
endif( NOT ND_BUILD64BIT_ARCH )
set(NVAPI_LIBRARY nvapi)
else (WINDOWS)
set(NVAPI_LIBRARY "")
endif (WINDOWS)

1
indra/cmake/Prebuilt.cmake
View File

@ -45,7 +45,6 @@ macro (use_prebuilt_binary _binary)
endif(DEBUG_PREBUILT)
execute_process(COMMAND "${AUTOBUILD_EXECUTABLE}"
install
${autobuild_install_platform}
--install-dir=${AUTOBUILD_INSTALL_DIR}
${_binary}
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"

11
indra/cmake/Variables.cmake
View File

@ -32,16 +32,7 @@ set(VIEWER_PREFIX)
set(INTEGRATION_TESTS_PREFIX)
set(LL_TESTS OFF CACHE BOOL "Build and run unit and integration tests (disable for build timing runs to reduce variation")
set(INCREMENTAL_LINK OFF CACHE BOOL "Use incremental linking on win32 builds (enable for faster links on some machines)")
# <FS:ND> When building for Linux x64 we enable building the media plugins, in all other cases we use the prebuild 32 bit packages
# set(ENABLE_MEDIA_PLUGINS ON CACHE BOOL "Turn off building media plugins if they are imported by third-party library mechanism")
if (ND_BUILD64BIT_ARCH AND ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" )
set( ENABLE_MEDIA_PLUGINS OFF CACHE FORCE "Build with media plugins" )
else (ND_BUILD64BIT_ARCH AND ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" )
set(ENABLE_MEDIA_PLUGINS ON CACHE BOOL "Turn off building media plugins if they are imported by third-party library mechanism")
endif (ND_BUILD64BIT_ARCH AND ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" )
# </FS:ND>
set(ENABLE_MEDIA_PLUGINS ON CACHE BOOL "Turn off building media plugins if they are imported by third-party library mechanism")
if(LIBS_CLOSED_DIR)
file(TO_CMAKE_PATH "${LIBS_CLOSED_DIR}" LIBS_CLOSED_DIR)

4
indra/cmake/ViewerMiscLibs.cmake
View File

@ -10,10 +10,10 @@ if (NOT USESYSTEMLIBS)
use_prebuilt_binary(slvoice)
# use_prebuilt_binary(libidn)
if( ND_BUILD64BIT_ARCH )
if( ADDRESS_SIZE EQUAL 64 )
if( DARWIN )
use_prebuilt_binary( slplugin_x86 )
endif( DARWIN )
endif( ND_BUILD64BIT_ARCH )
endif( )
endif(NOT USESYSTEMLIBS)

4
indra/llcrashlogger/llcrashlogger.cpp
View File

@ -699,8 +699,8 @@ bool LLCrashLogger::init()
LLCore::LLHttp::initialize();
// We assume that all the logs we're looking for reside on the current drive
#ifdef ND_BUILD64BIT_ARCH
gDirUtilp->initAppDirs("Firestorm_x64");
#if ADDRESS_SIZE == 64
gDirUtilp->initAppDirs( "Firestorm_x64" );
#else
gDirUtilp->initAppDirs("Firestorm");
#endif

8
indra/llvfs/lldir.cpp
View File

@ -382,14 +382,14 @@ std::string LLDir::buildSLOSCacheDir() const
{
// <FS:CR> FIRE-8226 - Different flavoured cache directories.
#ifdef OPENSIM
#ifdef ND_BUILD64BIT_ARCH
res = add(getOSCacheDir(), APP_NAME + "OS_x64");
#if ADDRESS_SIZE == 64
res = add( getOSCacheDir(), APP_NAME + "OS_x64" );
#else
res = add(getOSCacheDir(), APP_NAME + "OS");
#endif
#else
#ifdef ND_BUILD64BIT_ARCH
res = add(getOSCacheDir(), APP_NAME + "_x64");
#if ADDRESS_SIZE == 64
res = add( getOSCacheDir(), APP_NAME + "_x64" );
#else
res = add(getOSCacheDir(), APP_NAME);
#endif

14
indra/newview/CMakeLists.txt
View File

@ -1878,9 +1878,9 @@ if (WINDOWS)
endif (INTEL_MEMOPS_LIBRARY)
# <FS:Ansariel> Build 32bit Windows with LTCG linker flag because of OpenJPG
if (NOT ND_BUILD64BIT_ARCH)
if ( ADDRESS_SIZE EQUAL 32 )
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LTCG")
endif (NOT ND_BUILD64BIT_ARCH)
endif ( )
# </FS:Ansariel>
endif (WINDOWS)
@ -2126,14 +2126,6 @@ if (WINDOWS)
windows-crash-logger
)
if( ND_BUILD64BIT_ARCH )
set( VIEWERMANIFEST_FLAGS --m64 --copy_artwork )
set( VIEWERMANIFEST_PACKAGE_FLAGS --m64 )
else( ND_BUILD64BIT_ARCH )
set( VIEWERMANIFEST_FLAGS "" )
set( VIEWERMANIFEST_PACKAGE_FLAGS )
endif( ND_BUILD64BIT_ARCH )
if (FMODEX)
list(APPEND COPY_INPUT_DEPENDENCIES
${SHARED_LIB_STAGING_DIR}/Release/fmodex.dll
@ -2149,7 +2141,6 @@ if (WINDOWS)
${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
--actions=copy
--arch=${ARCH}
${VIEWERMANIFEST_FLAGS}
--artwork=${ARTWORK_DIR}
--build=${CMAKE_CURRENT_BINARY_DIR}
--buildtype=${CMAKE_BUILD_TYPE}
@ -2216,7 +2207,6 @@ if (WINDOWS)
ARGS
${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
--arch=${ARCH}
${VIEWERMANIFEST_PACKAGE_FLAGS}
--artwork=${ARTWORK_DIR}
--build=${CMAKE_CURRENT_BINARY_DIR}
--buildtype=${CMAKE_BUILD_TYPE}

2
indra/newview/fsfloaterim.cpp
View File

@ -380,7 +380,7 @@ void FSFloaterIM::sendMsgFromInputEditor(EChatType type)
}
// </FS:PP>
#if !defined(ND_BUILD64BIT_ARCH)
#if ADDRESS_SIZE == 32
std::string strFSTag = "(FS ";
#else
std::string strFSTag = "(FS64 ";

8
indra/newview/llappviewer.cpp
View File

@ -793,8 +793,8 @@ LLAppViewer::LLAppViewer()
// <FS:ND> Init our custom directories, not from SecondLife
// gDirUtilp->initAppDirs("SecondLife");
#ifdef ND_BUILD64BIT_ARCH
gDirUtilp->initAppDirs(APP_NAME + "_x64");
#if ADDRESS_SIZE == 64
gDirUtilp->initAppDirs( APP_NAME + "_x64" );
#else
gDirUtilp->initAppDirs(APP_NAME);
#endif
@ -5376,8 +5376,8 @@ void LLAppViewer::purgeCacheImmediate()
std::string LLAppViewer::getSecondLifeTitle() const
{
#ifdef ND_BUILD64BIT_ARCH
return LLTrans::getString("APP_NAME") + "_x64";
#if ADDRESS_SIZE == 64
return LLTrans::getString( "APP_NAME" ) + "_x64";
#else
return LLTrans::getString("APP_NAME");
#endif

4
indra/newview/llviewertexturelist.cpp
View File

@ -1480,8 +1480,8 @@ void LLViewerTextureList::updateMaxResidentTexMem(S32Megabytes mem)
// <FS:Ansariel> Texture memory management
//mMaxTotalTextureMemInMegaBytes = mMaxResidentTexMemInMegaBytes * 2;
#ifndef ND_BUILD64BIT_ARCH
// </FS:Ansariel>
#if ADDRESS_SIZE == 32
// </FS:Ansariel>
mMaxTotalTextureMemInMegaBytes = mMaxResidentTexMemInMegaBytes * 2;
if (mMaxResidentTexMemInMegaBytes > (S32Megabytes)640)

2
indra/newview/llviewerwindow.cpp
View File

@ -1936,7 +1936,7 @@ LLViewerWindow::LLViewerWindow(const Params& p)
// memory and up to 2GB texture memory on cards with 4GB video memory. Check
// is performed against a lower limit as not exactly 2 or 4GB might not be
// returned.
#ifdef ND_BUILD64BIT_ARCH
#if ADDRESS_SIZE == 64
LL_INFOS() << "GLManager detected " << gGLManager.mVRAM << " MB VRAM" << LL_ENDL;
if (gGLManager.mVRAM > 3584)