Merge branch 'master' of https://github.com/citra-emu/citra
This commit is contained in:
commit
06c041fa79
4 changed files with 9 additions and 10 deletions
|
@ -28,8 +28,13 @@ EmuWindow_GLFW::EmuWindow_GLFW() {
|
||||||
}
|
}
|
||||||
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
|
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
|
||||||
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 2);
|
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 2);
|
||||||
|
|
||||||
|
#if EMU_PLATFORM == PLATFORM_MACOSX
|
||||||
|
// GLFW on OSX requires these window hints to be set to create a 3.2+ GL context.
|
||||||
glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);
|
glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);
|
||||||
glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
|
glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
|
||||||
|
#endif
|
||||||
|
|
||||||
m_render_window = glfwCreateWindow(VideoCore::kScreenTopWidth,
|
m_render_window = glfwCreateWindow(VideoCore::kScreenTopWidth,
|
||||||
(VideoCore::kScreenTopHeight + VideoCore::kScreenBottomHeight),
|
(VideoCore::kScreenTopHeight + VideoCore::kScreenBottomHeight),
|
||||||
m_window_title.c_str(), NULL, NULL);
|
m_window_title.c_str(), NULL, NULL);
|
||||||
|
|
|
@ -47,7 +47,7 @@
|
||||||
#define EMU_PLATFORM PLATFORM_WINDOWS
|
#define EMU_PLATFORM PLATFORM_WINDOWS
|
||||||
|
|
||||||
#elif defined( __APPLE__ ) || defined( __APPLE_CC__ )
|
#elif defined( __APPLE__ ) || defined( __APPLE_CC__ )
|
||||||
#define EMU_PLATFORM PLATFORM_MAXOSX
|
#define EMU_PLATFORM PLATFORM_MACOSX
|
||||||
|
|
||||||
#elif defined(__linux__)
|
#elif defined(__linux__)
|
||||||
#define EMU_PLATFORM PLATFORM_LINUX
|
#define EMU_PLATFORM PLATFORM_LINUX
|
||||||
|
@ -87,7 +87,6 @@ inline struct tm* localtime_r(const time_t *clock, struct tm *result) {
|
||||||
#define __stdcall
|
#define __stdcall
|
||||||
#define __cdecl
|
#define __cdecl
|
||||||
|
|
||||||
#define LONG long
|
|
||||||
#define BOOL bool
|
#define BOOL bool
|
||||||
#define DWORD u32
|
#define DWORD u32
|
||||||
|
|
||||||
|
@ -97,7 +96,6 @@ inline struct tm* localtime_r(const time_t *clock, struct tm *result) {
|
||||||
|
|
||||||
// TODO: Hacks..
|
// TODO: Hacks..
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
#define MAX_PATH PATH_MAX
|
|
||||||
|
|
||||||
#include <strings.h>
|
#include <strings.h>
|
||||||
#define stricmp(str1, str2) strcasecmp(str1, str2)
|
#define stricmp(str1, str2) strcasecmp(str1, str2)
|
||||||
|
|
|
@ -40,13 +40,6 @@
|
||||||
|
|
||||||
#include "core/arm/interpreter/armdefs.h"
|
#include "core/arm/interpreter/armdefs.h"
|
||||||
|
|
||||||
#define u16 uint16_t
|
|
||||||
#define u32 uint32_t
|
|
||||||
#define u64 uint64_t
|
|
||||||
#define s16 int16_t
|
|
||||||
#define s32 int32_t
|
|
||||||
#define s64 int64_t
|
|
||||||
|
|
||||||
#define pr_info //printf
|
#define pr_info //printf
|
||||||
#define pr_debug //printf
|
#define pr_debug //printf
|
||||||
|
|
||||||
|
|
|
@ -30,8 +30,11 @@ void Start() {
|
||||||
|
|
||||||
/// Initialize the video core
|
/// Initialize the video core
|
||||||
void Init(EmuWindow* emu_window) {
|
void Init(EmuWindow* emu_window) {
|
||||||
|
|
||||||
|
#if EMU_PLATFORM == PLATFORM_MACOSX
|
||||||
// Known problem with GLEW prevents contexts above 2.x on OSX unless glewExperimental is enabled.
|
// Known problem with GLEW prevents contexts above 2.x on OSX unless glewExperimental is enabled.
|
||||||
glewExperimental = GL_TRUE;
|
glewExperimental = GL_TRUE;
|
||||||
|
#endif
|
||||||
|
|
||||||
g_emu_window = emu_window;
|
g_emu_window = emu_window;
|
||||||
g_emu_window->MakeCurrent();
|
g_emu_window->MakeCurrent();
|
||||||
|
|
Loading…
Reference in a new issue