mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-12-29 20:30:54 +00:00
Changed: Improvements in patch system
This commit is contained in:
parent
7e6cf7c213
commit
3ed24c6955
4 changed files with 29 additions and 24 deletions
|
@ -236,8 +236,6 @@ MACRO(NL_SETUP_DEFAULT_OPTIONS)
|
|||
OPTION(WITH_COVERAGE "With Code Coverage Support" OFF)
|
||||
OPTION(WITH_PCH "With Precompiled Headers" ON )
|
||||
OPTION(FINAL_VERSION "Build in Final Version mode" ON )
|
||||
OPTION(WITH_PERFHUD "Build with NVIDIA PerfHUD support" OFF )
|
||||
OPTION(WITH_PATCH_SUPPORT "Build with in-game Patch Support" OFF )
|
||||
|
||||
# Default to static building on Windows.
|
||||
IF(WIN32)
|
||||
|
@ -325,6 +323,7 @@ MACRO(NL_SETUP_NEL_DEFAULT_OPTIONS)
|
|||
|
||||
OPTION(WITH_LIBOVR "With LibOVR support" OFF)
|
||||
OPTION(WITH_LIBVR "With LibVR support" OFF)
|
||||
OPTION(WITH_PERFHUD "With NVIDIA PerfHUD support" OFF)
|
||||
ENDMACRO(NL_SETUP_NEL_DEFAULT_OPTIONS)
|
||||
|
||||
MACRO(NL_SETUP_NELNS_DEFAULT_OPTIONS)
|
||||
|
@ -343,6 +342,7 @@ MACRO(NL_SETUP_RYZOM_DEFAULT_OPTIONS)
|
|||
OPTION(WITH_RYZOM_TOOLS "Build Ryzom Core Tools" ON )
|
||||
OPTION(WITH_RYZOM_SERVER "Build Ryzom Core Services" ON )
|
||||
OPTION(WITH_RYZOM_SOUND "Enable Ryzom Core Sound" ON )
|
||||
OPTION(WITH_RYZOM_PATCH "Enable Ryzom in-game patch support" OFF)
|
||||
|
||||
###
|
||||
# Optional support
|
||||
|
|
|
@ -4,8 +4,12 @@ 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")
|
||||
SET(SEVENZIP_LIBRARY "ryzom_sevenzip")
|
||||
|
||||
ADD_SUBDIRECTORY(seven_zip)
|
||||
|
||||
|
|
|
@ -422,16 +422,16 @@ CClientConfig::CClientConfig()
|
|||
MouseOverFX = "sfx_selection_mouseover.ps";
|
||||
SelectionFXSize = 0.8f;
|
||||
|
||||
// only force patching under Windows by default
|
||||
#if WITH_PATCH_SUPPORT
|
||||
PatchWanted = true;
|
||||
#else
|
||||
PatchWanted = false;
|
||||
#endif
|
||||
PatchUrl = "";
|
||||
PatchletUrl = "";
|
||||
PatchVersion = "";
|
||||
PatchServer = "";
|
||||
#if RZ_PATCH
|
||||
PatchWanted = true;
|
||||
#else
|
||||
PatchWanted = false;
|
||||
#endif
|
||||
|
||||
PatchUrl.clear();
|
||||
PatchletUrl.clear();
|
||||
PatchVersion.clear();
|
||||
PatchServer.clear();
|
||||
|
||||
WebIgMainDomain = "atys.ryzom.com";
|
||||
WebIgTrustedDomains.push_back(WebIgMainDomain);
|
||||
|
|
|
@ -18,16 +18,14 @@
|
|||
// Includes
|
||||
//
|
||||
|
||||
#include "stdpch.h"
|
||||
|
||||
#include <sys/stat.h>
|
||||
|
||||
#ifdef NL_OS_WINDOWS
|
||||
//windows doesnt have unistd.h
|
||||
#else
|
||||
#ifndef NL_OS_WINDOWS
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
#include "stdpch.h"
|
||||
|
||||
#include <memory>
|
||||
#include <errno.h>
|
||||
|
||||
|
@ -46,10 +44,10 @@
|
|||
#include "nel/misc/big_file.h"
|
||||
#include "nel/misc/i18n.h"
|
||||
|
||||
#define NL_USE_SEVENZIP 1
|
||||
#define RZ_USE_SEVENZIP 1
|
||||
|
||||
// 7 zip includes
|
||||
#ifdef NL_USE_SEVENZIP
|
||||
#ifdef RZ_USE_SEVENZIP
|
||||
#include "seven_zip/7zCrc.h"
|
||||
#include "seven_zip/7zIn.h"
|
||||
#include "seven_zip/7zExtract.h"
|
||||
|
@ -746,7 +744,6 @@ void CPatchManager::deleteBatchFile()
|
|||
// ****************************************************************************
|
||||
void CPatchManager::createBatchFile(CProductDescriptionForClient &descFile, bool wantRyzomRestart, bool useBatchFile)
|
||||
{
|
||||
|
||||
uint nblab = 0;
|
||||
|
||||
FILE *fp = NULL;
|
||||
|
@ -920,7 +917,7 @@ void CPatchManager::createBatchFile(CProductDescriptionForClient &descFile, bool
|
|||
#ifdef NL_OS_WINDOWS
|
||||
fprintf(fp, "start %s %%1 %%2 %%3\n", RyzomFilename.c_str());
|
||||
#else
|
||||
fprintf(fp, "/opt/tita/%s $1 $2 $3\n", RyzomFilename.c_str());
|
||||
fprintf(fp, "%s $1 $2 $3\n", RyzomFilename.c_str());
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -1010,7 +1007,9 @@ void CPatchManager::executeBatchFile()
|
|||
{
|
||||
int errsv = errno;
|
||||
nlerror("Execl Error: %d %s", errsv, strCmdLine.c_str(), (char *) NULL);
|
||||
} else {
|
||||
}
|
||||
else
|
||||
{
|
||||
nlinfo("Ran batch file r2Mode Success");
|
||||
}
|
||||
}
|
||||
|
@ -1020,7 +1019,9 @@ void CPatchManager::executeBatchFile()
|
|||
{
|
||||
int errsv = errno;
|
||||
nlerror("Execl r2mode Error: %d %s", errsv, strCmdLine.c_str());
|
||||
} else {
|
||||
}
|
||||
else
|
||||
{
|
||||
nlinfo("Ran batch file Success");
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue