Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

allow to configure glfw on Mac OSX, disabled by default

Browse Source
This commit is contained in:
Erwin Coumans
2017-09-20 08:12:59 -07:00
parent b079277d51
commit 3e0b72b632
2 changed files with 39 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
build3/premake4.lua
View File

@@ -249,6 +249,33 @@ end
_OPTIONS["python_lib_dir"] = default_python_lib_dir _OPTIONS["python_lib_dir"] = default_python_lib_dir
end end
if os.is("Linux") then
default_glfw_include_dir = "usr/local/include/GLFW"
default_glfw_lib_dir = "/usr/local/lib/"
default_glfw_lib_name = "glfw3"
end
if os.is("macosx") then
default_glfw_include_dir = "/usr/local/Cellar/glfw/3.2.1/include"
default_glfw_lib_dir = "/usr/local/Cellar/glfw/3.2.1/lib"
default_glfw_lib_name = "glfw"
end
if os.is("Windows") then
default_glfw_include_dir = ""
default_glfw_lib_dir = ""
default_glfw_lib_name = "glfw3"
end
if not _OPTIONS["glfw_lib_dir"] then
_OPTIONS["glfw_lib_dir"] = default_glfw_lib_dir
end
if not _OPTIONS["glfw_include_dir"] then
_OPTIONS["glfw_include_dir"] = default_glfw_include_dir
end
if not _OPTIONS["glfw_lib_name"] then
_OPTIONS["glfw_lib_name"] = default_glfw_lib_name
end
newoption newoption
{ {
trigger = "glfw_include_dir", trigger = "glfw_include_dir",
@@ -256,6 +283,13 @@ end
description = "GLFW 3.x include directory" description = "GLFW 3.x include directory"
} }
newoption
{
trigger = "glfw_lib_name",
value = default_glfw_lib_name,
description = "GLFW 3.x library name (glfw, glfw3)"
}
newoption newoption
{ {
trigger = "glfw_lib_dir", trigger = "glfw_lib_dir",
@@ -287,7 +321,7 @@ end
libdirs { libdirs {
_OPTIONS["glfw_lib_dir"] _OPTIONS["glfw_lib_dir"]
} }
links {"glfw3"} links { _OPTIONS["glfw_lib_name"]}
files { projectRootDir .. "examples/ThirdPartyLibs/glad/glad.c" } files { projectRootDir .. "examples/ThirdPartyLibs/glad/glad.c" }
end end
function findOpenGL3() function findOpenGL3()

2
examples/OpenGLWindow/GLFWOpenGLWindow.cpp
View File

@@ -276,6 +276,8 @@ void GLFWOpenGLWindow::createWindow(const b3gWindowConstructionInfo& ci)
{ {
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3); glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3); glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GLFW_TRUE);
} }