From 148d7693b2fe159d52ffdc5fcd16271123ce55fd Mon Sep 17 00:00:00 2001
From: Erick Tryzelaar <erick.tryzelaar@gmail.com>
Date: Wed, 25 Jun 2014 21:41:42 -0700
Subject: [PATCH] Update cgmath

---
 configure_ovr.py | 10 +++++++---
 modules/cgmath   |  2 +-
 src/cgmath       |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/configure_ovr.py b/configure_ovr.py
index 70a15a2..5e742b2 100644
--- a/configure_ovr.py
+++ b/configure_ovr.py
@@ -112,7 +112,7 @@ class Lib(Module):
     ext = "lib.rs"
     dir = "lib"
     flags = ""
-    def __init__(self, name, dep_modules=None, other_flags="", setup=None, presetup=None):
+    def __init__(self, name, dep_modules=None, other_flags="", setup=None, presetup=None, ext=None):
         self.source_dir = ""
         self.name = name
         self.ename = None
@@ -123,6 +123,10 @@ class Lib(Module):
             self.dep_modules = dep_modules
         else:
             self.dep_modules = []
+        if ext is None:
+            self.ext = Lib.ext
+        else:
+            self.ext = ext
 
     def get_flags(self, mods):
         flags = ["$(RUST_LIB_FLAGS)", self.flags] + self.collect_flags(mods)
@@ -342,7 +346,7 @@ elif platform.system() == "Darwin":
 
 modules_all = modules + \
               [Bin("oculus-info", ["oculus-vr"]),
-               Lib("cgmath")]
+               Lib("cgmath", ext="cgmath.rs")]
 
 set_output_dir(modules, ".")
 set_source_dir(modules, _base)
@@ -350,4 +354,4 @@ set_output_dir(modules_all, ".")
 set_source_dir(modules_all, _base)
 
 if __name__ == "__main__":
-    write_makefile(modules_all)
\ No newline at end of file
+    write_makefile(modules_all)
diff --git a/modules/cgmath b/modules/cgmath
index 1382c2e..92b5a4b 160000
--- a/modules/cgmath
+++ b/modules/cgmath
@@ -1 +1 @@
-Subproject commit 1382c2ea4b7c13f01718c3c23573960c01f50560
+Subproject commit 92b5a4b31f8e2b6a39c4e46af9b1b29e4bd576cb
diff --git a/src/cgmath b/src/cgmath
index cda8296..44de078 120000
--- a/src/cgmath
+++ b/src/cgmath
@@ -1 +1 @@
-../modules/cgmath/src/cgmath/
\ No newline at end of file
+../modules/cgmath/src
\ No newline at end of file