AxioDL
/
zeus
mirror of https://github.com/AxioDL/zeus.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Windows build fixes

This commit is contained in:
Jack Andersen 2015-11-10 10:02:25 -10:00
parent 8937bfc0c6
commit fca8742f99
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Math.cpp
View File

@ -1,7 +1,11 @@
#include "Math.hpp" #include "Math.hpp"
#include "CTransform.hpp" #include "CTransform.hpp"
#include "CVector3f.hpp" #include "CVector3f.hpp"
#if _WIN32
#include <intrin.h>
#else
#include <cpuid.h> #include <cpuid.h>
#endif
namespace Zeus namespace Zeus
{ {
@ -16,7 +20,7 @@ void getCpuInfo(int level,
{ {
#if !GEKKO #if !GEKKO
#if _WIN32 #if _WIN32
unsigned int regs[4]; int regs[4];
__cpuid(regs, level); __cpuid(regs, level);
*eax = regs[0]; *eax = regs[0];
*ebx = regs[1]; *ebx = regs[1];

2
test/CMakeLists.txt
View File

@ -7,4 +7,4 @@ add_executable(zeustest
main.cpp) main.cpp)
target_link_libraries(zeustest target_link_libraries(zeustest
Math GL) Math)

2
test/main.cpp
View File

@ -55,7 +55,7 @@ int main()
std::cout << " Test 1 " << ( aabb.intersects(s1) ? "succeeded" : "failed" ) << std::endl; std::cout << " Test 1 " << ( aabb.intersects(s1) ? "succeeded" : "failed" ) << std::endl;
std::cout << " Test 2 " << ( aabb.intersects(s2) ? "succeeded" : "failed" ) << std::endl; std::cout << " Test 2 " << ( aabb.intersects(s2) ? "succeeded" : "failed" ) << std::endl;
std::cout << " Test 3 " << ( aabb.intersects(s3) ? "succeeded" : "failed" ) << std::endl; std::cout << " Test 3 " << ( aabb.intersects(s3) ? "succeeded" : "failed" ) << std::endl;
CLine line({-89.120926, 59.328712, 3.265882}, CUnitVector3f({-90.120926, 59.328712, 3.265882})); CLine line({-89.120926f, 59.328712f, 3.265882f}, CUnitVector3f({-90.120926f, 59.328712f, 3.265882f}));
CColor ctest1; CColor ctest1;
ctest1.fromHSV(0, 255/255.f, .5); ctest1.fromHSV(0, 255/255.f, .5);