From b5cda17ea8e7a1ce2daac9ca3ebc39d99d4172dc Mon Sep 17 00:00:00 2001
From: Christophe Riccio <g.truc.creation@gmail.com>
Date: Tue, 11 Jan 2011 16:23:45 +0000
Subject: [PATCH] Fixed GCC build and tests

---
 CMakeLists.txt             | 3 +++
 glm/core/dummy.cpp         | 2 +-
 glm/gtx/simd_vec4.hpp      | 1 +
 glm/setup.hpp              | 4 ++--
 test/gtx/gtx-bit.cpp       | 6 +++---
 test/gtx/gtx-simd-mat4.cpp | 1 +
 test/gtx/gtx-simd-vec4.cpp | 1 +
 7 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e8fd8dec..8557bd29 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,6 +4,9 @@ cmake_policy(VERSION 2.6)
 project(glm)
 
 add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+#add_definitions(-S)
+add_definitions(-msse2)
+add_definitions(-O3)
 
 include_directories(".")
 
diff --git a/glm/core/dummy.cpp b/glm/core/dummy.cpp
index ff60da36..71ef1246 100644
--- a/glm/core/dummy.cpp
+++ b/glm/core/dummy.cpp
@@ -1,7 +1,7 @@
 #include "../glm.hpp"
 #include "../ext.hpp"
 
-#error "GLM is a header only library, there is nothing to compile. dummy.cpp and the CMake file are only here for GLM development purposes"
+//#error "GLM is a header only library, there is nothing to compile. dummy.cpp and the CMake file are only here for GLM development purposes"
 
 int main()
 {
diff --git a/glm/gtx/simd_vec4.hpp b/glm/gtx/simd_vec4.hpp
index 795a9598..9bbd8214 100644
--- a/glm/gtx/simd_vec4.hpp
+++ b/glm/gtx/simd_vec4.hpp
@@ -17,6 +17,7 @@
 // Dependency:
 #include "../glm.hpp"
 #include "../core/intrinsic_common.hpp"
+#include "../core/intrinsic_geometric.hpp"
 
 namespace glm
 {
diff --git a/glm/setup.hpp b/glm/setup.hpp
index 06044c0d..58ef97e4 100644
--- a/glm/setup.hpp
+++ b/glm/setup.hpp
@@ -16,8 +16,8 @@
 #define GLM_VERSION					90
 #define GLM_VERSION_MAJOR			0
 #define GLM_VERSION_MINOR			9
-#define GLM_VERSION_PATCH			0
-#define GLM_VERSION_REVISION		4
+#define GLM_VERSION_PATCH			1
+#define GLM_VERSION_REVISION		0
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Common values
diff --git a/test/gtx/gtx-bit.cpp b/test/gtx/gtx-bit.cpp
index da4f39e1..c557ac48 100644
--- a/test/gtx/gtx-bit.cpp
+++ b/test/gtx/gtx-bit.cpp
@@ -53,9 +53,9 @@ namespace extractField
 		{0xffffffff00000000,32,32, 0x00000000ffffffff, SUCCESS},
 		{0xfffffffffffffff0, 0, 8, 0x0000000000000000, FAIL},
 		{0xffffffffffffffff,32,32, 0x0000000000000000, FAIL},
-		//{0xffffffffffffffff,64, 1, 0x0000000000000000, ASSERT}, /* Throw an assert */
-		//{0xffffffffffffffff, 0,65, 0x0000000000000000, ASSERT}, /* Throw an assert */
-		//{0xffffffffffffffff,33,32, 0x0000000000000000, ASSERT}, /* Throw an assert */
+		//{0xffffffffffffffff,64, 1, 0x0000000000000000, ASSERT}, // Throw an assert 
+		//{0xffffffffffffffff, 0,65, 0x0000000000000000, ASSERT}, // Throw an assert 
+		//{0xffffffffffffffff,33,32, 0x0000000000000000, ASSERT}, // Throw an assert 
 	};
 
 	int test()
diff --git a/test/gtx/gtx-simd-mat4.cpp b/test/gtx/gtx-simd-mat4.cpp
index 96f03811..15f7ebbe 100644
--- a/test/gtx/gtx-simd-mat4.cpp
+++ b/test/gtx/gtx-simd-mat4.cpp
@@ -12,6 +12,7 @@
 #include <glm/gtx/simd_mat4.hpp>
 #include <glm/gtx/random.hpp>
 #include <iostream>
+#include <cstdio>
 #include <ctime>
 #include <vector>
 
diff --git a/test/gtx/gtx-simd-vec4.cpp b/test/gtx/gtx-simd-vec4.cpp
index 4425c00a..3fcdea9c 100644
--- a/test/gtx/gtx-simd-vec4.cpp
+++ b/test/gtx/gtx-simd-vec4.cpp
@@ -7,6 +7,7 @@
 // File    : test/gtx/simd-vec4.cpp
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
+#define GLM_INSTRUCTION_SET GLM_PLATFORM_SSE3 | GLM_PLATFORM_SSE2
 #include <glm/glm.hpp>
 #include <glm/gtx/simd_vec4.hpp>
 #include <cstdio>