kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

* doing some warning cleaning

Browse Source 
* accidently left priority tests around.
This commit is contained in:
Nathan Letwory 2008-11-04 23:46:01 +00:00
parent beea73b110
commit f59f5e67a5
7 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extern/libopenjpeg/SConscript vendored
View File

@ -21,4 +21,4 @@ oj_env.BlenderLib ( libname='extern_openjpeg',
sources=sources, includes=Split(incs),
defines=[],
libtype=['core','intern','player'],
priority=[5, 10, 200], compileflags = flags)
priority=[10, 10, 300], compileflags = flags)

2
extern/libredcode/SConscript vendored
View File

@ -13,4 +13,4 @@ env.BlenderLib ( libname='extern_redcode',
sources=sources, includes=Split(incs),
defines=[],
libtype=['core','intern','player'],
priority=[10, 5, 300], compileflags = [])
priority=[5, 5, 200], compileflags = [])

12
source/blender/blenkernel/intern/blender.c
View File

@ -30,11 +30,15 @@
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef WIN32
#include <unistd.h> // for read close
#include <sys/param.h> // for MAXPATHLEN
#ifndef _WIN32
#include <unistd.h> // for read close
#include <sys/param.h> // for MAXPATHLEN
#else
#include <io.h> // for open close read
#include <io.h> // for open close read
#define open _open
#define read _read
#define close _close
#define write _write
#endif
#include <stdlib.h>

6
source/blender/blenkernel/intern/exotic.c
View File

@ -76,10 +76,14 @@
#include <fcntl.h>
#include <string.h>
#ifndef WIN32
#ifndef _WIN32
#include <unistd.h>
#else
#include <io.h>
#define open _open
#define read _read
#define close _close
#define write _write
#endif
#include "MEM_guardedalloc.h"

6
source/blender/imbuf/intern/amiga.c
View File

@ -29,8 +29,12 @@
* ***** END GPL LICENSE BLOCK *****
*/
#ifdef WIN32
#ifdef _WIN32
#include <io.h>
#define open _open
#define read _read
#define close _close
#define write _write
#endif
#include "imbuf.h"
#include "imbuf_patch.h"

5
source/blender/imbuf/intern/readimage.c
View File

@ -29,11 +29,14 @@
* $Id$
*/
#ifdef WIN32
#ifdef _WIN32
#include <io.h>
#include <stddef.h>
#include <sys/types.h>
#include "mmap_win.h"
#define open _open
#define read _read
#define close _close
#endif
#include "BLI_blenlib.h"

10
source/blender/imbuf/intern/util.c
View File

@ -29,6 +29,13 @@
* $Id$
*/
#ifdef _WIN32
#include <io.h>
#define open _open
#define read _read
#define close _close
#endif
#include "BLI_blenlib.h"
#include "DNA_userdef_types.h"
@ -275,7 +282,8 @@ static AVCodecContext* get_codec_from_stream(AVStream* stream)
static int isffmpeg (char *filename) {
AVFormatContext *pFormatCtx;
int i, videoStream;
unsigned int i;
int videoStream;
AVCodec *pCodec;
AVCodecContext *pCodecCtx;