diff options
author | Chris Xiong <chirs241097@gmail.com> | 2018-02-12 23:39:19 +0800 |
---|---|---|
committer | Chris Xiong <chirs241097@gmail.com> | 2018-02-12 23:39:19 +0800 |
commit | 7621516c1ca0ecf9f80d094763a1705c32d7458f (patch) | |
tree | e8cd9cd39107114354ea03d268468aac36837710 /smelt/glfw/sys_glfw.cpp | |
parent | 7a0afbb0ee9ead422307a36d90e60702d7dbc5fb (diff) | |
download | SMELT-7621516c1ca0ecf9f80d094763a1705c32d7458f.tar.xz |
Now we have unified the GLFW versions (uglily).
Also fixed a symbol conflict for the good old msvc.
Diffstat (limited to 'smelt/glfw/sys_glfw.cpp')
-rw-r--r-- | smelt/glfw/sys_glfw.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
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 <thread> #include <chrono> -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) |