hcwocl: fix `#include`s

- use correct case
- remove/fix Windows-only headers

hcwocl/Common/Base/ThreadPool.h

@@ -5,8 +5,6 @@
 #define THREAD_POOL_H
 
 #pragma warning( disable : 4996 )
-#include <windows.h>
-#include <process.h>
 #include <Common/Math/Math.h>
 
 class ThreadPool

hcwocl/Common/DeviceUtils/DeviceDraw.h

@@ -4,12 +4,13 @@
 #ifndef DEVICE_DRAW_H
 #define DEVICE_DRAW_H
 
+#include <GL/glut.h>
+
 #include <Common/Math/Math.h>
 #include <Common/DeviceUtils/DeviceUtils.h>
 #include <Common/Geometry/Aabb.h>
-
-#include <glut.h>
 #include <Common/DeviceUtils/DeviceDrawGL.inl>
+
 #define pxDrawLine(a,b,color) drawLine(a, b, color)
 #define pxDrawLineList(vtx,idx,nVtx,nIdx,color) drawLineList(vtx,idx,nVtx,nIdx,color)
 #define pxDrawPoint(a,color) drawPoint(a, color)

hcwocl/Common/DeviceUtils/DeviceDrawGL.inl

 /*
 		2011 Takahiro Harada
 */
-#include <common/Math/Quaternion.h>
-#include <common/Math/Matrix3x3.h>
+#include <Common/Math/Quaternion.h>
+#include <Common/Math/Matrix3x3.h>
 
 __inline
 void glVertexFloat4( const float4& v )

hcwocl/Common/DeviceUtils/DeviceUtilsCL.inl

 /*
 		2011 Takahiro Harada
 */
+#include <cstring>
+#include <stdio.h>
+#include <fstream>
+
 #include <CL/cl.h>
 #include <CL/cl_ext.h>
 #include <CL/cl_platform.h>
 
-#include <stdio.h>
-#include <fstream>
-
 struct DeviceDataCL : public DeviceDataBase
 {
 	DeviceDataCL() : DeviceDataBase( TYPE_CL ), m_context(0), m_commandQueue(0){}
@@ -567,7 +568,6 @@ void KernelLauncherCL::launch1DOnDevice( DeviceBufferCL& numElemsBuffer, u32 ali
 	CLASSERT(0);
 }
 
-#include <windows.h>
 #include <time.h>
 
 struct StopwatchCL

hcwocl/Common/DeviceUtils/DeviceUtilsDx11.inl

-#include <windows.h>
 #include <d3d11.h>
 #include <d3dx11.h>
 #include <d3dcompiler.h>
@@ -1031,4 +1030,4 @@ void StopwatchDx11::getMs( float* times, int capacity )
 	{
 		times[i] = (m_t[i+1] - m_t[i])/(float)d.Frequency*1000;
 	}
-}
\ No newline at end of file
+}

hcwocl/Common/DeviceUtils/xDeviceDrawDx11.inl

 #include <xnamath.h>
-#include <common/Math/Quaternion.h>
+#include <Common/Math/Quaternion.h>
 #include <Common/Math/Array.h>
 
 

hcwocl/Common/Geometry/Aabb.h

@@ -4,8 +4,8 @@
 #ifndef AABB_H
 #define AABB_H
 
-#include <common/Math/Math.h>
-#include <common/Math/Quaternion.h>
+#include <Common/Math/Math.h>
+#include <Common/Math/Quaternion.h>
 
 _MEM_CLASSALIGN16
 struct Aabb

hcwocl/Common/Math/Array.h

@@ -7,8 +7,6 @@
 #include <string.h>
 #include <malloc.h>
 #include <Common/Base/Error.h>
-#include <new.h>
-
 
 template <class T>
 class Array

hcwocl/Common/Math/Matrix3x3.h

@@ -4,7 +4,7 @@
 #ifndef MATRIX3X3_H
 #define MATRIX3X3_H
 
-#include <common/Math/Math.h>
+#include <Common/Math/Math.h>
 
 ///////////////////////////////////////
 //	Matrix3x3

hcwocl/Common/Math/Quaternion.h

@@ -4,7 +4,7 @@
 #ifndef QUATERNION_H
 #define QUATERNION_H
 
-#include <common/Math/Matrix3x3.h>
+#include <Common/Math/Matrix3x3.h>
 
 
 typedef float4 Quaternion;

hcwocl/Common/Math/RadixSortHost.cpp

 /*
 		2011 Takahiro Harada
 */
-#include <common/Math/RadixSortHost.h>
+#include <Common/Math/RadixSortHost.h>
 
 void RadixSortHost::sort(SortData* data, SortData* workBuffer, int numElems)
 {

hcwocl/Common/Utils/Stopwatch.h

@@ -4,7 +4,6 @@
 #ifndef STOPWATCH_H
 #define STOPWATCH_H
 
-#include <windows.h>
 #include <time.h>
 
 class Stopwatch

hcwocl/TestBed/Demos/Dem2Demo.cpp

@@ -3,8 +3,7 @@
 */
 #include <Demos/Dem2Demo.h>
 #include <Common/Utils/Stopwatch.h>
-#include <common/Math/RadixSortHost.h>
-#include <omp.h>
+#include <Common/Math/RadixSortHost.h>
 #include <Common/Base/ThreadPool.h>
 
 __inline

hcwocl/TestBed/main.cpp

@@ -32,7 +32,7 @@ float g_translationZ = 0.0f;
 
 float g_fov = 35.f;
 
-#include <common/Utils/Stopwatch.h>
+#include <Common/Utils/Stopwatch.h>
 
 #include <Demos/Dem2Demo.h>