diff --git a/buildall.bat b/buildall.bat new file mode 100644 index 00000000..15505010 --- /dev/null +++ b/buildall.bat @@ -0,0 +1,17 @@ +@echo off + +REM If LLVM_INSTALL_DIR isn't set globally in your environment, +REM it can be set here_ +set LLVM_INSTALL_DIR=c:\users\mmp\llvm-dev + +REM Both the LLVM binaries and python need to be in the path +set path=%LLVM_INSTALL_DIR%\bin;%PATH%;c:\cygwin\bin + +msbuild ispc.vcxproj /m:4 /V:m /p:Platform=Win32 /p:Configuration=Release + +msbuild examples\examples.sln /m:4 /V:m /p:Platform=x64 /p:Configuration=Release +msbuild examples\examples.sln /m:4 /V:m /p:Platform=x64 /p:Configuration=Debug +msbuild examples\examples.sln /m:4 /V:m /p:Platform=Win32 /p:Configuration=Release +msbuild examples\examples.sln /m:4 /V:m /p:Platform=Win32 /p:Configuration=Debug + + diff --git a/examples/aobench_instrumented/ao.cpp b/examples/aobench_instrumented/ao.cpp index 3484f67d..e2f2430e 100644 --- a/examples/aobench_instrumented/ao.cpp +++ b/examples/aobench_instrumented/ao.cpp @@ -32,7 +32,6 @@ */ #ifdef _MSC_VER -#define _CRT_SECURE_NO_WARNINGS #define NOMINMAX #pragma warning (disable: 4244) #pragma warning (disable: 4305) diff --git a/examples/aobench_instrumented/aobench_instrumented.vcxproj b/examples/aobench_instrumented/aobench_instrumented.vcxproj index f9f29029..3dec13e1 100644 --- a/examples/aobench_instrumented/aobench_instrumented.vcxproj +++ b/examples/aobench_instrumented/aobench_instrumented.vcxproj @@ -101,7 +101,7 @@ Level3 Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Console @@ -114,7 +114,7 @@ Level3 Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Console @@ -129,7 +129,7 @@ MaxSpeed true true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Console @@ -146,7 +146,7 @@ MaxSpeed true true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Console diff --git a/examples/volume_rendering/volume_serial.cpp b/examples/volume_rendering/volume_serial.cpp index 017f500c..656f76f5 100644 --- a/examples/volume_rendering/volume_serial.cpp +++ b/examples/volume_rendering/volume_serial.cpp @@ -36,9 +36,6 @@ #include // Just enough of a float3 class to do what we need in this file. -#ifdef _MSC_VER -__declspec(align(16)) -#endif struct float3 { float3() { } float3(float xx, float yy, float zz) { x = xx; y = yy; z = zz; } @@ -298,7 +295,7 @@ volume_serial(float density[], int nVoxels[3], const float raster2camera[4][4], for (int y = 0; y < height; ++y) { for (int x = 0; x < width; ++x, ++offset) { Ray ray; - generateRay(raster2camera, camera2world, x, y, ray); + generateRay(raster2camera, camera2world, (float)x, (float)y, ray); image[offset] = raymarch(density, nVoxels, ray); } }