From 7621516c1ca0ecf9f80d094763a1705c32d7458f Mon Sep 17 00:00:00 2001 From: Chris Xiong Date: Mon, 12 Feb 2018 23:39:19 +0800 Subject: Now we have unified the GLFW versions (uglily). Also fixed a symbol conflict for the good old msvc. --- smelt/glfw/sys_glfw.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'smelt/glfw/sys_glfw.cpp') diff --git a/smelt/glfw/sys_glfw.cpp b/smelt/glfw/sys_glfw.cpp index 2c8b2e9..89049dc 100644 --- a/smelt/glfw/sys_glfw.cpp +++ b/smelt/glfw/sys_glfw.cpp @@ -11,7 +11,7 @@ #include "smelt_internal.hpp" #include #include -static const char* SYS_GLFW_SRCFN="smelt/glfw/sys_glfw.cpp"; +static const char* SYS_GLFW_SRCFN="smelt/glfw_m/sys_glfw.cpp"; int refcnt=0; SMELT_IMPL *pSM=0; char lasterr[1024]; @@ -115,8 +115,14 @@ bool SMELT_IMPL::smInit() glfwWindowHint(GLFW_ALPHA_BITS,8); glfwWindowHint(GLFW_DEPTH_BITS,16); glfwWindowHint(GLFW_DOUBLEBUFFER,1); +#ifdef USE_OPENGL_COMPATIBILITY_PROFILE glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR,2); glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR,1); +#else + glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR,3); + glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR,3); + glfwWindowHint(GLFW_OPENGL_PROFILE,GLFW_OPENGL_CORE_PROFILE); +#endif GLFWwindow *screen=glfwCreateWindow(windowed?scrw:dispw,windowed?scrh:disph,winTitle,NULL,NULL); hwnd=(void*)screen; if(!hwnd) -- cgit v1.2.3