diff options
| author | withmorten <morten.with@gmail.com> | 2021-02-18 02:32:49 +0100 |
|---|---|---|
| committer | withmorten <morten.with@gmail.com> | 2021-02-18 02:38:12 +0100 |
| commit | 037c33215801fdf10019d8e61c7de9a532256f92 (patch) | |
| tree | 20e5e2c2e00012366b29e5bbd2dcd406e0769698 /premake5.lua | |
| parent | update librw; gl cleanup (diff) | |
| parent | update librw; gl cleanup (diff) | |
| download | re3-037c33215801fdf10019d8e61c7de9a532256f92.tar re3-037c33215801fdf10019d8e61c7de9a532256f92.tar.gz re3-037c33215801fdf10019d8e61c7de9a532256f92.tar.bz2 re3-037c33215801fdf10019d8e61c7de9a532256f92.tar.lz re3-037c33215801fdf10019d8e61c7de9a532256f92.tar.xz re3-037c33215801fdf10019d8e61c7de9a532256f92.tar.zst re3-037c33215801fdf10019d8e61c7de9a532256f92.zip | |
Diffstat (limited to 'premake5.lua')
| -rw-r--r-- | premake5.lua | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/premake5.lua b/premake5.lua index afee03a1..77530c59 100644 --- a/premake5.lua +++ b/premake5.lua @@ -1,11 +1,4 @@ newoption { - trigger = "glewdir", - value = "PATH", - description = "Directory of GLEW", - default = "vendor/glew-2.1.0" -} - -newoption { trigger = "glfwdir64", value = "PATH", description = "Directory of glfw", @@ -165,7 +158,6 @@ workspace "reLCS" filter "platforms:*librw_gl3_glfw*" defines { "RW_GL3" } - includedirs { path.join(_OPTIONS["glewdir"], "include") } if(not _OPTIONS["with-librw"]) then libdirs { path.join(Librw, "lib/%{getsys(cfg.system)}-%{getarch(cfg.architecture)}-gl3/%{cfg.buildcfg}") } end @@ -176,9 +168,6 @@ workspace "reLCS" filter "platforms:*amd64-librw_gl3_glfw*" includedirs { path.join(_OPTIONS["glfwdir64"], "include") } - filter "platforms:win*librw_gl3_glfw*" - defines { "GLEW_STATIC" } - filter {} function setpaths (gamepath, exepath) @@ -202,7 +191,8 @@ project "librw" targetname "rw" targetdir(path.join(Librw, "lib/%{cfg.platform}/%{cfg.buildcfg}")) files { path.join(Librw, "src/*.*") } - files { path.join(Librw, "src/*/*.*") } + files { path.join(Librw, "src/*/*.*") }
+ files { path.join(Librw, "src/gl/*/*.*") } filter { "platforms:*x86*" } architecture "x86" @@ -406,25 +396,23 @@ project "reLCS" libdirs { "sdk/dx8sdk/lib" } filter "platforms:win-x86*gl3_glfw*" - libdirs { path.join(_OPTIONS["glewdir"], "lib/Release/Win32") } libdirs { path.join(_OPTIONS["glfwdir32"], "lib-" .. string.gsub(_ACTION or '', "vs", "vc")) } - links { "opengl32", "glew32s", "glfw3" } + links { "opengl32", "glfw3" } filter "platforms:win-amd64*gl3_glfw*" - libdirs { path.join(_OPTIONS["glewdir"], "lib/Release/x64") } libdirs { path.join(_OPTIONS["glfwdir64"], "lib-" .. string.gsub(_ACTION or '', "vs", "vc")) } - links { "opengl32", "glew32s", "glfw3" } + links { "opengl32", "glfw3" } filter "platforms:linux*gl3_glfw*" - links { "GL", "GLEW", "glfw" } + links { "GL", "glfw" } filter "platforms:bsd*gl3_glfw*" - links { "GL", "GLEW", "glfw", "sysinfo" } + links { "GL", "glfw", "sysinfo" } includedirs { "/usr/local/include" } libdirs { "/usr/local/lib" } filter "platforms:macosx*gl3_glfw*" - links { "GLEW", "glfw" } + links { "glfw" } linkoptions { "-framework OpenGL" } includedirs { "/opt/local/include" } includedirs { "/usr/local/include" } |