From fc7a5ad63f2547da19b1523228ea9299fc7effd9 Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 20 Dec 2015 19:08:52 +0100 Subject: [PATCH] Changed: Preparation of future binary patching (each supported platform has its own BNP with binaries) --- code/ryzom/client/src/login_patch.cpp | 29 ++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/code/ryzom/client/src/login_patch.cpp b/code/ryzom/client/src/login_patch.cpp index 42b9a530d..8a584ee3f 100644 --- a/code/ryzom/client/src/login_patch.cpp +++ b/code/ryzom/client/src/login_patch.cpp @@ -201,11 +201,34 @@ CPatchManager::CPatchManager() : State("t_state"), DataScanState("t_data_scan_st _StateListener = NULL; _StartRyzomAtEnd = true; -#ifdef NL_OS_UNIX - // don't use cfg, exe and dll from Windows version + // only download binaries for current platform ForceRemovePatchCategories.clear(); ForceRemovePatchCategories.push_back("main_exedll"); - ForceRemovePatchCategories.push_back("main_cfg"); +#if defined(NL_OS_WIN64) + ForceRemovePatchCategories.push_back("main_exedll_win32"); + ForceRemovePatchCategories.push_back("main_exedll_linux32"); + ForceRemovePatchCategories.push_back("main_exedll_linux64"); + ForceRemovePatchCategories.push_back("main_exedll_osx"); +#elif defined(NL_OS_WIN32) + ForceRemovePatchCategories.push_back("main_exedll_win34"); + ForceRemovePatchCategories.push_back("main_exedll_linux32"); + ForceRemovePatchCategories.push_back("main_exedll_linux64"); + ForceRemovePatchCategories.push_back("main_exedll_osx"); +#elif defined(NL_OS_APPLE) + ForceRemovePatchCategories.push_back("main_exedll_win32"); + ForceRemovePatchCategories.push_back("main_exedll_win34"); + ForceRemovePatchCategories.push_back("main_exedll_linux32"); + ForceRemovePatchCategories.push_back("main_exedll_linux64"); +#elif defined(NL_OS_UNIX) && defined(_LP64) + ForceRemovePatchCategories.push_back("main_exedll_win32"); + ForceRemovePatchCategories.push_back("main_exedll_win34"); + ForceRemovePatchCategories.push_back("main_exedll_linux32"); + ForceRemovePatchCategories.push_back("main_exedll_osx"); +#else + ForceRemovePatchCategories.push_back("main_exedll_win32"); + ForceRemovePatchCategories.push_back("main_exedll_win64"); + ForceRemovePatchCategories.push_back("main_exedll_linux64"); + ForceRemovePatchCategories.push_back("main_exedll_osx"); #endif }