diff --git a/Makefile b/Makefile index ca7ae1c..072e271 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ NAME = rechecker COMPILER = /opt/intel/bin/icpc -OBJECTS = src/main.cpp src/meta_api.cpp src/dllapi.cpp\ - src/cmdexec.cpp src/engine_rehlds.cpp src/h_export.cpp\ - src/resource.cpp src/sdk_util.cpp public/interface.cpp +OBJECTS = src/main.cpp src/meta_api.cpp src/dllapi.cpp src/cmdexec.cpp \ + src/engine_rehlds.cpp src/h_export.cpp src/resource.cpp \ + src/sdk_util.cpp src/hookchains_impl.cpp src/rechecker_api_impl.cpp public/interface.cpp LINK = -lm -ldl -static-intel -static-libgcc -no-intel-extensions diff --git a/engine/osconfig.h b/engine/osconfig.h index 2e43293..5d14deb 100644 --- a/engine/osconfig.h +++ b/engine/osconfig.h @@ -135,7 +135,10 @@ #define ARRAYSIZE(p) (sizeof(p)/sizeof(p[0])) #define _MAX_FNAME NAME_MAX - #define MAX_PATH 260 + + #ifndef MAX_PATH + #define MAX_PATH 260 + #endif // MAX_PATH typedef void *HWND; diff --git a/src/meta_api.cpp b/src/meta_api.cpp index ae2d3e9..9dc3fbe 100644 --- a/src/meta_api.cpp +++ b/src/meta_api.cpp @@ -4,7 +4,7 @@ plugin_info_t Plugin_info = { META_INTERFACE_VERSION, "Rechecker", - "2.2", + "2.3", __DATE__, "s1lent", "http://www.dedicated-server.ru/", diff --git a/src/precompiled.h b/src/precompiled.h index 96db285..f36ab50 100644 --- a/src/precompiled.h +++ b/src/precompiled.h @@ -1,8 +1,14 @@ #pragma once -#ifndef _WIN32 +#ifdef _WIN32 // WINDOWS + #pragma warning(disable : 4005) +#else #define _stricmp strcasecmp #define _mkdir mkdir + #ifdef __FUNCTION__ + #undef __FUNCTION__ + #endif + #define __FUNCTION__ __func__ #endif // _WIN32 #define MAX_PATH_LENGTH 260 @@ -35,17 +41,17 @@ //#include "sdk_util.h" // UTIL_LogPrintf, etc #undef DLLEXPORT -#ifdef _WIN32 -#define DLLEXPORT __declspec(dllexport) -#define NOINLINE __declspec(noinline) -#define NORETURN __declspec(noreturn) -#else -#define DLLEXPORT __attribute__((visibility("default"))) -#define NOINLINE __attribute__((noinline)) -#define NORETURN __attribute__((noreturn)) -#define WINAPI /* */ -#endif // _WIN32 +#ifdef _WIN32 + #define DLLEXPORT __declspec(dllexport) + #define NOINLINE __declspec(noinline) + #define NORETURN __declspec(noreturn) +#else + #define DLLEXPORT __attribute__((visibility("default"))) + #define NOINLINE __attribute__((noinline)) + #define NORETURN __attribute__((noreturn)) + #define WINAPI /* */ +#endif // _WIN32 extern void UTIL_Printf(const char *fmt, ...); extern void UTIL_LogPrintf(const char *fmt, ...);