diff options
author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-01-05 13:14:50 +0100 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-01-29 08:09:37 +0100 |
commit | a74fd3f900826d8f525075ed7bbf6ca8ffda2847 (patch) | |
tree | 51216b83c4836795fd3f04d46c30a5fafeecdf36 | |
parent | b2223335fcabf539081dd28244c68cb55404a73a (diff) |
move glm to external
Change-Id: Ifa9584ab86c2ca02b2b62fb95a2c029a278aea9a
-rw-r--r-- | RepositoryModule_host.mk | 1 | ||||
-rw-r--r-- | external/Module_external.mk | 1 | ||||
-rw-r--r-- | external/glm/Makefile (renamed from glm/Makefile) | 0 | ||||
-rw-r--r-- | external/glm/Module_glm.mk (renamed from glm/Module_glm.mk) | 0 | ||||
-rw-r--r-- | external/glm/README (renamed from glm/README) | 0 | ||||
-rw-r--r-- | external/glm/UnpackedTarball_glm.mk (renamed from glm/UnpackedTarball_glm.mk) | 0 | ||||
-rw-r--r-- | external/glm/Wshadow-unix.patch (renamed from glm/Wshadow-unix.patch) | 0 | ||||
-rw-r--r-- | external/glm/Wshadow-windows.patch (renamed from glm/Wshadow-windows.patch) | 0 |
8 files changed, 1 insertions, 1 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index b35e3d0d5355..48d5518779e8 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -73,7 +73,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ linguistic \ lotuswordpro \ $(call gb_Helper_optional,DESKTOP,l10ntools) \ - $(call gb_Helper_optional,GLM,glm) \ $(call gb_Helper_optional,MARIADBC,mysqlc) \ $(call gb_Helper_optional,NLPSOLVER,nlpsolver) \ o3tl \ diff --git a/external/Module_external.mk b/external/Module_external.mk index d1214a3d1385..b3fd60642190 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -40,6 +40,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,FONTCONFIG,fontconfig) \ $(call gb_Helper_optional,FREEHAND,libfreehand) \ $(call gb_Helper_optional,FREETYPE,freetype) \ + $(call gb_Helper_optional,GLM,glm) \ $(call gb_Helper_optional,GRAPHITE,graphite) \ $(call gb_Helper_optional,HARFBUZZ,harfbuzz) \ $(call gb_Helper_optional,HSQLDB,hsqldb) \ diff --git a/glm/Makefile b/external/glm/Makefile index ccb1c85a04da..ccb1c85a04da 100644 --- a/glm/Makefile +++ b/external/glm/Makefile diff --git a/glm/Module_glm.mk b/external/glm/Module_glm.mk index 71ec270b889a..71ec270b889a 100644 --- a/glm/Module_glm.mk +++ b/external/glm/Module_glm.mk diff --git a/glm/README b/external/glm/README index 30122f67b5e2..30122f67b5e2 100644 --- a/glm/README +++ b/external/glm/README diff --git a/glm/UnpackedTarball_glm.mk b/external/glm/UnpackedTarball_glm.mk index e115bff8f168..e115bff8f168 100644 --- a/glm/UnpackedTarball_glm.mk +++ b/external/glm/UnpackedTarball_glm.mk diff --git a/glm/Wshadow-unix.patch b/external/glm/Wshadow-unix.patch index be4af10f9896..be4af10f9896 100644 --- a/glm/Wshadow-unix.patch +++ b/external/glm/Wshadow-unix.patch diff --git a/glm/Wshadow-windows.patch b/external/glm/Wshadow-windows.patch index c6c9c6585782..c6c9c6585782 100644 --- a/glm/Wshadow-windows.patch +++ b/external/glm/Wshadow-windows.patch |