Revision: 23651
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23651
Author: aligorith
Date: 2009-10-06 05:40:50 +0200 (Tue, 06 Oct 2009)
Log Message:
-----------
Attempts at some compile fixes for jaguarandi's code:
* mingw almost compiles again cleanly, except for a linking error when linking
blender http://www.pasteall.org/8297
* win64 should compile again too to a similar degree?
* silenced warnings about no newlines...
Modified Paths:
--------------
trunk/blender/source/blender/render/intern/include/rayobject.h
trunk/blender/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
trunk/blender/source/blender/render/intern/raytrace/svbvh.h
trunk/blender/source/blender/render/intern/raytrace/vbvh.h
trunk/blender/source/blender/render/intern/source/rayshade.c
Modified: trunk/blender/source/blender/render/intern/include/rayobject.h
===================================================================
--- trunk/blender/source/blender/render/intern/include/rayobject.h
2009-10-06 03:05:20 UTC (rev 23650)
+++ trunk/blender/source/blender/render/intern/include/rayobject.h
2009-10-06 03:40:50 UTC (rev 23651)
@@ -35,6 +35,7 @@
#include "RE_raytrace.h"
#include "render_types.h"
+#include <stdio.h>
#include <float.h>
@@ -174,11 +175,10 @@
-#if !defined(_WIN32)
+#if !defined(_WIN32) && !defined(_WIN64)
#include <sys/time.h>
#include <time.h>
-#include <stdio.h>
#define BENCH(a,name) \
do { \
@@ -194,7 +194,7 @@
} while(0)
#else
-#define BENCH(a) (a)
+#define BENCH(a,name) (a)
#endif
Modified: trunk/blender/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
===================================================================
--- trunk/blender/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
2009-10-06 03:05:20 UTC (rev 23650)
+++ trunk/blender/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
2009-10-06 03:40:50 UTC (rev 23651)
@@ -146,4 +146,4 @@
return NULL;
}
-#endif
\ No newline at end of file
+#endif
Modified: trunk/blender/source/blender/render/intern/raytrace/svbvh.h
===================================================================
--- trunk/blender/source/blender/render/intern/raytrace/svbvh.h 2009-10-06
03:05:20 UTC (rev 23650)
+++ trunk/blender/source/blender/render/intern/raytrace/svbvh.h 2009-10-06
03:40:50 UTC (rev 23651)
@@ -246,4 +246,4 @@
#endif
-#endif //__SSE__
\ No newline at end of file
+#endif //__SSE__
Modified: trunk/blender/source/blender/render/intern/raytrace/vbvh.h
===================================================================
--- trunk/blender/source/blender/render/intern/raytrace/vbvh.h 2009-10-06
03:05:20 UTC (rev 23650)
+++ trunk/blender/source/blender/render/intern/raytrace/vbvh.h 2009-10-06
03:40:50 UTC (rev 23651)
@@ -234,4 +234,4 @@
return node;
}
};
-*/
\ No newline at end of file
+*/
Modified: trunk/blender/source/blender/render/intern/source/rayshade.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/rayshade.c
2009-10-06 03:05:20 UTC (rev 23650)
+++ trunk/blender/source/blender/render/intern/source/rayshade.c
2009-10-06 03:40:50 UTC (rev 23651)
@@ -25,6 +25,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
+#include <stdio.h>
#include <math.h>
#include <string.h>
#include <stdlib.h>
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
