diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2009-09-16 21:43:09 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2009-09-16 21:43:09 +0400 |
| commit | deebf4f8f0d79169a0e6c2a391670419b6492bfe (patch) | |
| tree | 2a0aaf4042aa78e9d1d835f4544e07c6123e67a9 /source/blender/readblenfile | |
| parent | 6b0679a3999d8e5abc60730f523879eadbedcd8f (diff) | |
merge with 2.5/trunk at r23271
Diffstat (limited to 'source/blender/readblenfile')
| -rw-r--r-- | source/blender/readblenfile/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/blender/readblenfile/SConscript | 2 | ||||
| -rw-r--r-- | source/blender/readblenfile/intern/BLO_readblenfile.c | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/readblenfile/CMakeLists.txt b/source/blender/readblenfile/CMakeLists.txt index dc4a8f5636d..ded4a1e00cf 100644 --- a/source/blender/readblenfile/CMakeLists.txt +++ b/source/blender/readblenfile/CMakeLists.txt @@ -27,7 +27,7 @@ FILE(GLOB SRC intern/*.c) SET(INC - . ../blenloader ../blenloader/intern ../blenkernel ../blenlib ../makesdna ../../kernel/gen_messaging + . ../blenloader ../blenloader/intern ../blenkernel ../blenlib ../makesdna ../../kernel/gen_messaging ) BLENDERLIB(bf_readblenfile "${SRC}" "${INC}") diff --git a/source/blender/readblenfile/SConscript b/source/blender/readblenfile/SConscript index 59771aa0829..57ee1866263 100644 --- a/source/blender/readblenfile/SConscript +++ b/source/blender/readblenfile/SConscript @@ -5,4 +5,4 @@ sources = env.Glob('intern/*.c') incs = '. ../blenloader ../blenloader/intern ../blenkernel ../blenlib ../makesdna ../../kernel/gen_messaging' -env.BlenderLib ( 'bf_readblenfile', sources, Split(incs), [], libtype=['core','player'], priority = [0, 220] ) +env.BlenderLib ( 'bf_readblenfile', sources, Split(incs), [], libtype=['core','player'], priority = [0,195] ) diff --git a/source/blender/readblenfile/intern/BLO_readblenfile.c b/source/blender/readblenfile/intern/BLO_readblenfile.c index 496ac529406..4ad95816f7f 100644 --- a/source/blender/readblenfile/intern/BLO_readblenfile.c +++ b/source/blender/readblenfile/intern/BLO_readblenfile.c @@ -43,6 +43,7 @@ #ifdef WIN32 #include <io.h> // read, open +#include "BLI_winstuff.h" #else // ! WIN32 #include <unistd.h> // read #endif |