diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index c1c2ce8eb4..89c34fa114 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -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) diff --git a/indra/cmake/BerkeleyDB.cmake b/indra/cmake/BerkeleyDB.cmake index 39caa0b103..ee670ac650 100644 --- a/indra/cmake/BerkeleyDB.cmake +++ b/indra/cmake/BerkeleyDB.cmake @@ -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) diff --git a/indra/cmake/BuildPackagesInfo.cmake b/indra/cmake/BuildPackagesInfo.cmake index b3dbdffa1b..133ee9797a 100644 --- a/indra/cmake/BuildPackagesInfo.cmake +++ b/indra/cmake/BuildPackagesInfo.cmake @@ -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 diff --git a/indra/cmake/CURL.cmake b/indra/cmake/CURL.cmake index 2897c0b27f..23ada74e4b 100644 --- a/indra/cmake/CURL.cmake +++ b/indra/cmake/CURL.cmake @@ -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 diff --git a/indra/cmake/FMODEX.cmake b/indra/cmake/FMODEX.cmake index 06f7ecff81..b5dfcc813d 100644 --- a/indra/cmake/FMODEX.cmake +++ b/indra/cmake/FMODEX.cmake @@ -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) diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake index f6bc34a796..f6ac626074 100644 --- a/indra/cmake/JsonCpp.cmake +++ b/indra/cmake/JsonCpp.cmake @@ -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) diff --git a/indra/cmake/LLKDU.cmake b/indra/cmake/LLKDU.cmake index a9080eda1b..8c7dec136b 100644 --- a/indra/cmake/LLKDU.cmake +++ b/indra/cmake/LLKDU.cmake @@ -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) diff --git a/indra/cmake/NVAPI.cmake b/indra/cmake/NVAPI.cmake index e624d90a85..105f442a30 100644 --- a/indra/cmake/NVAPI.cmake +++ b/indra/cmake/NVAPI.cmake @@ -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) diff --git a/indra/cmake/Prebuilt.cmake b/indra/cmake/Prebuilt.cmake index 587d93cac7..98013da2f2 100644 --- a/indra/cmake/Prebuilt.cmake +++ b/indra/cmake/Prebuilt.cmake @@ -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}" diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index cd96a9df06..c922ca29d9 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -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)") - -# 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" ) -# +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) diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake index ac26c36a28..5fefb12101 100644 --- a/indra/cmake/ViewerMiscLibs.cmake +++ b/indra/cmake/ViewerMiscLibs.cmake @@ -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) diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp index 414bd3887f..b585d8eed9 100644 --- a/indra/llcrashlogger/llcrashlogger.cpp +++ b/indra/llcrashlogger/llcrashlogger.cpp @@ -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 diff --git a/indra/llvfs/lldir.cpp b/indra/llvfs/lldir.cpp index b245cff375..11ecdbe1c9 100644 --- a/indra/llvfs/lldir.cpp +++ b/indra/llvfs/lldir.cpp @@ -382,14 +382,14 @@ std::string LLDir::buildSLOSCacheDir() const { // 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 diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 3fda079b3e..0462b05b6a 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1878,9 +1878,9 @@ if (WINDOWS) endif (INTEL_MEMOPS_LIBRARY) # 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 ( ) # 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} diff --git a/indra/newview/fsfloaterim.cpp b/indra/newview/fsfloaterim.cpp index 1fefb9e259..617f116d63 100644 --- a/indra/newview/fsfloaterim.cpp +++ b/indra/newview/fsfloaterim.cpp @@ -380,7 +380,7 @@ void FSFloaterIM::sendMsgFromInputEditor(EChatType type) } // -#if !defined(ND_BUILD64BIT_ARCH) +#if ADDRESS_SIZE == 32 std::string strFSTag = "(FS "; #else std::string strFSTag = "(FS64 "; diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 2a40976057..d758ee9de9 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -793,8 +793,8 @@ LLAppViewer::LLAppViewer() // 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 diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index ec211a4e06..4fe07bb727 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -1480,8 +1480,8 @@ void LLViewerTextureList::updateMaxResidentTexMem(S32Megabytes mem) // Texture memory management //mMaxTotalTextureMemInMegaBytes = mMaxResidentTexMemInMegaBytes * 2; -#ifndef ND_BUILD64BIT_ARCH -// +#if ADDRESS_SIZE == 32 + // mMaxTotalTextureMemInMegaBytes = mMaxResidentTexMemInMegaBytes * 2; if (mMaxResidentTexMemInMegaBytes > (S32Megabytes)640) diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 2ef8ec004d..870fbdd2fc 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -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)