Fixed GCC build and tests
This commit is contained in:
parent
d31d1e9c10
commit
b5cda17ea8
@ -4,6 +4,9 @@ cmake_policy(VERSION 2.6)
|
|||||||
project(glm)
|
project(glm)
|
||||||
|
|
||||||
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
|
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
|
||||||
|
#add_definitions(-S)
|
||||||
|
add_definitions(-msse2)
|
||||||
|
add_definitions(-O3)
|
||||||
|
|
||||||
include_directories(".")
|
include_directories(".")
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#include "../glm.hpp"
|
#include "../glm.hpp"
|
||||||
#include "../ext.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()
|
int main()
|
||||||
{
|
{
|
||||||
|
@ -17,6 +17,7 @@
|
|||||||
// Dependency:
|
// Dependency:
|
||||||
#include "../glm.hpp"
|
#include "../glm.hpp"
|
||||||
#include "../core/intrinsic_common.hpp"
|
#include "../core/intrinsic_common.hpp"
|
||||||
|
#include "../core/intrinsic_geometric.hpp"
|
||||||
|
|
||||||
namespace glm
|
namespace glm
|
||||||
{
|
{
|
||||||
|
@ -16,8 +16,8 @@
|
|||||||
#define GLM_VERSION 90
|
#define GLM_VERSION 90
|
||||||
#define GLM_VERSION_MAJOR 0
|
#define GLM_VERSION_MAJOR 0
|
||||||
#define GLM_VERSION_MINOR 9
|
#define GLM_VERSION_MINOR 9
|
||||||
#define GLM_VERSION_PATCH 0
|
#define GLM_VERSION_PATCH 1
|
||||||
#define GLM_VERSION_REVISION 4
|
#define GLM_VERSION_REVISION 0
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
// Common values
|
// Common values
|
||||||
|
@ -53,9 +53,9 @@ namespace extractField
|
|||||||
{0xffffffff00000000,32,32, 0x00000000ffffffff, SUCCESS},
|
{0xffffffff00000000,32,32, 0x00000000ffffffff, SUCCESS},
|
||||||
{0xfffffffffffffff0, 0, 8, 0x0000000000000000, FAIL},
|
{0xfffffffffffffff0, 0, 8, 0x0000000000000000, FAIL},
|
||||||
{0xffffffffffffffff,32,32, 0x0000000000000000, FAIL},
|
{0xffffffffffffffff,32,32, 0x0000000000000000, FAIL},
|
||||||
//{0xffffffffffffffff,64, 1, 0x0000000000000000, ASSERT}, /* Throw an assert */
|
//{0xffffffffffffffff,64, 1, 0x0000000000000000, ASSERT}, // Throw an assert
|
||||||
//{0xffffffffffffffff, 0,65, 0x0000000000000000, ASSERT}, /* Throw an assert */
|
//{0xffffffffffffffff, 0,65, 0x0000000000000000, ASSERT}, // Throw an assert
|
||||||
//{0xffffffffffffffff,33,32, 0x0000000000000000, ASSERT}, /* Throw an assert */
|
//{0xffffffffffffffff,33,32, 0x0000000000000000, ASSERT}, // Throw an assert
|
||||||
};
|
};
|
||||||
|
|
||||||
int test()
|
int test()
|
||||||
|
@ -12,6 +12,7 @@
|
|||||||
#include <glm/gtx/simd_mat4.hpp>
|
#include <glm/gtx/simd_mat4.hpp>
|
||||||
#include <glm/gtx/random.hpp>
|
#include <glm/gtx/random.hpp>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
#include <cstdio>
|
||||||
#include <ctime>
|
#include <ctime>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
|
@ -7,6 +7,7 @@
|
|||||||
// File : test/gtx/simd-vec4.cpp
|
// File : test/gtx/simd-vec4.cpp
|
||||||
///////////////////////////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
#define GLM_INSTRUCTION_SET GLM_PLATFORM_SSE3 | GLM_PLATFORM_SSE2
|
||||||
#include <glm/glm.hpp>
|
#include <glm/glm.hpp>
|
||||||
#include <glm/gtx/simd_vec4.hpp>
|
#include <glm/gtx/simd_vec4.hpp>
|
||||||
#include <cstdio>
|
#include <cstdio>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user