Fixed include paths and CMakeLists.txt

Additionally, changed #ifndef to #pragma once everywhere

3 files changed, 10 insertions, 11 deletions

diff --git a/src/math/old/d3dmath.h b/src/math/old/d3dmath.h
index d28707d..4f563e7 100644
--- a/src/math/old/d3dmath.h
+++ b/src/math/old/d3dmath.h
@@ -21,8 +21,9 @@
 //

 // Copyright (c) 1997-1999 Microsoft Corporation. All rights reserved

 //-----------------------------------------------------------------------------

-#ifndef D3DMATH_H

-#define D3DMATH_H

+

+#pragma once

+

 #include <ddraw.h>

 #include <d3d.h>

 

@@ -94,4 +95,3 @@ VOID D3DMath_QuaternionSlerp( FLOAT& Qx, FLOAT& Qy, FLOAT& Qz, FLOAT& Qw,
                               FLOAT fAlpha );

 

 

-#endif // D3DMATH_H

diff --git a/src/math/old/math3d.cpp b/src/math/old/math3d.cpp
index 9aa5f89..368cd5e 100644
--- a/src/math/old/math3d.cpp
+++ b/src/math/old/math3d.cpp
@@ -23,11 +23,11 @@
 #include <stdio.h>

 #include <d3d.h>

 

-#include "struct.h"

-#include "d3dengine.h"

-#include "d3dmath.h"

-#include "d3dutil.h"

-#include "math3d.h"

+#include "common/struct.h"

+#include "graphics/d3d/d3dengine.h"

+#include "math/old/d3dmath.h"

+#include "graphics/d3d/d3dutil.h"

+#include "math/old/math3d.h"

 

 

 

diff --git a/src/math/old/math3d.h b/src/math/old/math3d.h
index ce7eee3..5c10047 100644
--- a/src/math/old/math3d.h
+++ b/src/math/old/math3d.h
@@ -16,8 +16,7 @@
 

 // math3d.h

 

-#ifndef _MATH3D_H_

-#define	_MATH3D_H_

+#pragma once

 

 

 #define STRICT

@@ -103,4 +102,4 @@ D3DCOLORVALUE RetColor(D3DCOLOR intensity);
 void			RGB2HSV(D3DCOLORVALUE src, ColorHSV &dest);

 void			HSV2RGB(ColorHSV src, D3DCOLORVALUE &dest);

 

-#endif //_MATH3D_H_

+