diff options
Diffstat (limited to 'source/blender/blenpluginapi')
| -rw-r--r-- | source/blender/blenpluginapi/intern/Makefile | 5 | ||||
| -rw-r--r-- | source/blender/blenpluginapi/intern/pluginapi.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/blenpluginapi/intern/Makefile b/source/blender/blenpluginapi/intern/Makefile index 1a638d848c8..732c419d626 100644 --- a/source/blender/blenpluginapi/intern/Makefile +++ b/source/blender/blenpluginapi/intern/Makefile @@ -49,9 +49,8 @@ CPPFLAGS += $(LEVEL_2_CPP_WARNINGS) # path to our own external headerfiles. On win2k this needs to be # longer, to avoid the util.h include problem CPPFLAGS += -I.. -ifeq ($(OS),windows) - CPPFLAGS += -I../.. -endif +CPPFLAGS += -I../.. + # also do dna CPPFLAGS += -I../../makesdna # path to blenlib diff --git a/source/blender/blenpluginapi/intern/pluginapi.c b/source/blender/blenpluginapi/intern/pluginapi.c index c9cbc72ca60..aefd8d3f458 100644 --- a/source/blender/blenpluginapi/intern/pluginapi.c +++ b/source/blender/blenpluginapi/intern/pluginapi.c @@ -48,7 +48,7 @@ #ifdef WIN32 #include "blenpluginapi\util.h" #else -#include "util.h" +#include "blenpluginapi/util.h" #endif #include "iff.h" #include "plugin.h" @@ -316,6 +316,8 @@ float turbulence1(float noisesize, * Otherwise they will not be imported from the archive * library on Unix. -zr */ +int pluginapi_force_ref(void); + int pluginapi_force_ref(void) { return (int) mallocN + |