From 4d4daf0541fe2937b5ebe1b3d68aaa87978793b5 Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 23 Mar 2014 20:25:48 +0100 Subject: [PATCH] Changed: Renamed RZ_PATCH to RZ_USE_PATCH --- code/ryzom/client/src/CMakeLists.txt | 8 ++++---- code/ryzom/client/src/client_cfg.cpp | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/ryzom/client/src/CMakeLists.txt b/code/ryzom/client/src/CMakeLists.txt index 4ffe21c24..1fc53145b 100644 --- a/code/ryzom/client/src/CMakeLists.txt +++ b/code/ryzom/client/src/CMakeLists.txt @@ -4,15 +4,15 @@ ADD_SUBDIRECTORY(client_sheets) IF(WITH_RYZOM_CLIENT) -IF(WITH_RYZOM_PATCH) - ADD_DEFINITIONS(-DRZ_USE_PATCH) -ENDIF(WITH_RYZOM_PATCH) - # These are Windows/MFC apps SET(SEVENZIP_LIBRARY "ryzom_sevenzip") ADD_SUBDIRECTORY(seven_zip) +IF(WITH_RYZOM_PATCH) + ADD_DEFINITIONS(-DRZ_USE_PATCH) +ENDIF(WITH_RYZOM_PATCH) + FILE(GLOB CFG ../*.cfg ../*.cfg.in) FILE(GLOB SRC *.cpp *.h motion/*.cpp motion/*.h client.rc) FILE(GLOB SRC_INTERFACE interface_v3/*.h interface_v3/*.cpp) diff --git a/code/ryzom/client/src/client_cfg.cpp b/code/ryzom/client/src/client_cfg.cpp index d314f309f..56decaa63 100644 --- a/code/ryzom/client/src/client_cfg.cpp +++ b/code/ryzom/client/src/client_cfg.cpp @@ -422,11 +422,11 @@ CClientConfig::CClientConfig() MouseOverFX = "sfx_selection_mouseover.ps"; SelectionFXSize = 0.8f; -#if RZ_PATCH +#if RZ_USE_PATCH PatchWanted = true; -#else +#else PatchWanted = false; -#endif +#endif PatchUrl.clear(); PatchletUrl.clear();