mirror of
https://github.com/gwm17/Specter.git
synced 2024-11-22 18:28:52 -05:00
Finally made working version with MacOS Cocoa. Have to force the correct version of OpenGL at the window creation
This commit is contained in:
parent
227cd9620b
commit
7fe746c99d
|
@ -39,6 +39,13 @@ namespace Navigator {
|
||||||
NAV_INFO("Initializing GLFW ... Returned value {0}", passed);
|
NAV_INFO("Initializing GLFW ... Returned value {0}", passed);
|
||||||
glfwSetErrorCallback(GLFWErrorCallback);
|
glfwSetErrorCallback(GLFWErrorCallback);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef __APPLE__
|
||||||
|
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
|
||||||
|
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 2);
|
||||||
|
glfwWindowHint(GLFW_OPENGL_PROFILE,GLFW_OPENGL_CORE_PROFILE);
|
||||||
|
glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT,true);
|
||||||
|
#endif
|
||||||
|
|
||||||
m_window = glfwCreateWindow((int)m_data.width, (int)m_data.height, m_data.name.c_str(), nullptr, nullptr);
|
m_window = glfwCreateWindow((int)m_data.width, (int)m_data.height, m_data.name.c_str(), nullptr, nullptr);
|
||||||
|
|
||||||
|
@ -159,4 +166,4 @@ namespace Navigator {
|
||||||
{
|
{
|
||||||
return m_data.vsyncFlag;
|
return m_data.vsyncFlag;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
2
Navigator/vendor/imgui
vendored
2
Navigator/vendor/imgui
vendored
|
@ -1 +1 @@
|
||||||
Subproject commit 37435d59625642f246f8ee2ecace0326dcf90fbd
|
Subproject commit 1b5d6dbc7c1c24aa4c32defb88026c8143e757bf
|
Loading…
Reference in New Issue
Block a user