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...
This commit is contained in:
@@ -35,6 +35,7 @@ extern "C" {
|
||||
|
||||
#include "RE_raytrace.h"
|
||||
#include "render_types.h"
|
||||
#include <stdio.h>
|
||||
#include <float.h>
|
||||
|
||||
|
||||
@@ -174,11 +175,10 @@ int RE_rayobjectcontrol_test_break(RayObjectControl *c);
|
||||
|
||||
|
||||
|
||||
#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 @@ int RE_rayobjectcontrol_test_break(RayObjectControl *c);
|
||||
} while(0)
|
||||
#else
|
||||
|
||||
#define BENCH(a) (a)
|
||||
#define BENCH(a,name) (a)
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@@ -146,4 +146,4 @@ RayObject *RE_rayobject_qbvh_create(int size)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@@ -246,4 +246,4 @@ struct Reorganize_SVBVH
|
||||
|
||||
#endif
|
||||
|
||||
#endif //__SSE__
|
||||
#endif //__SSE__
|
||||
|
||||
@@ -234,4 +234,4 @@ struct Reorganize_VBVH
|
||||
return node;
|
||||
}
|
||||
};
|
||||
*/
|
||||
*/
|
||||
|
||||
@@ -25,6 +25,7 @@
|
||||
* ***** END GPL LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <math.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
Reference in New Issue
Block a user