clray
changeset 49:1ae68d46cfda
- updated the visual studio project files
- fixed the previously broken windows build
| author | John Tsiombikas |
|---|---|
| date | Tue, 31 Aug 2010 01:28:20 +0100 |
| parents | 154f03802aea |
| children | d3c46803242e |
| files | clray.vcproj src/clray.cc src/ogl.h |
| diffstat | 3 files changed, 48 insertions(+), 10 deletions(-) [+] |
line diff
1.1 --- a/clray.vcproj Tue Aug 31 01:03:46 2010 +0100 1.2 +++ b/clray.vcproj Tue Aug 31 01:28:20 2010 +0100 1.3 @@ -41,7 +41,7 @@ 1.4 <Tool 1.5 Name="VCCLCompilerTool" 1.6 Optimization="0" 1.7 - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS" 1.8 + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;CLGL_INTEROP" 1.9 MinimalRebuild="true" 1.10 BasicRuntimeChecks="3" 1.11 RuntimeLibrary="3" 1.12 @@ -115,7 +115,7 @@ 1.13 Name="VCCLCompilerTool" 1.14 Optimization="2" 1.15 EnableIntrinsicFunctions="true" 1.16 - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS" 1.17 + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;CLGL_INTEROP" 1.18 RuntimeLibrary="2" 1.19 EnableFunctionLevelLinking="true" 1.20 UsePrecompiledHeader="0" 1.21 @@ -175,6 +175,10 @@ 1.22 > 1.23 </File> 1.24 <File 1.25 + RelativePath=".\src\common.h" 1.26 + > 1.27 + </File> 1.28 + <File 1.29 RelativePath=".\src\matrix.cc" 1.30 > 1.31 </File> 1.32 @@ -183,14 +187,6 @@ 1.33 > 1.34 </File> 1.35 <File 1.36 - RelativePath=".\src\mesh.cc" 1.37 - > 1.38 - </File> 1.39 - <File 1.40 - RelativePath=".\src\mesh.h" 1.41 - > 1.42 - </File> 1.43 - <File 1.44 RelativePath=".\src\ocl.cc" 1.45 > 1.46 </File> 1.47 @@ -214,6 +210,38 @@ 1.48 RelativePath=".\src\rt.h" 1.49 > 1.50 </File> 1.51 + <File 1.52 + RelativePath=".\src\scene.cc" 1.53 + > 1.54 + </File> 1.55 + <File 1.56 + RelativePath=".\src\scene.h" 1.57 + > 1.58 + </File> 1.59 + <File 1.60 + RelativePath=".\src\scene_obj.cc" 1.61 + > 1.62 + </File> 1.63 + <File 1.64 + RelativePath=".\src\timer.cc" 1.65 + > 1.66 + </File> 1.67 + <File 1.68 + RelativePath=".\src\timer.h" 1.69 + > 1.70 + </File> 1.71 + <File 1.72 + RelativePath=".\src\vector.cc" 1.73 + > 1.74 + </File> 1.75 + <File 1.76 + RelativePath=".\src\vector.h" 1.77 + > 1.78 + </File> 1.79 + <File 1.80 + RelativePath=".\src\vector.inl" 1.81 + > 1.82 + </File> 1.83 </Filter> 1.84 <Filter 1.85 Name="kern"
2.1 --- a/src/clray.cc Tue Aug 31 01:03:46 2010 +0100 2.2 +++ b/src/clray.cc Tue Aug 31 01:28:20 2010 +0100 2.3 @@ -12,6 +12,11 @@ 2.4 #include "matrix.h" 2.5 #include "scene.h" 2.6 #include "ocl.h" 2.7 +#include "ogl.h" 2.8 + 2.9 +#ifdef _MSC_VER 2.10 +#define snprintf _snprintf 2.11 +#endif 2.12 2.13 void cleanup(); 2.14 void disp();