Fixed VS2010 build errors.

This commit is contained in:
David G. Yu 2013-10-28 17:36:04 -07:00
parent c8d490e292
commit 9d60586400

View File

@ -55,7 +55,9 @@
// a particular purpose and non-infringement. // a particular purpose and non-infringement.
// //
#include <stdlib.h> #if defined( _WIN32)
#include <windows.h>
#endif
#include <osd/cpuComputeContext.h> #include <osd/cpuComputeContext.h>
#include <osd/cpuComputeController.h> #include <osd/cpuComputeController.h>
@ -75,7 +77,7 @@
#include <vector> #include <vector>
#include <fstream> #include <fstream>
#include <sstream> #include <sstream>
#include <stdlib.h> #include <cstdlib>
#ifdef OPENSUBDIV_HAS_OPENMP #ifdef OPENSUBDIV_HAS_OPENMP
#include <omp.h> #include <omp.h>
@ -99,14 +101,14 @@ typedef FarSubdivisionTables<OsdVertex> OsdFarMeshSubdivision;
static void static void
createOsdMesh(int level) createOsdMesh(int level)
{ {
float points[] = { 0.000000, -1.414214, 1.000000, float points[] = { 0.000000f, -1.414214f, 1.000000f,
1.414214, 0.000000, 1.000000, 1.414214f, 0.000000f, 1.000000f,
-1.414214, 0.000000, 1.000000, -1.414214f, 0.000000f, 1.000000f,
0.000000, 1.414214, 1.000000, 0.000000f, 1.414214f, 1.000000f,
-1.414214, 0.000000, -1.000000, -1.414214f, 0.000000f, -1.000000f,
0.000000, 1.414214, -1.000000, 0.000000f, 1.414214f, -1.000000f,
0.000000, -1.414214, -1.000000, 0.000000f, -1.414214f, -1.000000f,
1.414214, 0.000000, -1.000000}; 1.414214f, 0.000000f, -1.000000f };
int nverts[] = { 4, 4, 4, 4, 4, 4}; int nverts[] = { 4, 4, 4, 4, 4, 4};