From cc92525b0df952659102d2e5adcc4140fea7f371 Mon Sep 17 00:00:00 2001 From: Adam Moss Date: Mon, 4 May 2009 17:43:26 +0000 Subject: QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3 svn merge -r118927:118939 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476 this is a composite of... svn merge -r115088:118182 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23 conflicts resolved: C doc/contributions.txt C indra/llaudio/audioengine.cpp C indra/newview/CMakeLists.txt C indra/newview/llfloaterlandholdings.cpp C indra/newview/llpaneldirbrowser.cpp C indra/newview/llpanelgrouplandmoney.cpp C indra/newview/llpreviewscript.cpp C indra/newview/llviewermenu.cpp C indra/newview/skins/default/xui/en-us/notifications.xml and... svn merge -r116937:118673 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 minor-to-trivial conflicts resolved: C indra/llcommon/llversionserver.h C indra/newsim/llrezdata.cpp C indra/newsim/llstate.cpp C indra/upgrade/schema_version/sequence/3/index_log_paypal.sql --- indra/cmake/PNG.cmake | 8 +------- indra/cmake/ZLIB.cmake | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/PNG.cmake b/indra/cmake/PNG.cmake index cf10c2dda5..4d0b7b2d8d 100644 --- a/indra/cmake/PNG.cmake +++ b/indra/cmake/PNG.cmake @@ -8,12 +8,6 @@ if (STANDALONE) include(FindPNG) else (STANDALONE) use_prebuilt_binary(libpng) - if (WINDOWS) - set(PNG_LIBRARIES - debug libpngd - optimized libpng) - else (WINDOWS) - set(PNG_LIBRARIES png12) - endif (WINDOWS) + set(PNG_LIBRARIES png12) set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) endif (STANDALONE) diff --git a/indra/cmake/ZLIB.cmake b/indra/cmake/ZLIB.cmake index c133248bed..48e5130ad5 100644 --- a/indra/cmake/ZLIB.cmake +++ b/indra/cmake/ZLIB.cmake @@ -17,6 +17,6 @@ else (STANDALONE) set(ZLIB_LIBRARIES z) endif (WINDOWS) if (WINDOWS OR LINUX) - set(ZLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/zlib) + set(ZLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/zlib) endif (WINDOWS OR LINUX) endif (STANDALONE) -- cgit v1.2.3