Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2011-05-07 00:18:42 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2011-05-07 00:18:42 +0400
commitcb12337363032e59967b4935e10e8d996f297ca1 (patch)
tree6d73642eaf1c0f8d793e752988dfdbdd4e41d150 /source/blender/readblenfile
parent4eb1b5256e0159f747c055e10bd091a40fc834b7 (diff)
Code cleanup: remove source/kernel module, this wasn't really the kernel of
anything, only contained a hash map and functions to pass command line args to the game engine. Moved those to container and BlenderRoutines modules.
Diffstat (limited to 'source/blender/readblenfile')
-rw-r--r--source/blender/readblenfile/CMakeLists.txt1
-rw-r--r--source/blender/readblenfile/SConscript2
-rw-r--r--source/blender/readblenfile/stub/BLO_readblenfileSTUB.c11
3 files changed, 6 insertions, 8 deletions
diff --git a/source/blender/readblenfile/CMakeLists.txt b/source/blender/readblenfile/CMakeLists.txt
index 8d3633b4918..9b869d39697 100644
--- a/source/blender/readblenfile/CMakeLists.txt
+++ b/source/blender/readblenfile/CMakeLists.txt
@@ -31,7 +31,6 @@ set(INC
../blenkernel
../blenlib
../makesdna
- ../../kernel/gen_messaging
)
set(SRC
diff --git a/source/blender/readblenfile/SConscript b/source/blender/readblenfile/SConscript
index 6d8749df1e2..07f84eb52d5 100644
--- a/source/blender/readblenfile/SConscript
+++ b/source/blender/readblenfile/SConscript
@@ -3,6 +3,6 @@ Import ('env')
sources = env.Glob('intern/*.c')
-incs = '. ../blenloader ../blenloader/intern ../blenkernel ../blenlib ../makesdna ../../kernel/gen_messaging'
+incs = '. ../blenloader ../blenloader/intern ../blenkernel ../blenlib ../makesdna'
env.BlenderLib ( 'bf_readblenfile', sources, Split(incs), [], libtype=['core','player'], priority = [0,5] )
diff --git a/source/blender/readblenfile/stub/BLO_readblenfileSTUB.c b/source/blender/readblenfile/stub/BLO_readblenfileSTUB.c
index 4900f0c3338..0f3541b510d 100644
--- a/source/blender/readblenfile/stub/BLO_readblenfileSTUB.c
+++ b/source/blender/readblenfile/stub/BLO_readblenfileSTUB.c
@@ -34,7 +34,6 @@
#include <stdio.h>
-#include "GEN_messaging.h"
int BLO_readblenfilememory( char *fromBuffer, int fromBufferSize);
int BLO_readblenfilename( char *fileName);
@@ -47,7 +46,7 @@ BLO_readblenfilememory(
char *fromBuffer, int fromBufferSize)
{
#if defined(DEBUG)
- fprintf(GEN_errorstream,
+ fprintf(stderr,
"Error BLO_readblenfilename is a stub\n");
#endif
return(1);
@@ -58,7 +57,7 @@ BLO_readblenfilename(
char *fileName)
{
#if defined(DEBUG)
- fprintf(GEN_errorstream,
+ fprintf(stderr,
"Error BLO_readblenfilename is a stub\n");
#endif
return(1);
@@ -69,7 +68,7 @@ BLO_readblenfilehandle(
int fileHandle)
{
#if defined(DEBUG)
- fprintf(GEN_errorstream,
+ fprintf(stderr,
"Error BLO_readblenfilehandle is a stub\n");
#endif
return(1);
@@ -80,7 +79,7 @@ BLO_is_a_runtime(
char *file)
{
#if defined(DEBUG)
- fprintf(GEN_errorstream,
+ fprintf(stderr,
"Error BLO_is_a_runtime is a stub\n");
#endif
return 0;
@@ -91,7 +90,7 @@ BLO_read_runtime(
char *file)
{
#if defined(DEBUG)
- fprintf(GEN_errorstream,
+ fprintf(stderr,
"Error BLO_read_runtime is a stub\n");
#endif
return 0;