diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index f41eff069..cf2f63d1e 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -234,13 +234,13 @@ endif (DARWIN) if (LINUX OR DARWIN) - set(GCC_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs -Wno-non-virtual-dtor -Woverloaded-virtual") + set(GCC_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs") if (NOT GCC_DISABLE_FATAL_WARNINGS) set(GCC_WARNINGS "${GCC_WARNINGS} -Werror") endif (NOT GCC_DISABLE_FATAL_WARNINGS) - set(GCC_CXX_WARNINGS "${GCC_WARNINGS} -Wno-reorder") + set(GCC_CXX_WARNINGS "${GCC_WARNINGS} -Wno-reorder -Wno-non-virtual-dtor -Woverloaded-virtual") set(CMAKE_C_FLAGS "${GCC_WARNINGS} ${CMAKE_C_FLAGS}") set(CMAKE_CXX_FLAGS "${GCC_CXX_WARNINGS} ${CMAKE_CXX_FLAGS}") @@ -274,10 +274,6 @@ if(1 EQUAL 1) add_definitions(-DMESH_ENABLED=1) endif(1 EQUAL 1) -if(SERVER) - include_directories(${LIBS_PREBUILT_DIR}/include/havok) -endif(SERVER) - SET( CMAKE_EXE_LINKER_FLAGS_RELEASESSE2 "${CMAKE_EXE_LINKER_FLAGS_RELEASE}" CACHE STRING "Flags used for linking binaries under SSE2 build." diff --git a/indra/cmake/DownloadPrebuilt.cmake.in b/indra/cmake/DownloadPrebuilt.cmake.in index ef3a7c82e..7e4071d8a 100644 --- a/indra/cmake/DownloadPrebuilt.cmake.in +++ b/indra/cmake/DownloadPrebuilt.cmake.in @@ -6,6 +6,7 @@ set(install_dir "@CMAKE_SOURCE_DIR@/..") set(scp "@SCP_EXECUTABLE@") set(scripts_dir "@SCRIPTS_DIR@") set(sentinel_dir "@CMAKE_BINARY_DIR@/prepare") +set(prebuilt_type "@PREBUILT_TYPE@") # In proprietary mode we use scp for download. set(proprietary "@INSTALL_PROPRIETARY@") @@ -19,7 +20,7 @@ foreach(package ${packages}) # This package is missing or out of date. message(STATUS "Obtaining${proprietary_message} prebuilt '${package}'") execute_process( - COMMAND ${python} install.py --install-dir=${install_dir} ${scp_option} ${package} + COMMAND ${python} install.py -p${prebuilt_type} --install-dir=${install_dir} ${scp_option} ${package} WORKING_DIRECTORY ${scripts_dir} RESULT_VARIABLE result ) diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index 173c454d7..964c9d684 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -110,6 +110,17 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") +if (WINDOWS) + set(PREBUILT_TYPE windows) +elseif(DARWIN) + set(PREBUILT_TYPE darwin) +elseif(LINUX AND WORD_SIZE EQUAL 32) + set(PREBUILT_TYPE linux) +elseif(LINUX AND WORD_SIZE EQUAL 64) + set(PREBUILT_TYPE linux64) +endif(WINDOWS) + + # Default deploy grid set(GRID agni CACHE STRING "Target Grid") diff --git a/indra/libopenjpeg/CMakeLists.txt b/indra/libopenjpeg/CMakeLists.txt index 02b4c65ed..4325c7cc0 100644 --- a/indra/libopenjpeg/CMakeLists.txt +++ b/indra/libopenjpeg/CMakeLists.txt @@ -60,19 +60,7 @@ set(openjpeg_HEADER_FILES ) IF(WINDOWS) - # On Visual Studio 8 MS deprecated C. This removes all 1.276E1265 security warnings - add_definitions( - -d_crt_far_mappings_no_deprecate - -d_crt_is_wctype_no_deprecate - -d_crt_managed_fp_no_deprecate - -d_crt_nonstdc_no_deprecate - -d_crt_secure_no_deprecate - -d_crt_secure_no_deprecate_globals - -d_crt_seterrormode_beep_sleep_no_deprecate - -d_crt_time_functions_no_deprecate - -d_crt_vcclrit_no_deprecate - -d_scl_secure_no_deprecate - ) + add_definitions(-D_CRT_SECURE_NO_WARNINGS) add_definitions(-DOPJ_STATIC) ENDIF(WINDOWS) diff --git a/indra/libopenjpeg/dwt.c b/indra/libopenjpeg/dwt.c index a8d579fa9..9568f07ed 100644 --- a/indra/libopenjpeg/dwt.c +++ b/indra/libopenjpeg/dwt.c @@ -527,7 +527,7 @@ static void dwt_decode_tile(opj_tcd_tilecomp_t* tilec, int numres, DWT1DFN dwt_1 int w = tilec->x1 - tilec->x0; - h.mem = opj_aligned_malloc(dwt_decode_max_resolution(tr, numres) * sizeof(int)); + h.mem = (int *)opj_aligned_malloc(dwt_decode_max_resolution(tr, numres) * sizeof(int)); v.mem = h.mem; while( --numres) { diff --git a/indra/libopenjpeg/event.c b/indra/libopenjpeg/event.c index 291ff5858..000b8a81c 100644 --- a/indra/libopenjpeg/event.c +++ b/indra/libopenjpeg/event.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Hervé Drolon, FreeImage Team + * Copyright (c) 2005, HervĂ© Drolon, FreeImage Team * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,41 +26,6 @@ #include "opj_includes.h" -/* ========================================================== - Utility functions - ==========================================================*/ - -#if !defined(_MSC_VER) && !defined(__MINGW32__) -static char* -i2a(unsigned i, char *a, unsigned r) { - if (i/r > 0) a = i2a(i/r,a,r); - *a = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"[i%r]; - return a+1; -} - -/** - Transforms integer i into an ascii string and stores the result in a; - string is encoded in the base indicated by r. - @param i Number to be converted - @param a String result - @param r Base of value; must be in the range 2 - 36 - @return Returns a -*/ -static char * -_itoa(int i, char *a, int r) { - r = ((r < 2) || (r > 36)) ? 10 : r; - if(i < 0) { - *a = '-'; - *i2a(-i, a+1, r) = 0; - } - else *i2a(i, a, r) = 0; - return a; -} - -#endif /* !WIN32 */ - -/* ----------------------------------------------------------------------- */ - opj_event_mgr_t* OPJ_CALLCONV opj_set_event_mgr(opj_common_ptr cinfo, opj_event_mgr_t *event_mgr, void *context) { if(cinfo) { opj_event_mgr_t *previous = cinfo->event_mgr; diff --git a/indra/libopenjpeg/j2k.c b/indra/libopenjpeg/j2k.c index 33ff85450..b4e9f5aba 100644 --- a/indra/libopenjpeg/j2k.c +++ b/indra/libopenjpeg/j2k.c @@ -236,7 +236,7 @@ static void j2k_read_unk(opj_j2k_t *j2k); /* ----------------------------------------------------------------------- */ typedef struct j2k_prog_order{ OPJ_PROG_ORDER enum_prog; - char str_prog[4]; + char str_prog[5]; }j2k_prog_order_t; j2k_prog_order_t j2k_prog_order_list[] = { diff --git a/indra/newview/llfloaterpostprocess.cpp b/indra/newview/llfloaterpostprocess.cpp index bc72bf9ba..40eb5e048 100644 --- a/indra/newview/llfloaterpostprocess.cpp +++ b/indra/newview/llfloaterpostprocess.cpp @@ -120,7 +120,7 @@ void LLFloaterPostProcess::onControlChanged(LLUICtrl* ctrl, void* userData) S32 elem=0; if(sscanf(VariableName,"%255[^[][%d]", buf, &elem) == 2) { - LLPostProcess::getInstance()->tweaks[buf][elem] = ctrl->getValue(); + LLPostProcess::getInstance()->tweaks[(const char*)buf][elem] = ctrl->getValue(); } else {