|
These are source code changes to get OSL compiling on windows with visual studio (2008). There is still a big problem in generating llvm bitcode, and there are also some changes to make in the cmake files, but I have no solutions for those things yet.
Overview of the changes:
Renamed DLLPUBLIC because it conflicts with the OIIO define. Now there's a different define per OSL library, because they also conflict with each other, oslcomp use files from oslexec and vice versa. Sprinkled these defines in the header files where necessary, and put #include "export.h" in oslconfig.h.
Replaced all the platform specific hash stuff symtab.h with OIIO hash, which then compiles on windows too.
Compatibility fixes for popen/pclose, snprintf, RGB, access, strtof, and use of 'and' operator.
Code tweaks to handle spline template compile error, and double/float overloading problem with fmod.
Use "OpenImageIO/fmath.h" instead of <cmath> to fix missing M_1_PI and similar defines.
Use ${OPENIMAGEIO_INCLUDES} instead of ${OPENIMAGEIOHOME}/include for LLVM, as was already used for all other files. Avoids having to define the environment variable.
Total comments: 2
Total comments: 3
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+88 lines, -91 lines) |
Patch |
 |
|
src/include/accum.h
|
View
|
1
2
3
4
|
3 chunks |
+3 lines, -3 lines |
0 comments
|
Download
|
 |
|
src/include/export.h
|
View
|
1
2
3
4
|
2 chunks |
+32 lines, -21 lines |
0 comments
|
Download
|
 |
|
src/include/oslclosure.h
|
View
|
1
2
3
4
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
|
src/include/oslcomp.h
|
View
|
1
2
3
4
|
2 chunks |
+2 lines, -3 lines |
0 comments
|
Download
|
 |
|
src/include/oslconfig.h
|
View
|
1
2
3
4
|
1 chunk |
+2 lines, -0 lines |
0 comments
|
Download
|
 |
|
src/include/oslexec.h
|
View
|
1
2
3
4
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
|
src/include/oslquery.h
|
View
|
1
2
3
4
|
2 chunks |
+1 line, -3 lines |
0 comments
|
Download
|
 |
|
src/liboslcomp/oslcomp.cpp
|
View
|
1
2
3
4
|
1 chunk |
+4 lines, -0 lines |
0 comments
|
Download
|
 |
|
src/liboslcomp/symtab.h
|
View
|
1
2
3
4
|
2 chunks |
+3 lines, -31 lines |
0 comments
|
Download
|
 |
|
src/liboslexec/CMakeLists.txt
|
View
|
1
2
3
4
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
|
src/liboslexec/automata.cpp
|
View
|
1
2
3
4
|
2 chunks |
+4 lines, -1 line |
0 comments
|
Download
|
 |
|
src/liboslexec/background.cpp
|
View
|
1
2
3
4
5
6
|
1 chunk |
+1 line, -3 lines |
0 comments
|
Download
|
 |
|
src/liboslexec/bsdf.cpp
|
View
|
1
2
3
4
5
6
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
|
src/liboslexec/bsdf_ashikhmin_velvet.cpp
|
View
|
1
2
3
4
5
6
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
|
src/liboslexec/bsdf_cloth.cpp
|
View
|
1
2
3
4
5
6
|
2 chunks |
+3 lines, -2 lines |
0 comments
|
Download
|
 |
|
src/liboslexec/bsdf_cloth_fncs.cpp
|
View
|
1
2
3
4
5
6
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
|
src/liboslexec/bsdf_cloth_specular.cpp
|
View
|
1
2
3
4
5
6
|
1 chunk |
+2 lines, -1 line |
0 comments
|
Download
|
 |
|
src/liboslexec/bsdf_diffuse.cpp
|
View
|
1
2
3
4
5
6
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
|
src/liboslexec/bsdf_fakefur.cpp
|
View
|
1
2
3
4
5
6
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
|
src/liboslexec/bsdf_hair.cpp
|
View
|
1
2
3
4
5
6
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
|
src/liboslexec/bsdf_microfacet.cpp
|
View
|
1
2
3
4
5
6
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
|
src/liboslexec/bsdf_phong.cpp
|
View
|
1
2
3
4
5
6
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
|
src/liboslexec/bsdf_reflection.cpp
|
View
|
1
2
3
4
5
6
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
|
src/liboslexec/bsdf_refraction.cpp
|
View
|
1
2
3
4
5
6
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
|
src/liboslexec/bsdf_transparent.cpp
|
View
|
1
2
3
4
5
6
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
|
src/liboslexec/bsdf_ward.cpp
|
View
|
1
2
3
4
5
6
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
|
src/liboslexec/bsdf_westin.cpp
|
View
|
1
2
3
4
5
6
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
|
src/liboslexec/dictionary.cpp
|
View
|
1
2
3
4
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
|
src/liboslexec/oslexec_pvt.h
|
View
|
1
2
3
4
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
|
src/liboslexec/shadingsys.cpp
|
View
|
1
2
3
4
5
6
|
1 chunk |
+4 lines, -1 line |
0 comments
|
Download
|
 |
|
src/liboslexec/splineimpl.h
|
View
|
1
2
3
4
5
6
|
1 chunk |
+5 lines, -0 lines |
0 comments
|
Download
|
 |
|
src/liboslexec/vol_subsurface.cpp
|
View
|
1
2
3
4
5
6
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
Total messages: 14
|