From e7a2f7e12191bccaf09cf30213a7eff4ad9c40aa Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 2 Jan 2012 15:41:22 +0100 Subject: [PATCH 1/4] Changed: #825 Remove all warnings when compiling Ryzom --- code/nel/src/3d/patchdlm_context.cpp | 4 ++-- code/nel/src/ligo/primitive.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/nel/src/3d/patchdlm_context.cpp b/code/nel/src/3d/patchdlm_context.cpp index f5a5b578d..e50f1befe 100644 --- a/code/nel/src/3d/patchdlm_context.cpp +++ b/code/nel/src/3d/patchdlm_context.cpp @@ -1018,8 +1018,8 @@ void CPatchDLMContext::computeTextureFar() // compute src pixel const CRGBA *srcPixel= pTile->getPixels(CTileFarBank::diffuse, CTileFarBank::order1); // compute src info, for this tile rot and 256x256 context. - sint srcDeltaX; - sint srcDeltaY; + sint srcDeltaX = 0; + sint srcDeltaY = 0; srcPixel= computeTileFarSrcDeltas(nRot, is256x256, uvOff, srcPixel, srcDeltaX, srcDeltaY); // compute dst coordinate. start writing at pixel (1,1) diff --git a/code/nel/src/ligo/primitive.cpp b/code/nel/src/ligo/primitive.cpp index ff8c71c18..62c4ab9d6 100644 --- a/code/nel/src/ligo/primitive.cpp +++ b/code/nel/src/ligo/primitive.cpp @@ -2118,7 +2118,7 @@ bool CPrimAlias::read (xmlNodePtr xmlNode, const char *filename, uint version, C xmlNodePtr ptNode = CIXml::getFirstChildNode (xmlNode, "ALIAS"); if (ptNode) { - int val; + sint val = 0; if (ReadInt ("VALUE", val, filename, ptNode)) { _Alias = uint32(val); From 2014543ec1a80e2fe9e7aec3f3d155d2b2e69379 Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 2 Jan 2012 15:53:21 +0100 Subject: [PATCH 2/4] Fixed: Missing "stdpch.h" include --- code/ryzom/client/src/app_bundle_utils.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/code/ryzom/client/src/app_bundle_utils.cpp b/code/ryzom/client/src/app_bundle_utils.cpp index 214d278b2..b6321ad20 100644 --- a/code/ryzom/client/src/app_bundle_utils.cpp +++ b/code/ryzom/client/src/app_bundle_utils.cpp @@ -14,6 +14,7 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . +#include "stdpch.h" #include "app_bundle_utils.h" #if defined(NL_OS_MAC) From 15fa0b67f74f9e6b14bd2efcc6cfd6523e4c5da5 Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 7 Jan 2012 19:14:24 +0100 Subject: [PATCH 3/4] Fixed: ryzom_client_patcher missing file --- code/ryzom/tools/client/client_patcher/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/code/ryzom/tools/client/client_patcher/CMakeLists.txt b/code/ryzom/tools/client/client_patcher/CMakeLists.txt index 5ea9b320d..afe2cbc31 100644 --- a/code/ryzom/tools/client/client_patcher/CMakeLists.txt +++ b/code/ryzom/tools/client/client_patcher/CMakeLists.txt @@ -1,4 +1,5 @@ FILE(GLOB SRC main.cpp + ${CMAKE_SOURCE_DIR}/ryzom/client/src/app_bundle_utils.cpp ${CMAKE_SOURCE_DIR}/ryzom/client/src/client_cfg.cpp ${CMAKE_SOURCE_DIR}/ryzom/client/src/login_patch.cpp ${CMAKE_SOURCE_DIR}/ryzom/client/src/login_xdelta.cpp From 6a6115061c8604a3d358dda8dd3c32f2e8ffe202 Mon Sep 17 00:00:00 2001 From: kervala Date: Tue, 10 Jan 2012 10:19:52 +0100 Subject: [PATCH 4/4] Fixed: #1420 Client patcher compilation under Mac OS X --- code/ryzom/tools/client/client_patcher/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/ryzom/tools/client/client_patcher/CMakeLists.txt b/code/ryzom/tools/client/client_patcher/CMakeLists.txt index afe2cbc31..4a8b47bdf 100644 --- a/code/ryzom/tools/client/client_patcher/CMakeLists.txt +++ b/code/ryzom/tools/client/client_patcher/CMakeLists.txt @@ -22,6 +22,11 @@ TARGET_LINK_LIBRARIES(ryzom_client_patcher ryzom_sevenzip ${CURL_LIBRARIES}) +IF(APPLE) + FIND_LIBRARY(FOUNDATION_LIBRARY Foundation) + TARGET_LINK_LIBRARIES(ryzom_client_patcher ${FOUNDATION_LIBRARY}) +ENDIF(APPLE) + ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${CURL_DEFINITIONS} -DRZ_NO_CLIENT -DNL_USE_SEVENZIP) NL_DEFAULT_PROPS(ryzom_client_patcher "Ryzom, Tools: Ryzom Client Patcher")