fixed premake4 issue causing the build to fail on non-Mac platforms

This commit is contained in:
erwin coumans
2015-05-06 12:05:25 -07:00
parent 0da584a42d
commit 5a0b744e73
2 changed files with 15 additions and 8 deletions

View File

@@ -29,10 +29,6 @@
configuration {"Windows"}
links {"opengl32","glu32"}
configuration {"MacOSX"}
if (not findOpenGL3()) then
defines {"NO_OPENGL3"}
end
links { "OpenGL.framework"}
configuration {"not Windows", "not MacOSX"}
if os.is("Linux") then

View File

@@ -30,6 +30,11 @@
description = "Dynamically load OpenGL (instead of static/dynamic linking)"
}
newoption
{
trigger = "noopengl3",
description = "Don't compile any OpenGL3+ code"
}
newoption
{
@@ -37,7 +42,7 @@
description = "Use Midi controller to control parameters"
}
-- _OPTIONS["midi"] = "1";
-- --_OPTIONS["midi"] = "1";
newoption
{
@@ -112,6 +117,10 @@
dofile ("findDirectX11.lua")
dofile ("findOpenGLGlewGlut.lua")
if (not findOpenGL3()) then
defines {"NO_OPENGL3"}
end
language "C++"
include "../examples/ExampleBrowser"
@@ -122,9 +131,11 @@
include "../examples/HelloWorld"
include "../examples/BasicDemo"
if _OPTIONS["enet"] then
include "../examples/ThirdPartyLibs/enet"
include "../test/enet/client"
include "../test/enet/server"
end
if not _OPTIONS["without-gtest"] then
include "../test/gtest-1.7.0"