archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-06-27 13:26:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into miami

Browse Source 
# Conflicts:
#	premake5.lua
#	src/render/Coronas.cpp
#	src/render/Timecycle.cpp
#	src/render/Timecycle.h
This commit is contained in:
Sergeanur
2020-08-10 19:15:51 +03:00
parent c2c65207a3 e29e911302
commit 1c1fa25e6c
5 changed files with 44 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
premake5.lua
View File

@ -77,6 +77,11 @@ workspace "reVC"
"linux-arm-librw_gl3_glfw-oal",
}
filter { "system:bsd" }
platforms {
"bsd-amd64-librw_gl3_glfw-oal"
}
filter "configurations:Debug"
defines { "DEBUG" }
@ -90,6 +95,9 @@ workspace "reVC"
filter { "platforms:linux*" }
system "linux"
filter { "platforms:bsd*" }
system "bsd"
filter { "platforms:*x86*" }
architecture "x86"
@ -147,6 +155,11 @@ project "librw"
targetdir "lib/%{cfg.platform}/%{cfg.buildcfg}"
files { path.join(Librw, "src/*.*") }
files { path.join(Librw, "src/*/*.*") }
filter "platforms:bsd*"
includedirs { "/usr/local/include" }
libdirs { "/usr/local/lib" }
filter "platforms:*RW34*"
flags { "ExcludeFromBuild" }
filter {}
@ -259,6 +272,9 @@ project "reVC"
filter "platforms:linux*oal"
links { "openal", "mpg123", "sndfile", "pthread" }
filter "platforms:bsd*oal"
links { "openal", "mpg123", "sndfile", "pthread" }
if _OPTIONS["with-opus"] then
filter {}
@ -307,3 +323,8 @@ project "reVC"
filter "platforms:linux*gl3_glfw*"
links { "GL", "GLEW", "glfw" }
filter "platforms:bsd*gl3_glfw*"
links { "GL", "GLEW", "glfw", "sysinfo" }
includedirs { "/usr/local/include" }
libdirs { "/usr/local/lib" }