The-Homebrew-Cloud/re3-wiiu
2
0
Fork 0
mirror of https://gitlab.com/GaryOderNichts/re3-wiiu.git synced 2024-11-25 10:36:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

update librw; get rid of glew

Browse Source
This commit is contained in:
aap 2021-02-17 13:12:33 +01:00
parent c488ce166e
commit b4c96bca93
2 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
premake5.lua
View File

@ -1,10 +1,3 @@
newoption {
trigger = "glewdir",
value = "PATH",
description = "Directory of GLEW",
default = "vendor/glew-2.1.0"
}
newoption { newoption {
trigger = "glfwdir64", trigger = "glfwdir64",
value = "PATH", value = "PATH",
@ -158,7 +151,6 @@ workspace "re3"
filter "platforms:*librw_gl3_glfw*" filter "platforms:*librw_gl3_glfw*"
defines { "RW_GL3" } defines { "RW_GL3" }
includedirs { path.join(_OPTIONS["glewdir"], "include") }
if(not _OPTIONS["with-librw"]) then if(not _OPTIONS["with-librw"]) then
libdirs { path.join(Librw, "lib/%{getsys(cfg.system)}-%{getarch(cfg.architecture)}-gl3/%{cfg.buildcfg}") } libdirs { path.join(Librw, "lib/%{getsys(cfg.system)}-%{getarch(cfg.architecture)}-gl3/%{cfg.buildcfg}") }
end end
@ -169,9 +161,6 @@ workspace "re3"
filter "platforms:*amd64-librw_gl3_glfw*" filter "platforms:*amd64-librw_gl3_glfw*"
includedirs { path.join(_OPTIONS["glfwdir64"], "include") } includedirs { path.join(_OPTIONS["glfwdir64"], "include") }
filter "platforms:win*librw_gl3_glfw*"
defines { "GLEW_STATIC" }
filter {} filter {}
function setpaths (gamepath, exepath) function setpaths (gamepath, exepath)
@ -196,6 +185,7 @@ project "librw"
targetdir(path.join(Librw, "lib/%{cfg.platform}/%{cfg.buildcfg}")) 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/*/*.*") }
files { path.join(Librw, "src/gl/*/*.*") }
filter { "platforms:*x86*" } filter { "platforms:*x86*" }
architecture "x86" architecture "x86"
@ -395,25 +385,23 @@ project "re3"
libdirs { "sdk/dx8sdk/lib" } libdirs { "sdk/dx8sdk/lib" }
filter "platforms:win-x86*gl3_glfw*" 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")) } 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*" 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")) } libdirs { path.join(_OPTIONS["glfwdir64"], "lib-" .. string.gsub(_ACTION or '', "vs", "vc")) }
links { "opengl32", "glew32s", "glfw3" } links { "opengl32", "glfw3" }
filter "platforms:linux*gl3_glfw*" filter "platforms:linux*gl3_glfw*"
links { "GL", "GLEW", "glfw" } links { "GL", "glfw" }
filter "platforms:bsd*gl3_glfw*" filter "platforms:bsd*gl3_glfw*"
links { "GL", "GLEW", "glfw", "sysinfo" } links { "GL", "glfw", "sysinfo" }
includedirs { "/usr/local/include" } includedirs { "/usr/local/include" }
libdirs { "/usr/local/lib" } libdirs { "/usr/local/lib" }
filter "platforms:macosx*gl3_glfw*" filter "platforms:macosx*gl3_glfw*"
links { "GLEW", "glfw" } links { "glfw" }
linkoptions { "-framework OpenGL" } linkoptions { "-framework OpenGL" }
includedirs { "/opt/local/include" } includedirs { "/opt/local/include" }
includedirs { "/usr/local/include" } includedirs { "/usr/local/include" }

2
vendor/librw vendored

@ -1 +1 @@
Subproject commit 41ae7b9b61c6736b34269df0f0350d1b5bcff4df Subproject commit f49c707db33bd060fdd17ebb004a658280817545