Fix compilation on linux

This commit is contained in:
s1lent 2017-10-21 03:26:41 +07:00 committed by s1lentq
parent 9cdd1d1be8
commit 4ddf4d712c
4 changed files with 10 additions and 8 deletions

View File

@ -17,7 +17,7 @@ CFLAGS = $(OPT_FLAGS)
CFLAGS += -g0 -fvisibility=hidden -DNOMINMAX -fvisibility-inlines-hidden\ CFLAGS += -g0 -fvisibility=hidden -DNOMINMAX -fvisibility-inlines-hidden\
-DNDEBUG -Dlinux -D__linux__ -std=c++11 -shared -wd147,274 -fasm-blocks\ -DNDEBUG -Dlinux -D__linux__ -std=c++11 -shared -wd147,274 -fasm-blocks\
-Qoption,cpp,--treat_func_as_string_literal_cpp -fno-rtti\ -Qoption,cpp,--treat_func_as_string_literal_cpp -fno-rtti\
-D_byteswap_ulong=_bswap -D_mkdir=mkdir -D_stricmp=strcasecmp -D_byteswap_ulong=_bswap -D_vsnprintf=vsnprintf -D_mkdir=mkdir -D_stricmp=strcasecmp
OBJ_LINUX := $(OBJECTS:%.c=$(BIN_DIR)/%.o) OBJ_LINUX := $(OBJECTS:%.c=$(BIN_DIR)/%.o)

View File

@ -18,6 +18,13 @@
#pragma once #pragma once
#include "consistency.h"
void UTIL_Printf(const char *fmt, ...);
void UTIL_LogPrintf(const char *fmt, ...);
char *UTIL_VarArgs(const char *format, ...);
void NORETURN Sys_Error(const char *error, ...);
void SV_DropClient(IRehldsHook_SV_DropClient *chain, IGameClient *pClient, bool crash, const char *string); void SV_DropClient(IRehldsHook_SV_DropClient *chain, IGameClient *pClient, bool crash, const char *string);
bool SV_CheckConsistencyResponse(IRehldsHook_SV_CheckConsistencyResponse *chain, IGameClient *pSenderClient, resource_t *resource, uint32 hash); bool SV_CheckConsistencyResponse(IRehldsHook_SV_CheckConsistencyResponse *chain, IGameClient *pSenderClient, resource_t *resource, uint32 hash);
int SV_TransferConsistencyInfo(IRehldsHook_SV_TransferConsistencyInfo *chain); int SV_TransferConsistencyInfo(IRehldsHook_SV_TransferConsistencyInfo *chain);

View File

@ -36,12 +36,12 @@
#include "engine_rehlds.h" #include "engine_rehlds.h"
#include "consistency.h" #include "consistency.h"
#include "main.h"
#include "engine_hlds_api.h" #include "engine_hlds_api.h"
#include "hookchains_impl.h" #include "hookchains_impl.h"
#include "rechecker_api.h" #include "rechecker_api.h"
#include "rechecker_api_impl.h" #include "rechecker_api_impl.h"
#include "main.h"
#include "resource.h" #include "resource.h"
#include "cmdexec.h" #include "cmdexec.h"
@ -57,8 +57,3 @@
#define NORETURN __attribute__((noreturn)) #define NORETURN __attribute__((noreturn))
#define WINAPI /* */ #define WINAPI /* */
#endif // _WIN32 #endif // _WIN32
extern void UTIL_Printf(const char *fmt, ...);
extern void UTIL_LogPrintf(const char *fmt, ...);
extern char *UTIL_VarArgs(const char *format, ...);
extern void NORETURN Sys_Error(const char *error, ...);

View File

@ -51,7 +51,6 @@ int CResourceFile::CreateResourceList()
int nIndex = m_HeadResource.nIndex + 1; int nIndex = m_HeadResource.nIndex + 1;
int nCustomConsistency = 1; int nCustomConsistency = 1;
std::vector<resource_t> sortList;
for (auto res : m_resourceList) for (auto res : m_resourceList)
{ {
// Prevent duplicate of filenames // Prevent duplicate of filenames
@ -98,6 +97,7 @@ int CResourceFile::CreateResourceList()
} }
} }
std::vector<resource_t> sortList;
for (int i = 0; i < g_RehldsServerData->GetResourcesNum(); i++) for (int i = 0; i < g_RehldsServerData->GetResourcesNum(); i++)
{ {
sortList.push_back(*g_RehldsServerData->GetResource(i)); sortList.push_back(*g_RehldsServerData->GetResource(i));