mirror of
https://gitlab.com/Mr_Goldberg/goldberg_emulator.git
synced 2024-11-14 10:50:13 +01:00
Added some os detection
Need to detect linux x86 or x64
This commit is contained in:
parent
92ed36f499
commit
495bc957cd
2 changed files with 19 additions and 6 deletions
16
dll/base.h
16
dll/base.h
|
@ -18,6 +18,20 @@
|
||||||
#ifndef BASE_INCLUDE
|
#ifndef BASE_INCLUDE
|
||||||
#define BASE_INCLUDE
|
#define BASE_INCLUDE
|
||||||
|
|
||||||
|
#if defined(WIN64) || defined(_WIN64) || defined(__MINGW64__)
|
||||||
|
#define __WINDOWS_64__
|
||||||
|
#elif defined(WIN32) || defined(_WIN32) || defined(__MINGW32__)
|
||||||
|
#define __WINDOWS_32__
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(__WINDOWS_32__) || defined(__WINDOWS_64__)
|
||||||
|
#define __WINDOWS__
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(__linux__) || defined(linux)
|
||||||
|
#define __LINUX__
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined(WIN32) || defined(_WIN32)
|
#if defined(WIN32) || defined(_WIN32)
|
||||||
#define STEAM_WIN32
|
#define STEAM_WIN32
|
||||||
#pragma warning( disable : 4716)
|
#pragma warning( disable : 4716)
|
||||||
|
@ -205,7 +219,7 @@ public:
|
||||||
if (it != cr.callbacks.end()) {
|
if (it != cr.callbacks.end()) {
|
||||||
cr.callbacks.erase(it);
|
cr.callbacks.erase(it);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cr.callbacks.size() == 0) {
|
if (cr.callbacks.size() == 0) {
|
||||||
cr.to_delete = true;
|
cr.to_delete = true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,11 +2,9 @@
|
||||||
#define __INCLUDED_WINDOWS_HOOK_H__
|
#define __INCLUDED_WINDOWS_HOOK_H__
|
||||||
|
|
||||||
#include "Base_Hook.h"
|
#include "Base_Hook.h"
|
||||||
#ifndef NO_OVERLAY
|
|
||||||
|
|
||||||
#define WIN32_LEAN_AND_MEAN
|
#ifdef __WINDOWS__
|
||||||
#define VC_EXTRALEAN
|
#ifndef NO_OVERLAY
|
||||||
#include <Windows.h>
|
|
||||||
|
|
||||||
class Windows_Hook : public Base_Hook
|
class Windows_Hook : public Base_Hook
|
||||||
{
|
{
|
||||||
|
@ -48,4 +46,5 @@ public:
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif//NO_OVERLAY
|
#endif//NO_OVERLAY
|
||||||
#endif//__INCLUDED_WINDOWS_HOOK_H__
|
#endif//__WINDOWS__
|
||||||
|
#endif//__INCLUDED_WINDOWS_HOOK_H__
|
||||||
|
|
Loading…
Reference in a new issue