[Submodules] Remove glm
This commit is contained in:
parent
712a469465
commit
d39d972895
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -29,6 +29,3 @@
|
|||||||
[submodule "deps/udis86"]
|
[submodule "deps/udis86"]
|
||||||
path = deps/udis86
|
path = deps/udis86
|
||||||
url = ../udis86.git
|
url = ../udis86.git
|
||||||
[submodule "deps/glm"]
|
|
||||||
path = deps/glm
|
|
||||||
url = https://github.com/g-truc/glm.git
|
|
||||||
|
1
deps/glm
vendored
1
deps/glm
vendored
@ -1 +0,0 @@
|
|||||||
Subproject commit cad2c545f6123a77af0a583861ae6c91d5330e75
|
|
@ -1,26 +0,0 @@
|
|||||||
glm = {
|
|
||||||
settings = nil,
|
|
||||||
}
|
|
||||||
|
|
||||||
function glm.setup(settings)
|
|
||||||
if not settings.source then error("Missing source.") end
|
|
||||||
|
|
||||||
glm.settings = settings
|
|
||||||
end
|
|
||||||
|
|
||||||
function glm.import()
|
|
||||||
if not glm.settings then error("Run glm.setup first") end
|
|
||||||
|
|
||||||
glm.includes()
|
|
||||||
end
|
|
||||||
|
|
||||||
function glm.includes()
|
|
||||||
if not glm.settings then error("Run glm.setup first") end
|
|
||||||
|
|
||||||
includedirs { glm.settings.source }
|
|
||||||
end
|
|
||||||
|
|
||||||
function glm.project()
|
|
||||||
if not glm.settings then error("Run glm.setup first") end
|
|
||||||
|
|
||||||
end
|
|
@ -186,7 +186,6 @@ require "premake/pdcurses"
|
|||||||
require "premake/protobuf"
|
require "premake/protobuf"
|
||||||
require "premake/zlib"
|
require "premake/zlib"
|
||||||
require "premake/udis86"
|
require "premake/udis86"
|
||||||
require "premake/glm"
|
|
||||||
|
|
||||||
json11.setup
|
json11.setup
|
||||||
{
|
{
|
||||||
@ -231,10 +230,6 @@ udis86.setup
|
|||||||
{
|
{
|
||||||
source = path.join(depsBasePath, "udis86"),
|
source = path.join(depsBasePath, "udis86"),
|
||||||
}
|
}
|
||||||
glm.setup
|
|
||||||
{
|
|
||||||
source = path.join(depsBasePath, "glm"),
|
|
||||||
}
|
|
||||||
|
|
||||||
workspace "iw4x"
|
workspace "iw4x"
|
||||||
location "./build"
|
location "./build"
|
||||||
@ -327,7 +322,6 @@ workspace "iw4x"
|
|||||||
protobuf.import()
|
protobuf.import()
|
||||||
zlib.import()
|
zlib.import()
|
||||||
udis86.import()
|
udis86.import()
|
||||||
glm.import();
|
|
||||||
|
|
||||||
-- fix vpaths for protobuf sources
|
-- fix vpaths for protobuf sources
|
||||||
vpaths
|
vpaths
|
||||||
|
Loading…
Reference in New Issue
Block a user