From d39d972895f629bf99b32034efdd21b59b30291c Mon Sep 17 00:00:00 2001 From: momo5502 Date: Thu, 8 Jun 2017 12:44:59 +0200 Subject: [PATCH] [Submodules] Remove glm --- .gitmodules | 3 --- deps/glm | 1 - premake/glm.lua | 26 -------------------------- premake5.lua | 6 ------ 4 files changed, 36 deletions(-) delete mode 160000 deps/glm delete mode 100644 premake/glm.lua diff --git a/.gitmodules b/.gitmodules index 499c064a..07db35ab 100644 --- a/.gitmodules +++ b/.gitmodules @@ -29,6 +29,3 @@ [submodule "deps/udis86"] path = deps/udis86 url = ../udis86.git -[submodule "deps/glm"] - path = deps/glm - url = https://github.com/g-truc/glm.git diff --git a/deps/glm b/deps/glm deleted file mode 160000 index cad2c545..00000000 --- a/deps/glm +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cad2c545f6123a77af0a583861ae6c91d5330e75 diff --git a/premake/glm.lua b/premake/glm.lua deleted file mode 100644 index 3a33d827..00000000 --- a/premake/glm.lua +++ /dev/null @@ -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 diff --git a/premake5.lua b/premake5.lua index 32e4fb83..a5d03768 100644 --- a/premake5.lua +++ b/premake5.lua @@ -186,7 +186,6 @@ require "premake/pdcurses" require "premake/protobuf" require "premake/zlib" require "premake/udis86" -require "premake/glm" json11.setup { @@ -231,10 +230,6 @@ udis86.setup { source = path.join(depsBasePath, "udis86"), } -glm.setup -{ - source = path.join(depsBasePath, "glm"), -} workspace "iw4x" location "./build" @@ -327,7 +322,6 @@ workspace "iw4x" protobuf.import() zlib.import() udis86.import() - glm.import(); -- fix vpaths for protobuf sources vpaths