diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-01-23 14:14:15 +0100 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-01-23 14:14:15 +0100 |
| commit | 904090cbb6cf7978e2e093da1ea1d7245dcb02c8 (patch) | |
| tree | b48af2798ab8faea3fcfe16d1ed8629dc025b8ab /src/skel/glfw | |
| parent | Remove restrictions in CGame::Process (diff) | |
| parent | added some missing functions (diff) | |
| download | re3-904090cbb6cf7978e2e093da1ea1d7245dcb02c8.tar re3-904090cbb6cf7978e2e093da1ea1d7245dcb02c8.tar.gz re3-904090cbb6cf7978e2e093da1ea1d7245dcb02c8.tar.bz2 re3-904090cbb6cf7978e2e093da1ea1d7245dcb02c8.tar.lz re3-904090cbb6cf7978e2e093da1ea1d7245dcb02c8.tar.xz re3-904090cbb6cf7978e2e093da1ea1d7245dcb02c8.tar.zst re3-904090cbb6cf7978e2e093da1ea1d7245dcb02c8.zip | |
Diffstat (limited to 'src/skel/glfw')
| -rw-r--r-- | src/skel/glfw/glfw.cpp | 45 |
1 files changed, 18 insertions, 27 deletions
diff --git a/src/skel/glfw/glfw.cpp b/src/skel/glfw/glfw.cpp index d0818d6d..3a070c33 100644 --- a/src/skel/glfw/glfw.cpp +++ b/src/skel/glfw/glfw.cpp @@ -1,22 +1,30 @@ #if defined RW_GL3 && !defined LIBRW_SDL2 #ifdef _WIN32 -#include <windows.h> +#include <shlobj.h> +#include <basetsd.h> #include <mmsystem.h> +#include <regstr.h> #include <shellapi.h> #include <windowsx.h> -#include <basetsd.h> -#include <regstr.h> -#include <shlobj.h> + +DWORD _dwOperatingSystemVersion; +#include "resource.h" +#else +long _dwOperatingSystemVersion; +#ifndef __APPLE__ +#include <sys/sysinfo.h> +#else +#include <mach/mach_host.h> +#include <sys/sysctl.h> +#endif +#include <errno.h> +#include <locale.h> +#include <signal.h> +#include <stddef.h> #endif -#define WITHWINDOWS #include "common.h" - -#pragma warning( push ) -#pragma warning( disable : 4005) -#pragma warning( pop ) - #if (defined(_MSC_VER)) #include <tchar.h> #endif /* (defined(_MSC_VER)) */ @@ -72,23 +80,6 @@ static psGlobalType PsGlobal; size_t _dwMemAvailPhys; RwUInt32 gGameState; -#ifdef _WIN32 -DWORD _dwOperatingSystemVersion; -#include "resource.h" -#else -long _dwOperatingSystemVersion; -#ifndef __APPLE__ -#include <sys/sysinfo.h> -#else -#include <mach/mach_host.h> -#include <sys/sysctl.h> -#endif -#include <stddef.h> -#include <locale.h> -#include <signal.h> -#include <errno.h> -#endif - #ifdef DONT_TRUST_RECOGNIZED_JOYSTICKS char gSelectedJoystickName[128] = ""; #endif |