move BLO_sys_types.h -> BLI_sys_types.h (it had nothing todo with loading)
authorCampbell Barton <ideasman42@gmail.com>
Tue, 28 May 2013 19:35:26 +0000 (19:35 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 28 May 2013 19:35:26 +0000 (19:35 +0000)
remove MEM_sys_types.h which was a duplicate.

161 files changed:
extern/carve/include/carve/win32.h
intern/container/CTR_TaggedIndex.h
intern/cycles/blender/CMakeLists.txt
intern/ghost/test/CMakeLists.txt
intern/guardedalloc/CMakeLists.txt
intern/guardedalloc/MEM_guardedalloc.h
intern/guardedalloc/MEM_sys_types.h [deleted file]
intern/guardedalloc/mmap_win.h
intern/memutil/MEM_Allocator.h
intern/opennl/superlu/superlu_sys_types.h
source/blender/SConscript
source/blender/avi/AVI_avi.h
source/blender/avi/intern/avi.c
source/blender/blenfont/CMakeLists.txt
source/blender/blenfont/SConscript
source/blender/blenkernel/BKE_customdata.h
source/blender/blenkernel/intern/CCGSubSurf.c
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/displist.c
source/blender/blenkernel/intern/icons.c
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/mesh_validate.c
source/blender/blenkernel/intern/seqcache.c
source/blender/blenlib/CMakeLists.txt
source/blender/blenlib/intern/BLI_ghash.c
source/blender/blenlib/intern/endian_switch.c
source/blender/blenlib/intern/fileops.c
source/blender/blenloader/CMakeLists.txt
source/blender/blenloader/intern/readblenentry.c
source/blender/collada/CMakeLists.txt
source/blender/collada/SConscript
source/blender/compositor/CMakeLists.txt
source/blender/compositor/SConscript
source/blender/editors/animation/CMakeLists.txt
source/blender/editors/animation/SConscript
source/blender/editors/animation/anim_draw.c
source/blender/editors/animation/anim_ops.c
source/blender/editors/armature/CMakeLists.txt
source/blender/editors/armature/SConscript
source/blender/editors/curve/CMakeLists.txt
source/blender/editors/curve/SConscript
source/blender/editors/gpencil/CMakeLists.txt
source/blender/editors/gpencil/SConscript
source/blender/editors/gpencil/drawgpencil.c
source/blender/editors/gpencil/gpencil_ops.c
source/blender/editors/include/UI_interface.h
source/blender/editors/interface/CMakeLists.txt
source/blender/editors/interface/SConscript
source/blender/editors/io/CMakeLists.txt
source/blender/editors/io/SConscript
source/blender/editors/mask/CMakeLists.txt
source/blender/editors/mask/SConscript
source/blender/editors/mesh/CMakeLists.txt
source/blender/editors/mesh/SConscript
source/blender/editors/metaball/CMakeLists.txt
source/blender/editors/metaball/SConscript
source/blender/editors/object/CMakeLists.txt
source/blender/editors/object/SConscript
source/blender/editors/object/object_shapekey.c
source/blender/editors/physics/CMakeLists.txt
source/blender/editors/physics/SConscript
source/blender/editors/screen/CMakeLists.txt
source/blender/editors/screen/SConscript
source/blender/editors/sculpt_paint/CMakeLists.txt
source/blender/editors/sculpt_paint/SConscript
source/blender/editors/sculpt_paint/paint_utils.c
source/blender/editors/sound/CMakeLists.txt
source/blender/editors/sound/SConscript
source/blender/editors/space_action/CMakeLists.txt
source/blender/editors/space_action/SConscript
source/blender/editors/space_api/CMakeLists.txt
source/blender/editors/space_api/SConscript
source/blender/editors/space_buttons/CMakeLists.txt
source/blender/editors/space_buttons/SConscript
source/blender/editors/space_clip/CMakeLists.txt
source/blender/editors/space_clip/SConscript
source/blender/editors/space_console/CMakeLists.txt
source/blender/editors/space_console/SConscript
source/blender/editors/space_graph/CMakeLists.txt
source/blender/editors/space_graph/SConscript
source/blender/editors/space_image/CMakeLists.txt
source/blender/editors/space_image/SConscript
source/blender/editors/space_logic/CMakeLists.txt
source/blender/editors/space_logic/SConscript
source/blender/editors/space_nla/CMakeLists.txt
source/blender/editors/space_nla/SConscript
source/blender/editors/space_node/CMakeLists.txt
source/blender/editors/space_node/SConscript
source/blender/editors/space_outliner/CMakeLists.txt
source/blender/editors/space_outliner/SConscript
source/blender/editors/space_script/CMakeLists.txt
source/blender/editors/space_script/SConscript
source/blender/editors/space_sequencer/CMakeLists.txt
source/blender/editors/space_sequencer/SConscript
source/blender/editors/space_text/CMakeLists.txt
source/blender/editors/space_text/SConscript
source/blender/editors/space_time/CMakeLists.txt
source/blender/editors/space_time/SConscript
source/blender/editors/space_userpref/CMakeLists.txt
source/blender/editors/space_userpref/SConscript
source/blender/editors/space_view3d/CMakeLists.txt
source/blender/editors/space_view3d/SConscript
source/blender/editors/space_view3d/drawanimviz.c
source/blender/editors/space_view3d/view3d_project.c
source/blender/editors/transform/CMakeLists.txt
source/blender/editors/transform/SConscript
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_generics.c
source/blender/editors/util/CMakeLists.txt
source/blender/editors/util/SConscript
source/blender/editors/uvedit/CMakeLists.txt
source/blender/editors/uvedit/SConscript
source/blender/editors/uvedit/uvedit_parametrizer.c
source/blender/editors/uvedit/uvedit_parametrizer.h
source/blender/freestyle/CMakeLists.txt
source/blender/freestyle/SConscript
source/blender/gpu/CMakeLists.txt
source/blender/gpu/SConscript
source/blender/gpu/intern/gpu_codegen.c
source/blender/imbuf/intern/cineon/CMakeLists.txt
source/blender/imbuf/intern/cineon/SConscript
source/blender/imbuf/intern/cineon/logImageCore.h
source/blender/imbuf/intern/dds/FlipDXT.h
source/blender/imbuf/intern/scaling.c
source/blender/makesdna/DNA_defs.h
source/blender/makesdna/intern/CMakeLists.txt
source/blender/makesdna/intern/SConscript
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/RNA_types.h
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/SConscript
source/blender/makesrna/intern/rna_mesh_api.c
source/blender/makesrna/intern/rna_meta_api.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_pose_api.c
source/blender/modifiers/CMakeLists.txt
source/blender/modifiers/SConscript
source/blender/modifiers/intern/MOD_meshcache_mdd.c
source/blender/modifiers/intern/MOD_meshcache_pc2.c
source/blender/nodes/CMakeLists.txt
source/blender/nodes/SConscript
source/blender/python/generic/CMakeLists.txt
source/blender/quicktime/CMakeLists.txt
source/blender/quicktime/SConscript
source/blender/quicktime/apple/qtkit_export.m
source/blender/quicktime/apple/qtkit_import.m
source/blender/quicktime/apple/quicktime_export.c
source/blender/quicktime/apple/quicktime_import.c
source/blender/render/CMakeLists.txt
source/blender/render/SConscript
source/blender/render/intern/include/render_types.h
source/blender/windowmanager/intern/wm.c
source/blender/windowmanager/intern/wm_cursors.c
source/blenderplayer/bad_level_call_stubs/SConscript
source/gameengine/Expressions/CMakeLists.txt
source/gameengine/Expressions/ListValue.cpp
source/gameengine/Expressions/SConscript
source/gameengine/Ketsji/KX_MaterialIpoController.cpp
source/gameengine/Ketsji/SConscript
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt

index 5f8ce3b3bf6cb2fd352d22e335fbc81594aaca87..8b5021cf2fbcdbc2e111226c8449ea6c493d2b5d 100755 (executable)
@@ -37,7 +37,7 @@ typedef unsigned long uintptr_t;
 #if defined(_WIN32) && !defined(__MINGW32__)
 /* The __intXX are built-in types of the visual complier! So we don't
    need to include anything else here.
-   This typedefs should be in sync with types from MEM_sys_types.h */
+   This typedefs should be in sync with types from BLI_sys_types.h */
 
 typedef signed __int8  int8_t;
 typedef signed __int16 int16_t;
index 0eb4e02e84f01663ff0b3e57dfc9c5cd9b9032a8..e03bfdea819f1d00ccf55203017d64af9773604e 100644 (file)
@@ -43,7 +43,7 @@
 
 #include <functional>
 
-#include "MEM_sys_types.h"
+#include "../../source/blender/blenlib/BLI_sys_types.h"
 
 enum {
        empty_tag = 0x0,
index 710e8ba6a9014875b63609ee02a43ffc517d4581..29295d664ad8d377dbc144ef1909f4a061bbbb91 100644 (file)
@@ -10,7 +10,6 @@ set(INC
        ../../mikktspace
        ../../../source/blender/makesdna
        ../../../source/blender/makesrna
-       ../../../source/blender/blenloader
        ${CMAKE_BINARY_DIR}/source/blender/makesrna/intern
 )
 
index 75f082fe83430976e915cd09c974f76304b6cbba..98d0f290350577434ad2f4b40822d929a850b1cc 100644 (file)
@@ -87,7 +87,6 @@ add_library(blenfont_lib ${SRC_NEW})
 # grr, blenfont needs BLI
 include_directories(
                "../../../source/blender/blenlib"
-               "../../../source/blender/blenloader"
                )
 add_library(bli_lib 
                "../../../source/blender/blenlib/intern/fileops.c"
index 243dc462e65c9ce8b92b9baf5c36b48cfcd8cbe3..4f6c177ef7d3cc89afe95cb913171a0ad4747d20 100644 (file)
@@ -35,7 +35,6 @@ set(SRC
        ./intern/mallocn.c
 
        MEM_guardedalloc.h
-       MEM_sys_types.h
 )
 
 if(WIN32 AND NOT UNIX)
index beffaece865a2a35b6ee5fc7a7959e01a003dbcc..d49dc4b4dd90bd86edeea147aa9377b3227839f0 100644 (file)
@@ -61,7 +61,9 @@
 #define __MEM_GUARDEDALLOC_H__
 
 #include <stdio.h>          /* needed for FILE* */
-#include "MEM_sys_types.h"  /* needed for uintptr_t */
+
+/* needed for uintptr_t, exception, dont use BLI anywhere else in MEM_* */
+#include "../../source/blender/blenlib/BLI_sys_types.h"
 
 /* some GNU attributes are only available from GCC 4.3 */
 #define MEM_GNU_ATTRIBUTES (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 403))
diff --git a/intern/guardedalloc/MEM_sys_types.h b/intern/guardedalloc/MEM_sys_types.h
deleted file mode 100644 (file)
index 72563fc..0000000
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file MEM_sys_types.h
- *  \ingroup MEM
- *
- * A platform-independent definition of [u]intXX_t
- * Plus the accompanying header include for htonl/ntohl
- *
- * This file includes <sys/types.h> to define [u]intXX_t types, where
- * XX can be 8, 16, 32 or 64. Unfortunately, not all systems have this
- * file.
- * - Windows uses __intXX compiler-builtin types. These are signed,
- *   so we have to flip the signs.
- * For these rogue platforms, we make the typedefs ourselves.
- *
- */
-
-/* 
-// DG: original BLO_sys_types.h is in source/blender/blenkernel 
-// but is not allowed be accessed here because of bad-level-call
-// jesterKing: I've renamed this to MEM_sys_types.h, because otherwise
-// doxygen would get a conflict
-*/
-
-#ifndef __MEM_SYS_TYPES_H__
-#define __MEM_SYS_TYPES_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#if defined(_WIN32) && !defined(FREE_WINDOWS)
-
-/* The __intXX are built-in types of the visual complier! So we don't
- * need to include anything else here. */
-
-
-typedef signed __int8  int8_t;
-typedef signed __int16 int16_t;
-typedef signed __int32 int32_t;
-typedef signed __int64 int64_t;
-
-typedef unsigned __int8  uint8_t;
-typedef unsigned __int16 uint16_t;
-typedef unsigned __int32 uint32_t;
-typedef unsigned __int64 uint64_t;
-
-#ifndef _INTPTR_T_DEFINED
-#ifdef _WIN64
-typedef __int64 intptr_t;
-#else
-typedef long intptr_t;
-#endif
-#define _INTPTR_T_DEFINED
-#endif
-
-#ifndef _UINTPTR_T_DEFINED
-#ifdef _WIN64
-typedef unsigned __int64 uintptr_t;
-#else
-typedef unsigned long uintptr_t;
-#endif
-#define _UINTPTR_T_DEFINED
-#endif
-
-#elif defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__)
-
-       /* Linux-i386, Linux-Alpha, Linux-ppc */
-#include <stdint.h>
-
-/* XXX */
-
-#ifndef UINT64_MAX
-# define UINT64_MAX            18446744073709551615
-typedef uint8_t   u_int8_t;
-typedef uint16_t  u_int16_t;
-typedef uint32_t  u_int32_t;
-typedef uint64_t  u_int64_t;
-#endif
-
-#elif defined (__APPLE__)
-
-#include <inttypes.h>
-
-#elif defined(FREE_WINDOWS)
-#include <stdint.h>
-
-#else
-
-       /* FreeBSD, Solaris */
-#include <sys/types.h>
-
-#endif /* ifdef platform for types */
-
-
-#ifdef _WIN32
-#ifndef FREE_WINDOWS
-#ifndef htonl
-#define htonl(x) correctByteOrder(x)
-#endif
-#ifndef ntohl
-#define ntohl(x) correctByteOrder(x)
-#endif
-#endif
-#elif defined (__FreeBSD__) || defined (__OpenBSD__) 
-#include <sys/param.h>
-#elif defined (__APPLE__)
-#include <sys/types.h>
-#else  /* sun linux */
-#include <netinet/in.h>
-#endif /* ifdef platform for htonl/ntohl */
-
-#ifdef __cplusplus 
-}
-#endif
-
-#endif /* __MEM_SYS_TYPES_H__ */
index fdbb249a9326c59b9a2eb177e2b97ddb2be84493..c84882b10528e4aca4506204d5e784c30f3979d6 100644 (file)
@@ -48,7 +48,8 @@
 
 #define MAP_FAILED ((void *)-1)
 
-#include "MEM_sys_types.h" // needed for intptr_t
+/* needed for uintptr_t, exception, dont use BLI anywhere else in MEM_* */
+#include "../../source/blender/blenlib/BLI_sys_types.h"
 
 void *mmap(void *start, size_t len, int prot, int flags, int fd, off_t offset);
 intptr_t munmap(void *ptr, intptr_t size);
index b4c0559b51174d5aa520cd3af6883147779056ba..2bcdf3a6fa5f7f18684e6486d68c552d7883cb4f 100644 (file)
@@ -30,7 +30,6 @@
 
 #include <stddef.h>
 #include "guardedalloc/MEM_guardedalloc.h"
-#include "guardedalloc/MEM_sys_types.h"
 
 template<typename _Tp>
 struct MEM_Allocator
index 5685b34f1f45f5802c8399439036fef5f9191d42..0e32be13323181ac321359620e024ee3de4d7666 100644 (file)
@@ -42,7 +42,7 @@
 
 
 /* 
-// DG: original BLO_sys_types.h is in source/blender/blenkernel 
+// DG: original BLI_sys_types.h is in source/blender/blenkernel
 // but is not allowed be accessed here because of bad-level-call
 // jesterKing: renamed to superlu_sys_types.h
 */
index 66d54961131a3b9d4ed61c96e917f1a202e88969..3064d7d9ed653d84b746fc3230ca60f315de2d04 100644 (file)
@@ -32,7 +32,6 @@ SConscript(['avi/SConscript',
             'bmesh/SConscript',
             'blenkernel/SConscript',
             'blenlib/SConscript',
-            'blenloader/SConscript',
             'gpu/SConscript',
             'editors/SConscript',
             'imbuf/SConscript',
index 7c217c9223d9b70bd0536d617e51d1f0eba36f03..cfa314bba04a7a5306567f6e14f30109d38f3f5f 100644 (file)
@@ -53,7 +53,7 @@
 #ifndef __AVI_AVI_H__
 #define __AVI_AVI_H__
 
-#include "MEM_sys_types.h"
+#include "BLI_sys_types.h"
 #include <stdio.h> /* for FILE */
 
 typedef struct _AviChunk {
index 1b1ec1c08af464c3dfaf2f566ca93d1c27f698c2..48e64695822965e817c1189a9d6e72bdc8c78af3 100644 (file)
@@ -43,8 +43,8 @@
 #endif
 
 #include "MEM_guardedalloc.h"
-#include "MEM_sys_types.h"
 
+#include "BLI_sys_types.h"
 #include "BLI_utildefines.h"
 #include "BLI_fileops.h"
 
index 7bb80c343232e1d0a39f8501554b9d6c738dcb59..2debe516dd792d20960f5c1d752b5234d3db8983 100644 (file)
@@ -25,7 +25,6 @@ set(INC
        .
        ../blenkernel
        ../blenlib
-       ../blenloader
        ../editors/include
        ../makesdna
        ../makesrna
index e2ff41e9b9c357bf05b4fe94dfc91f1989f1e6ac..3973fed677f5a54c3d980d43142614094bb698d4 100644 (file)
@@ -38,7 +38,6 @@ incs = [
     '#/extern/glew/include',
     '../blenkernel',
     '../blenlib',
-    '../blenloader',
     '../editors/include',
     '../imbuf',
     '../makesdna',
index b72667b59359a3a87e6608bba2f72dec37016ffe..0b6a3be7c84467a84a4da251dda6d97fa7e83542 100644 (file)
@@ -38,7 +38,7 @@
 extern "C" {
 #endif
 
-#include "../blenloader/BLO_sys_types.h" /* XXX, should have a more generic include for this */
+#include "BLI_sys_types.h" /* XXX, should have a more generic include for this */
 #include "BLI_utildefines.h"
 
 struct BMesh;
index a3fadcb5bbe2403448d7cb209ed2f3c8f72767c7..a0e7b4d96aa17604cbb8519357fe223d5ddf0026 100644 (file)
@@ -8,7 +8,7 @@
 #include <math.h>
 
 #include "MEM_guardedalloc.h"
-#include "BLO_sys_types.h" // for intptr_t support
+#include "BLI_sys_types.h" // for intptr_t support
 
 #include "BLI_utildefines.h" /* for BLI_assert */
 
index 02de0ce1d401264ae9c54f0e9788f2576b910384..ca8a5bc9fdab41de0bb795e389b726ecf1e68fd3 100644 (file)
@@ -74,7 +74,7 @@
 static DerivedMesh *navmesh_dm_createNavMeshForVisualization(DerivedMesh *dm);
 #endif
 
-#include "BLO_sys_types.h" /* for intptr_t support */
+#include "BLI_sys_types.h" /* for intptr_t support */
 
 #include "GL/glew.h"
 
index 6486c4c150bd7ad393137eea091b349f57e036e4..f3de4001dea4f44c2df923a94e9343e615b29ff2 100644 (file)
@@ -60,7 +60,7 @@
 #include "BKE_lattice.h"
 #include "BKE_modifier.h"
 
-#include "BLO_sys_types.h" // for intptr_t support
+#include "BLI_sys_types.h" // for intptr_t support
 
 static void boundbox_displist(Object *ob);
 static void boundbox_dispbase(BoundBox *bb, ListBase *dispbase);
index 9c265814b8f2e6eece146915d9d374fce4ff5246..8bda957f187ad911fe5e7bc7b212421f8ef7bafd 100644 (file)
@@ -49,7 +49,7 @@
 #include "BKE_icons.h"
 #include "BKE_global.h" /* only for G.background test */
 
-#include "BLO_sys_types.h" // for intptr_t support
+#include "BLI_sys_types.h" // for intptr_t support
 
 #include "GPU_extensions.h"
 
index 919738afe7a17110d109678599bba848cf449c2c..e28b1bf3f69eddf2a8d00bfd446c855c6510c2e6 100644 (file)
@@ -89,7 +89,7 @@
 
 #include "GPU_draw.h"
 
-#include "BLO_sys_types.h" // for intptr_t support
+#include "BLI_sys_types.h" // for intptr_t support
 
 /* for image user iteration */
 #include "DNA_node_types.h"
index 7a5bc33d323592827d36a6b7c57cba4eeb95366c..878651cdb395fc039226258bbe551305490b16ab 100644 (file)
@@ -35,7 +35,7 @@
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 
-#include "BLO_sys_types.h"
+#include "BLI_sys_types.h"
 
 #include "BLI_utildefines.h"
 #include "BLI_edgehash.h"
index 978c1a7c9b024f8833205f41136ceecf213c1edd..33a76d0c03d3251c5d5a656818b65389f53322a2 100644 (file)
@@ -28,7 +28,7 @@
 
 #include <stddef.h>
 
-#include "BLO_sys_types.h"  /* for intptr_t */
+#include "BLI_sys_types.h"  /* for intptr_t */
 
 #include "MEM_guardedalloc.h"
 
index 0708b2fed4d6ba8fdaaf8018b3bbe4a9089e5873..7bf21b79899c1e3ac5025c1da47488123737cbd6 100644 (file)
@@ -150,6 +150,7 @@ set(SRC
        BLI_string.h
        BLI_string_cursor_utf8.h
        BLI_string_utf8.h
+       BLI_sys_types.h
        BLI_threads.h
        BLI_utildefines.h
        BLI_uvproject.h
index b8e3d70ce99db8983d91c118c5876b24d5a592a6..749c008d8c3065fe67b4b09868a3801bbc2cd082 100644 (file)
 
 #include "MEM_guardedalloc.h"
 
+#include "BLI_sys_types.h"  /* for intptr_t support */
 #include "BLI_utildefines.h"
 #include "BLI_mempool.h"
 #include "BLI_ghash.h"
 
-#include "MEM_sys_types.h"  /* for intptr_t support */
 /***/
 
 #ifdef __GNUC__
index e3ed88b6f8d37d5050a80baaf5e8853d2d8e8b73..892d739601193ef3e7e8dcfd22dd897a7e408537 100644 (file)
@@ -24,7 +24,7 @@
  *  \ingroup bli
  */
 
-#include "MEM_sys_types.h"
+#include "BLI_sys_types.h"
 #include "BLI_utildefines.h"
 #include "BLI_endian_switch.h"
 
index 26e1ea13076cd41bc916873cbde9b5cba2fb7234..d4a8b800f1710f776fca27d91437757274f5f29f 100644 (file)
@@ -65,8 +65,7 @@
 #include "BLI_string.h"
 #include "BLI_path_util.h"
 #include "BLI_fileops.h"
-
-#include "MEM_sys_types.h" // for intptr_t support
+#include "BLI_sys_types.h" // for intptr_t support
 
 
 /* gzip the file in from and write it to "to". 
index 5b929195aea48b47932f34f182fa3b1346e17a62..7d5c8c339f47c69515780ffa005a218c0dc69fd0 100644 (file)
@@ -52,7 +52,6 @@ set(SRC
        BLO_blend_defs.h
        BLO_readfile.h
        BLO_runtime.h
-       BLO_sys_types.h
        BLO_undofile.h
        BLO_writefile.h
        intern/readfile.h
index 9678dffe5af11ca65d87963b14f2faeaf1f975ad..aec91dedf8fe2842b598a6cba17259a017301394 100644 (file)
@@ -63,7 +63,7 @@
 
 #include "readfile.h"
 
-#include "BLO_sys_types.h" // needed for intptr_t
+#include "BLI_sys_types.h" // needed for intptr_t
 
 #ifdef WIN32
 #  include "BLI_winstuff.h"
index 8b021f75f287a3b2a8759ea97356afc1441bb155..24daa41201de178d53a9db4813cd80e02084a762 100644 (file)
@@ -30,7 +30,6 @@ set(INC
        ../blenkernel
        ../blenlib
        ../blenfont
-       ../blenloader
        ../editors/include
        ../makesdna
        ../makesrna
index 38ffa471070982c22630a4489b03f5d7f1166072..1bd3947ff49920cca77270be02eef13523e2b929 100644 (file)
@@ -39,7 +39,6 @@ incs = [
     '../blenfont',
     '../blenkernel',
     '../windowmanager',
-    '../blenloader',
     '../makesdna',
     '../makesrna',
     '../editors/include',
index 4b058a41f713c8fb40f519128423c16750787d44..b3ec7c78808e1826bd00041075a9643d0a9df704 100644 (file)
@@ -31,7 +31,6 @@ set(INC
        ../blenkernel
        ../blenlib
        ../blenlib
-       ../blenloader
        ../imbuf
        ../makesdna
        ../makesrna
index df22d99f76d73f9913728bb932bdc4a5b931f59d..c0388438a98e684709c5310d7f506956f5d8a4c5 100644 (file)
@@ -38,7 +38,6 @@ incs = [
     '#/intern/opencl',
     '../blenkernel',
     '../blenlib',
-    '../blenloader',
     '../imbuf',
     '../makesdna',
     '../makesrna',
index 9e1e44e411de25f86844967949c4d3c33ec7e287..d6030a967d5f1f0ff833c84b46b39fc3675a03cf 100644 (file)
@@ -23,7 +23,6 @@ set(INC
        ../../blenfont
        ../../blenkernel
        ../../blenlib
-       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index e48e35e9e6967796b5d876c24ca67a9a7eb9979c..0f4fb71242bdae9d8e957aa0fd01877bd348487b 100644 (file)
@@ -36,7 +36,6 @@ incs = [
     '../../blenfont',
     '../../blenkernel',
     '../../blenlib',
-    '../../blenloader',
     '../../bmesh',
     '../../imbuf',
     '../../makesdna',
index 8299446bfdaab514cc1fffcf7eb8e2f2ad4b8619..12acc85e443d751698b2864de5e533d8bef95ad2 100644 (file)
@@ -28,7 +28,7 @@
  *  \ingroup edanimation
  */
 
-#include "BLO_sys_types.h"
+#include "BLI_sys_types.h"
 
 #include "DNA_anim_types.h"
 #include "DNA_object_types.h"
index b9a3daa4e51b2cb874cec2d161edb155b2d4c3fe..15a75c5775853e512f3dc755d757cda9efd7cb34 100644 (file)
@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #include <math.h>
 
-#include "BLO_sys_types.h"
+#include "BLI_sys_types.h"
 
 #include "BLI_utildefines.h"
 
index d9555108733746e24a166b2b8f38bc61e319734d..1a0841f5342c690c9af1110bf477d8c74fc8ec3a 100644 (file)
@@ -23,7 +23,6 @@ set(INC
        ../../blenfont
        ../../blenkernel
        ../../blenlib
-       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index 768f0834ae15da49c77d607c3d87df5ec2b98d8d..51345d94e60afdfb168179e96e63ece8aae98336 100644 (file)
@@ -37,7 +37,6 @@ incs = [
     '../../blenfont',
     '../../blenkernel',
     '../../blenlib',
-    '../../blenloader',
     '../../bmesh',
     '../../gpu',
     '../../imbuf',
index c38ded498309aed073be13aeda77a613c504af5c..4f34bd19b5bbeb1d130969292d2e42c3c53f7f39 100644 (file)
@@ -23,7 +23,6 @@ set(INC
        ../../blenfont
        ../../blenkernel
        ../../blenlib
-       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index a7d8b15da32ca9e8256dafd2f6309d6d1e28d8c2..de395a6cd4624eb0398dec9e9d7e1160a54783fc 100644 (file)
@@ -39,7 +39,6 @@ incs = [
     '../../blenfont',
     '../../blenkernel',
     '../../blenlib',
-    '../../blenloader',
     '../../bmesh',
     '../../gpu',
     '../../imbuf',
index 762db26bc4f189db73227035b9e405ddbb55ad7b..904ad4892edd321f3cfc918e62c7ba4aff42fcd4 100644 (file)
@@ -23,7 +23,6 @@ set(INC
        ../../blenfont
        ../../blenkernel
        ../../blenlib
-       ../../blenloader
        ../../imbuf
        ../../makesdna
        ../../makesrna
index 4ce9921bb0901b2bcd4bc778cb13f1febd214dc4..8b891fcb8cf4c2e57c8ca89b57a320d12f392c48 100644 (file)
@@ -37,7 +37,6 @@ incs = [
     '../../blenfont',
     '../../blenkernel',
     '../../blenlib',
-    '../../blenloader',
     '../../bmesh',
     '../../gpu',
     '../../imbuf',
index fae3416e00a65b600195ac038e4966aca6905224..50c348a015ff3255ebaad59f6fea07bba51be4df 100644 (file)
@@ -34,7 +34,7 @@
 #include <math.h>
 #include <float.h>
 
-#include "BLO_sys_types.h"
+#include "BLI_sys_types.h"
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
index 7055eb3ee1bd3304c3b3bcd7050863ced871b87d..75ff089593108b935ab21b52b1fcec40f7dbab64 100644 (file)
@@ -32,7 +32,7 @@
 #include <stddef.h>
 #include <stdio.h>
 
-#include "BLO_sys_types.h"
+#include "BLI_sys_types.h"
 
 #include "BLI_blenlib.h"
 
index ea05fc6166acef66fcc36d19ff95202d888ec58c..9da24f1980c1727c2305a8d6d4ad874d954b716e 100644 (file)
@@ -32,7 +32,7 @@
 #ifndef __UI_INTERFACE_H__
 #define __UI_INTERFACE_H__
 
-#include "BLO_sys_types.h" /* size_t */
+#include "BLI_sys_types.h" /* size_t */
 #include "RNA_types.h"
 #include "DNA_userdef_types.h"
 
index 8ba86673f87b4ac5c2b9d5dba5690edde2b42178..a8b8765a5c687ca200d07f5dbae95a08180a1276 100644 (file)
@@ -23,7 +23,6 @@ set(INC
        ../../blenfont
        ../../blenkernel
        ../../blenlib
-       ../../blenloader
        ../../gpu
        ../../imbuf
        ../../makesdna
index 734b95658844d21c9f6df78ef9784bc521ef8e17..0dc77ec5a3ecb0a650f30dbdc6ffe558975af8ec 100644 (file)
@@ -36,7 +36,6 @@ incs = [
     '../../blenfont',
     '../../blenkernel',
     '../../blenlib',
-    '../../blenloader',
     '../../bmesh',
     '../../gpu',
     '../../imbuf',
index d4ae5b8b29be1d9b1f409c1624f9eb1dc36d572d..f331dea5c5cc992173ba569d3971f235bc688560 100644 (file)
@@ -23,7 +23,6 @@ set(INC
        ../../blenfont
        ../../blenkernel
        ../../blenlib
-       ../../blenloader
        ../../bmesh
        ../../makesdna
        ../../makesrna
index 0a4b6f19a3e1c7a2dacb45ed1a0480bf68c93ae1..0facb24e2c3293d90ff2bf97c897e74868a45937 100644 (file)
@@ -36,7 +36,6 @@ incs = [
     '../../blenfont',
     '../../blenkernel',
     '../../blenlib',
-    '../../blenloader',
     '../../collada',
     '../../makesrna',
     '../../windowmanager',
index 25fb9cb64304f9fbb64ba17079b72299a533b776..b1cf6db314472c9127ab7cd1f41b43479c02b196 100644 (file)
@@ -24,7 +24,6 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
        ../../makesdna
        ../../makesrna
index 0db3208bbbadbc18d115d8914652a7c3e22a11f4..a80d3317c898b8c30fac135f7eee8cce5c6ada93 100644 (file)
@@ -37,7 +37,6 @@ incs = [
     '../include',
     '../../blenkernel',
     '../../blenlib',
-    '../../blenloader',
     '../../makesdna',
     '../../makesrna',
     '../../windowmanager',
index 4a4507acc307ecc98d03d6f7762f4367c555efdf..1fdf97bbbd3d5ba0bf2d8b30e5aa92d081f1886b 100644 (file)
@@ -24,7 +24,6 @@ set(INC
        ../../blenfont
        ../../blenkernel
        ../../blenlib
-       ../../blenloader
        ../../bmesh
        ../../gpu
        ../../imbuf
index fef3f00546f801a117b0f99f162bedfccaa91c43..e7ed3aae7d1456d7596bbdb78c2d8e7dcd4a1f07 100644 (file)
@@ -40,7 +40,6 @@ incs = [
     '../../blenfont',
     '../../blenkernel',
     '../../blenlib',
-    '../../blenloader',
     '../../bmesh',
     '../../gpu',
     '../../imbuf',
index 4ea596cefbfef22c289a1bba44de8063cac26406..0f9de8dbf87a2d7eb0c122f8c06204ae6b513ad1 100644 (file)
@@ -22,7 +22,6 @@ set(INC
        ../include
        ../../blenkernel
        ../../blenlib
-       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../render/extern/include
index 2ee2f1d1bd86bcd0dc576310db453982890950fa..fb82cb032c8893c45297532a00388d88d95a67ef 100644 (file)
@@ -36,7 +36,6 @@ incs = [
     '../include',
     '../../blenkernel',
     '../../blenlib',
-    '../../blenloader',
     '../../gpu',
     '../../imbuf',
     '../../makesdna',
index a92b25c6c858397d7f35f56d9908c05bf2024671..3e7aeba63c3bee2341fa85f46b87e78dc04fb506 100644 (file)
@@ -23,7 +23,6 @@ set(INC
        ../../blenfont
        ../../blenkernel
        ../../blenlib
-       ../../blenloader
        ../../bmesh
        ../../gpu
        ../../ikplugin
index a46fd04489dc1519b6f3a32bb56169d2c28d8d70..db30fae1f842608019dfa53e5dace4d655ad4145 100644 (file)
@@ -36,7 +36,6 @@ incs = [
     '../../blenfont',
     '../../blenkernel',
     '../../blenlib',
-    '../../blenloader',
     '../../bmesh',
     '../../gpu',
     '../../ikplugin',
index 543b003f5a557d8c683fd38b6da2f548b2eb3876..2008e5ad4f37850f1b15606a023d9c0348f62456 100644 (file)
@@ -59,7 +59,7 @@
 #include "BKE_object.h"
 #include "BKE_curve.h"
 
-#include "BLO_sys_types.h" // for intptr_t support
+#include "BLI_sys_types.h" // for intptr_t support
 
 #include "ED_object.h"
 #include "ED_mesh.h"
index 3701598f87ff0b038bd707142c7fa625ef25e2ad..892d71befb491385c8603f0a5714d0efdb5e6302 100644 (file)
@@ -23,7 +23,6 @@ set(INC
        ../../blenfont
        ../../blenkernel
        ../../blenlib
-       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index 59a54f4ab05a83be511c2a4aad3382a08b2c3592..0fda34a86b1b5745f2676fab3dcb9a760ea24b79 100644 (file)
@@ -38,7 +38,6 @@ incs = [
     '../../blenfont',
     '../../blenkernel',
     '../../blenlib',
-    '../../blenloader',
     '../../bmesh',
     '../../gpu',
     '../../imbuf',
index c9c4c253e28ae605c563af4d1bbc86a4023583e9..4ff1767f5821927d1e00cf262e651660e6e7f7fd 100644 (file)
@@ -23,7 +23,6 @@ set(INC
        ../../blenfont
        ../../blenkernel
        ../../blenlib
-       ../../blenloader
        ../../bmesh
        ../../gpu
        ../../imbuf
index 506933042c6f56e423b9219b841c447cfc3ce7e6..affa28863c9579dc8cf142348462d39b2ec01396 100644 (file)
@@ -36,7 +36,6 @@ incs = [
     '../../blenfont',
     '../../blenkernel',
     '../../blenlib',
-    '../../blenloader',
     '../../bmesh',
     '../../gpu',
     '../../imbuf',
index 0899fb97a2a1357e10e7b36b3144be3f2c54d3f4..9b46a07b60e5545d9f4ddd5916fe16a3e9afd5e7 100644 (file)
@@ -24,7 +24,6 @@ set(INC
        ../../blenkernel
        ../../blenlib
        ../../blenfont
-       ../../blenloader
        ../../bmesh
        ../../gpu
        ../../imbuf
index b2e936058a0f48ebd055ec17a224ee62889dac2d..b0118fbbf53c3d3ee780900f183ece1fa782b4eb 100644 (file)
@@ -39,7 +39,6 @@ incs = [
     '../../blenfont',
     '../../blenkernel',
     '../../blenlib',
-    '../../blenloader',
     '../../bmesh',
     '../../gpu',
     '../../imbuf',
index 29acc28df47f2b12d0f31efc189498a7ebf552e5..4670a8294f65372e9666a04414769a4f899e3133 100644 (file)
@@ -63,7 +63,7 @@
 #include "ED_view3d.h"
 #include "ED_screen.h"
 
-#include "BLO_sys_types.h"
+#include "BLI_sys_types.h"
 #include "ED_mesh.h" /* for face mask functions */
 
 #include "WM_api.h"
index 6bbb3483d11029d4902f47da346a4b78de7c22ff..245ee657bc32cdf759f68d8c432453df5ef5a45f 100644 (file)
@@ -22,7 +22,6 @@ set(INC
        ../include
        ../../blenkernel
        ../../blenlib
-       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index 67bc799dd6fb3c1689a6a45ad19fb59144642fe9..016f8055da05f701b5503c59be87a8b8ca787852 100644 (file)
@@ -35,7 +35,6 @@ incs = [
     '../include',
     '../../blenkernel',
     '../../blenlib',
-    '../../blenloader',
     '../../imbuf',
     '../../makesdna',
     '../../makesrna',
index f53d26d323f9f813611d5799d05095251c7ef7a8..e0dc2709cf34d5340cbeaece5e6c96236c4f4549 100644 (file)
@@ -22,7 +22,6 @@ set(INC
        ../include
        ../../blenkernel
        ../../blenlib
-       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index 579d3604382aa6e703f0b3bfcf502baf088924bd..0421c4cc3ee366ae863a7af93ad38ce7c2c01e6a 100644 (file)
@@ -35,7 +35,6 @@ incs = [
     '../include',
     '../../blenkernel',
     '../../blenlib',
-    '../../blenloader',
     '../../imbuf',
     '../../makesdna',
     '../../makesrna',
index 0abdd1340461e5f3a13ce1713c5f4c1cc621e34b..3932924a521d477264676636440c2843dcb087d1 100644 (file)
@@ -23,7 +23,6 @@ set(INC
        ../io
        ../../blenkernel
        ../../blenlib
-       ../../blenloader
        ../../bmesh
        ../../makesdna
        ../../makesrna
index b7d8342f6fa41a6339a6d09e6f56d46ad27ee799..bd0f490a56dad70939d4356f8a64abfa8e9d5e51 100644 (file)
@@ -36,7 +36,6 @@ incs = [
     '../io',
     '../../blenkernel',
     '../../blenlib',
-    '../../blenloader',
     '../../bmesh',
     '../../makesdna',
     '../../makesrna',
index 10080c6259449a45ac939a72ebf643cf8d701a0a..b20301cfc3b4ea1e93f0db34e3c1475405a135b7 100644 (file)
@@ -23,7 +23,6 @@ set(INC
        ../../blenfont
        ../../blenkernel
        ../../blenlib
-       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index 764ed4b1388be7838b3454c610f3dd13f3b0cab4..61f9b6f496e8b3278fb091bf889ec57538457bbb 100644 (file)
@@ -36,7 +36,6 @@ incs = [
     '../../blenfont',
     '../../blenkernel',
     '../../blenlib',
-    '../../blenloader',
     '../../bmesh',
     '../../imbuf',
     '../../makesdna',
index e09a8b41262c0b50e519aed411fdc309f2532e6a..7689aa281692f2fb6c1a17f0a5b0291132b02aa9 100644 (file)
@@ -24,7 +24,6 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenfont
        ../../blenlib
        ../../imbuf
index b200be0fd91309525578f2ccbe183319ce5a90ed..d4483eda6e396f832433bf4145d47a3ab7eec493 100644 (file)
@@ -36,7 +36,6 @@ incs = [
     '../../blenfont',
     '../../blenkernel',
     '../../blenlib',
-    '../../blenloader',
     '../../gpu',
     '../../imbuf',
     '../../makesdna',
index 2f1c3f4a24492636f3321a14d2a6a1a9d6fedb5b..241a48c1e2dab3cb07c282c9e82fbd2c73641aae 100644 (file)
@@ -23,7 +23,6 @@ set(INC
        ../../blenfont
        ../../blenkernel
        ../../blenlib
-       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index 5af5818b2206a240aada1576524d5c5d209ca164..0395a33cd97a1271a22564903f142dbe01149644 100644 (file)
@@ -40,7 +40,6 @@ incs = [
     '../../blenlib',
     '../../windowmanager',
     '../../blenfont',
-    '../../blenloader',
     ]
 
 if env['WITH_BF_PYTHON']:
index 5b39604809ce036df7125e61c2c9f888f93670f1..d3fb87204fbfc8006f67c438680b0098acf84a6b 100644 (file)
@@ -23,7 +23,6 @@ set(INC
        ../../blenfont
        ../../blenkernel
        ../../blenlib
-       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index 2eab8c31dc50b5b983423e65eb5e457a5399fe13..8ddeb0ccfe848ec3dd40b3e4e21ee8bbafb31727 100644 (file)
@@ -37,7 +37,6 @@ incs = [
     '../../blenfont',
     '../../blenkernel',
     '../../blenlib',
-    '../../blenloader',
     '../../imbuf',
     '../../makesdna',
     '../../makesrna',
index 3e3c6adcf8c8f31b3a12affb7fdc59557f9c8859..6509af179e76d383f646e5c6fc5513de054788b9 100644 (file)
@@ -23,7 +23,6 @@ set(INC
        ../../blenfont
        ../../blenkernel
        ../../blenlib
-       ../../blenloader
        ../../imbuf
        ../../bmesh
        ../../makesdna
index 1a60061fd11810fc482ef69b06feb082d9fd961c..268172b300da270c16f851edf3e645c8a6e56cbc 100644 (file)
@@ -36,7 +36,6 @@ incs = [
     '../../blenfont',
     '../../blenkernel',
     '../../blenlib',
-    '../../blenloader',
     '../../bmesh',
     '../../imbuf',
     '../../makesdna',
index 13e6f9484e821507a059ccf43bfc5bfe84cc0a9f..af2e847651186993fb16f00f98d6922cadc8aafa 100644 (file)
@@ -24,7 +24,6 @@ set(INC
        ../../blenfont
        ../../blenkernel
        ../../blenlib
-       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index f5ac244d50f1594775be3da25d52f34d27746b43..ae8e929a6846a1373f4ba2b3de0b39f907e6d8a8 100644 (file)
@@ -37,7 +37,6 @@ incs = [
     '../../blenfont',
     '../../blenkernel',
     '../../blenlib',
-    '../../blenloader',
     '../../imbuf',
     '../../makesdna',
     '../../makesrna',
index aa3598e8e1f5979c69095caa1853a474152354ae..a74fc3191b781b8f68c736d65456c1f3895a0668 100644 (file)
@@ -23,7 +23,6 @@ set(INC
        ../../blenfont
        ../../blenkernel
        ../../blenlib
-       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index ae82e451c7f4cff9789894f09d096ebc89b2476e..a3063dae94642d5151bc882da525f36111af6ba6 100644 (file)
@@ -36,7 +36,6 @@ incs = [
     '../../blenfont',
     '../../blenkernel',
     '../../blenlib',
-    '../../blenloader',
     '../../imbuf',
     '../../makesdna',
     '../../makesrna',
index ed37a4c97c7799164979d8fa66acf66bf9da9aea..30c7b5de2f1ed9f1043ad2c316276e6ccc6981b8 100644 (file)
@@ -23,7 +23,6 @@ set(INC
        ../../blenfont
        ../../blenkernel
        ../../blenlib
-       ../../blenloader
        ../../imbuf
        ../../gpu
        ../../makesdna
index 3f69260b25d0a308aee214aa0e52d0bcfb91b3a0..94756b96035231415262533147ff10fc825e693b 100644 (file)
@@ -36,7 +36,6 @@ incs = [
     '../../blenfont',
     '../../blenkernel',
     '../../blenlib',
-    '../../blenloader',
     '../../compositor',
     '../../gpu',
     '../../imbuf',
index 5a7bbc21934ca396082c2fffee8fdb84a302832a..26fe2edd0d16c7ea1b121edd5e6a9a7901193671 100644 (file)
@@ -23,7 +23,6 @@ set(INC
        ../../blenkernel
        ../../blenlib
        ../../blenfont
-       ../../blenloader
        ../../imbuf
        ../../makesdna
        ../../makesrna
index e3c87bd7b8cc4eebd634ef6b2368072335a85efd..db8041f0235b9d7f42391c5ae5ac808a1ec90886 100644 (file)
@@ -37,7 +37,6 @@ incs = [
     '../../blenfont',
     '../../blenkernel',
     '../../blenlib',
-    '../../blenloader',
     '../../imbuf',
     '../../makesdna',
     '../../makesrna',
index 00f8df299e2d2e8f4333dcf2a711bdc9939e54da..7aa07f4e022bdcf982b85b3eb5d3a1324cfc4eec 100644 (file)
@@ -22,7 +22,6 @@ set(INC
        ../include
        ../../blenkernel
        ../../blenlib
-       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index e51838aa124035a08ddd20b06d660c7ce4e3662e..acb0bf9f20b397cdfd13b036ec83e7932745398b 100644 (file)
@@ -35,7 +35,6 @@ incs = [
     '../include',
     '../../blenkernel',
     '../../blenlib',
-    '../../blenloader',
     '../../imbuf',
     '../../makesdna',
     '../../makesrna',
index f108d9f1aaa081a1a5f7a673ac2c1f4ad4de446c..db5729a5762b3e5eadfb324ecb91fb737a6d91a6 100644 (file)
@@ -23,7 +23,6 @@ set(INC
        ../../blenfont
        ../../blenkernel
        ../../blenlib
-       ../../blenloader
        ../../imbuf
        ../../makesdna
        ../../makesrna
index 3103754bb4f39ba128ba44866c0f3d3e5a8b4d74..5aae30244a757e29ceab59a1503eae22fbc6da97 100644 (file)
@@ -37,7 +37,6 @@ incs = [
     '../../blenfont',
     '../../blenkernel',
     '../../blenlib',
-    '../../blenloader',
     '../../imbuf',
     '../../makesdna',
     '../../makesrna',
index 1a6b8eaa753690b81fb91245a0ff060d49ec2758..d848ce33503991f278996665ed8a97e6ede5118b 100644 (file)
@@ -23,7 +23,6 @@ set(INC
        ../../blenfont
        ../../blenkernel
        ../../blenlib
-       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index 51ce313180077b79081fa71dafddcf776d213381..3f617f95c586024c291dfc1056186f76d4d1d74f 100644 (file)
@@ -36,7 +36,6 @@ incs = [
     '../../blenfont',
     '../../blenkernel',
     '../../blenlib',
-    '../../blenloader',
     '../../imbuf',
     '../../makesdna',
     '../../makesrna',
index 6e51d7829f6b00e064aa8ef78dfd22b23d1d8179..b42ae3ab725f5df47ca4ff40dc453b0cda655898 100644 (file)
@@ -22,7 +22,6 @@ set(INC
        ../include
        ../../blenkernel
        ../../blenlib
-       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index da0c371385152b02b047c21b39feacbda587e0f9..fb09fe2c11b93cfca65ed7ded742d360e8ac52d4 100644 (file)
@@ -35,7 +35,6 @@ incs = [
     '../include',
     '../../blenkernel',
     '../../blenlib',
-    '../../blenloader',
     '../../imbuf',
     '../../makesdna',
     '../../makesrna',
index 2ff683a007cc8db04049a05218a0e078c03bb3b2..bd82ef13cd7386949dd0423235be5611d7ef426f 100644 (file)
@@ -22,7 +22,6 @@ set(INC
        ../include
        ../../blenkernel
        ../../blenlib
-       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index e495085f658319cd0ec27bd480b24a68e5c4193d..ce2e83f7b33777fe0c5ac23163d487030b8672ff 100644 (file)
@@ -36,7 +36,6 @@ incs = [
     '../../blenfont',
     '../../blenkernel',
     '../../blenlib',
-    '../../blenloader',
     '../../imbuf',
     '../../makesdna',
     '../../makesrna',
index a04371a5ed92095c1fddfd625f50c6bf19a03341..7d5cff6a2d0ce5679d9ce54b5618b4c03c607a8f 100644 (file)
@@ -23,7 +23,6 @@ set(INC
        ../../blenfont
        ../../blenkernel
        ../../blenlib
-       ../../blenloader
        ../../bmesh
        ../../gpu
        ../../imbuf
index 313711d4e912d14c6e8fd5a1663269661bfebb1e..e73aa2db49ed90e62f34f0980e4c114f260fbab1 100644 (file)
@@ -39,7 +39,6 @@ incs = [
     '../../blenfont',
     '../../blenkernel',
     '../../blenlib',
-    '../../blenloader',
     '../../bmesh',
     '../../gpu',
     '../../imbuf',
index 57864854734fde829de0263ae0bc0ab78eec6896..902a9976f4803f47ecb751fc6c8c860b8736d981 100644 (file)
@@ -34,7 +34,7 @@
 #include <string.h>
 #include <math.h>
 
-#include "BLO_sys_types.h"
+#include "BLI_sys_types.h"
 
 #include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
index 6a0701331cc0ff295805593693c0a2df43aa1be4..974006d45dbafc108f1a0b6fa9c995e996b3e259 100644 (file)
@@ -33,7 +33,7 @@
 #include "DNA_scene_types.h"
 #include "DNA_view3d_types.h"
 
-#include "BLO_sys_types.h"  /* int64_t */
+#include "BLI_sys_types.h"  /* int64_t */
 
 #include "BIF_gl.h"  /* bglMats */
 #include "BIF_glutil.h"  /* bglMats */
index ec114bc30197692288b3ae1a93173098e5387319..7765dd511b436fcfab53304ee233803699e72cdc 100644 (file)
@@ -23,7 +23,6 @@ set(INC
        ../../blenfont
        ../../blenkernel
        ../../blenlib
-       ../../blenloader
        ../../bmesh
        ../../ikplugin
        ../../makesdna
index 2f0823955ba89d3c0b8a44763202695bf161689e..eeefcedd014c4ecb47ea2ce16552e069319dbb80 100644 (file)
@@ -36,7 +36,6 @@ incs = [
     '../../blenfont',
     '../../blenkernel',
     '../../blenlib',
-    '../../blenloader',
     '../../bmesh',
     '../../gpu',
     '../../ikplugin',
index d6b12e05b440eb388eabd5fd2a292ff54b38f912..2c548d330c0ead191dab130ca0bdb0635a5959c8 100644 (file)
 #include "transform.h"
 #include "bmesh.h"
 
-#include "BLO_sys_types.h" // for intptr_t support
+#include "BLI_sys_types.h" // for intptr_t support
 
 
 /* local function prototype - for Object/Bone Constraints */
index ad1661f6e363f9cdf6e15bbb69397c5a4a60ac23..abd19bc3121f2cf41bd0efce4e378c3cdb3ff657 100644 (file)
@@ -34,7 +34,7 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLO_sys_types.h" /* for intptr_t support */
+#include "BLI_sys_types.h" /* for intptr_t support */
 
 #include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
index bcc55c4ea6eae337b92b99a37b97e8c5092704f1..ea5e806647fd05a91119c32ebbaad353a277b37a 100644 (file)
@@ -23,7 +23,6 @@ set(INC
        ../../blenfont
        ../../blenkernel
        ../../blenlib
-       ../../blenloader
        ../../bmesh
        ../../makesdna
        ../../makesrna
index 521854ad21b24a8bdb4b288c49f9a646d8206c2d..120ffc69bc8f0b96aab246c70962364abf9f87ff 100644 (file)
@@ -37,7 +37,6 @@ incs = [
     '../../blenfont',
     '../../blenkernel',
     '../../blenlib',
-    '../../blenloader',
     '../../bmesh',
     '../../imbuf',
     '../../makesdna',
index 695a7cdd0f6cf8b8afd6fcb8107de1acb4a47c56..62d4b01cab765d0de7bb4394413ef3bdc89b1bad 100644 (file)
@@ -23,7 +23,6 @@ set(INC
        ../../blenkernel
        ../../blenlib
        ../../blenfont
-       ../../blenloader
        ../../bmesh
        ../../makesdna
        ../../makesrna
index 51e473bc5bac749bee051dd44b22c985ef47a66a..8b1cbd06f2c09a514086bdc02c4af3bbb23a8e14 100644 (file)
@@ -39,7 +39,6 @@ incs = [
     '../../blenfont',
     '../../blenkernel',
     '../../blenlib',
-    '../../blenloader',
     '../../bmesh',
     '../../gpu',
     '../../imbuf',
index 961893aebeddc254a995a36b2ca06e20b6ddccfa..6f92c1873d6f9f6752a9e04bcc92c91e88714702 100644 (file)
@@ -46,7 +46,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "BLO_sys_types.h"  /* for intptr_t support */
+#include "BLI_sys_types.h"  /* for intptr_t support */
 
 /* Utils */
 
index dc2fd34e4042eb0695c81809ddf0b7c45150b6c6..7127a43657012863532ffba4eea72815225e852e 100644 (file)
@@ -31,7 +31,7 @@
 extern "C" {
 #endif
        
-#include "BLO_sys_types.h" // for intptr_t support
+#include "BLI_sys_types.h" // for intptr_t support
 
 typedef void ParamHandle;      /* handle to a set of charts */
 typedef intptr_t ParamKey;             /* (hash) key for identifying verts and faces */
index 71bdb6aaf9ead10c9be4c71565f00c353f96c785..7ce09aa68822f2e6f04438ae03cf95ac0f3c55f1 100644 (file)
 file(GLOB_RECURSE SRC *.cpp *.h)
 
 set(INC 
-  ../blenkernel ../blenloader ../blenlib ../imbuf ../makesdna ../makesrna
-  ../python ../python/intern ../render/extern/include ../render/intern/include
-  ../../../extern/glew/include ../../../intern/guardedalloc ../freestyle
+  ../blenkernel
+  ../blenlib
+  ../freestyle
+  ../imbuf
+  ../makesdna
+  ../makesrna
+  ../python
+  ../python/intern
+  ../render/extern/include
+  ../render/intern/include
+  ../../../extern/glew/include
+  ../../../intern/guardedalloc
 )
 
 set(INC_SYS
index eb38b69278ecdd0a450ceb57ec0171bf86ba9f12..909165529a8f8ff55f1e06806aa8667226127d8b 100644 (file)
@@ -9,7 +9,6 @@ incs = [
     '#/extern/glew/include',
     '../blenkernel',
     '../blenlib',
-    '../blenloader',
     '../freestyle',
     '../imbuf',
     '../makesdna',
index 485f5d65853fb7d3fb8417dd4bd21a162ab84a1b..93c80c68f24cb4a0fec3dd85d5f5efb984c2a970 100644 (file)
@@ -27,7 +27,6 @@ set(INC
        .
        ../blenkernel
        ../blenlib
-       ../blenloader
        ../bmesh
        ../imbuf
        ../makesdna
index be3d3f5a92713c37e89aea8f7db6753a489fc6af..c1c3fa92cb1cef6ac9f0138cdcc3abc555d75290 100644 (file)
@@ -39,7 +39,6 @@ incs = [
     '#/extern/glew/include',
     '../blenkernel',
     '../blenlib',
-    '../blenloader',
     '../bmesh',
     '../imbuf',
     '../include',
index 3b678624eeadabc0e19d338f029066e006a8f225..39cae4f01ce551962b1bd29451c1c87a92446596 100644 (file)
@@ -47,7 +47,7 @@
 #include "GPU_material.h"
 #include "GPU_extensions.h"
 
-#include "BLO_sys_types.h" // for intptr_t support
+#include "BLI_sys_types.h" // for intptr_t support
 
 #include "gpu_codegen.h"
 
index b94cfd22058b8857317193fb87dcbd6b69bdceb8..0028cdb47014ef13c1d473d569dabbbafead893d 100644 (file)
@@ -29,7 +29,6 @@ set(INC
        ../..
        ../../../blenkernel
        ../../../blenlib
-       ../../../blenloader
        ../../../makesdna
        ../../../../../intern/guardedalloc
 )
index d8fc25020810ca9df8dcc9fb8fbf6dcdd58d48b9..037a7fec1bc1108ecbe692797094a4ce4fb40065 100644 (file)
@@ -31,7 +31,6 @@ source_files = env.Glob('*.c')
 
 incs = ['.',
     '../../../blenkernel',
-    '../../../blenloader',
     '../../',
     '..',
     '../../../blenlib',
index 7c75f8b730bbc1f698b551094faf7c20e47ec543..6b1435817d2237b22911e5e96428b3f99d0a6d6b 100644 (file)
@@ -35,7 +35,7 @@
 
 #include <stdio.h>
 
-#include "BLO_sys_types.h"
+#include "BLI_sys_types.h"
 #include "BLI_utildefines.h"
 
 #ifdef __cplusplus
index 8d0ae8139a1fb1c899c06c85fe0bad461a46cc36..892c49bc5d2bf6e3284015fc19e65d24eff3c9b9 100644 (file)
@@ -23,7 +23,7 @@
 #ifndef __FLIPDXT_H__
 #define __FLIPDXT_H__
 
-#include "MEM_sys_types.h"
+#include "BLI_sys_types.h"
 
 /* flip compressed DXT image vertically to fit OpenGL convention */
 int FlipDXTCImage(unsigned int width, unsigned int height, unsigned int levels, int fourcc, uint8_t *data);
index 553a530ecf4ba507b23289a4df112627dc5bc3b7..2ae05315c85fc32a181982ad7e3d896fd90fbb18 100644 (file)
@@ -44,7 +44,7 @@
 #include "IMB_allocimbuf.h"
 #include "IMB_filter.h"
 
-#include "BLO_sys_types.h" // for intptr_t support
+#include "BLI_sys_types.h" // for intptr_t support
 
 /************************************************************************/
 /*                                                             SCALING                                                                 */
index ffe4fc970b10dbc3dd1ed24ff79742f255303cef..842543da174ac1e533974f90683fb43524835a80 100644 (file)
@@ -45,7 +45,7 @@
 #endif
 
 /* hrmf, we need a better include then this */
-#include "../blenloader/BLO_sys_types.h" /* needed for int64_t only! */
+#include "../blenlib/BLI_sys_types.h" /* needed for int64_t only! */
 
 /* non-id name variables should use this length */
 #define MAX_NAME 64
index 0bd53ec8765d41a98c390239c1bd19c950f9e123..70c79fa393ca134d864396609bec1a897cece0b1 100644 (file)
@@ -29,7 +29,6 @@ add_definitions(-DWITH_DNA_GHASH)
 
 blender_include_dirs(
        ../../../../intern/guardedalloc
-       ../../blenloader
        ../../blenlib
        ..
 )
index 3dada5f0a44a375b81836a772e42c50db477bd13..c0db40dcfd2e9c2b40741fe669671cea1f25f6f7 100644 (file)
@@ -46,7 +46,7 @@ dna = env.Clone()
 makesdna_tool.Append(CCFLAGS = '-DBASE_HEADER="\\"source/blender/makesdna/\\"" ')
 
 makesdna_tool.Append (CPPPATH = ['#/intern/guardedalloc',
-                                 '../../makesdna', '../../blenloader', '../../bmesh'])
+                                 '../../makesdna', '../../bmesh'])
 
 if env['OURPLATFORM'] == 'linuxcross':
     USE_WINE = True # when cross compiling on linux 64bit this is useful
index da1811656a6376ba8e20744ba9b89f03c027f004..29c977bfe6480a43d5b3554765d390d7aba1cfed 100644 (file)
@@ -55,7 +55,7 @@
 #include "MEM_guardedalloc.h"
 #include "DNA_sdna_types.h"
 
-#include "BLO_sys_types.h" // for intptr_t support
+#include "../blenlib/BLI_sys_types.h" // for intptr_t support
 
 #define SDNA_MAX_FILENAME_LENGTH 255
 
index db0d122df8de97d756ebcb1e963d524ef7781535..69cb2caf058117a0f6c1e8f29444233095ace24c 100644 (file)
@@ -25,7 +25,7 @@
  */
 
 
-#include "BLO_sys_types.h"
+#include "../blenlib/BLI_sys_types.h"
 
 #ifndef __RNA_TYPES_H__
 #define __RNA_TYPES_H__
index 9410bced37bca459a83325ee1ed83dbd0d394136..3b322491559b9f1a17af6c09e93dbd014d4b63e9 100644 (file)
@@ -44,7 +44,6 @@ incs = [
     '../blenfont',
     '../blenkernel',
     '../blenlib',
-    '../blenloader',
     '../bmesh',
     '../editors/include',
     '../gpu',
index 2e0eacf90e575b1ffe3fdac19f68ce675e1a9cb4..11a4dcfab8aa3c5744ffff94be729cd4e39e6307 100644 (file)
@@ -257,7 +257,6 @@ blender_include_dirs(
        .
        ..
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
        ../../bmesh
        ../../blenfont
index 316c3fde5d5f2d1f68d23459117c6573a9b05750..49528db00225c3ec4703cebf20de8316904e83d1 100644 (file)
@@ -66,7 +66,6 @@ incs = [
     '../../blenfont',
     '../../blenkernel',
     '../../blenlib',
-    '../../blenloader',
     '../../bmesh',
     '../../editors/include',
     '../../ikplugin',
index 3b0936a383004152191c6b481857dd8a9d407e33..696ee8cbfa0dbaea824e87fb7e1141d41f34ce38 100644 (file)
@@ -34,7 +34,7 @@
 
 #include "RNA_define.h"
 
-#include "BLO_sys_types.h"
+#include "BLI_sys_types.h"
 
 #include "BLI_utildefines.h"
 
index 500e202b16f42f31ab0f3bdba5803327c0074cce..abf3de02aa0a34ca5b5274653f5afee1d7988f0b 100644 (file)
@@ -34,7 +34,7 @@
 
 #include "RNA_define.h"
 
-#include "BLO_sys_types.h"
+#include "BLI_sys_types.h"
 
 #include "BLI_utildefines.h"
 
index c6ce185d9f3cc934030964885e16a15c7b8f32c2..eab13ae41651e791d3292263dfa13406acf2bb1b 100644 (file)
@@ -51,7 +51,7 @@
 
 #include "rna_internal.h"
 
-#include "BLO_sys_types.h" /* needed for intptr_t used in ED_mesh.h */
+#include "BLI_sys_types.h" /* needed for intptr_t used in ED_mesh.h */
 #include "ED_mesh.h"
 
 #include "WM_api.h"
index 29d7c616d25d0da59c6f32c7815130e3b8b3a79d..465a86adc3159daed998b2564d5a9637d152f346 100644 (file)
@@ -40,7 +40,7 @@
 
 #include "DNA_object_types.h"
 
-/* #include "BLO_sys_types.h" */
+/* #include "BLI_sys_types.h" */
 
 #include "rna_internal.h"  /* own include */
 
index 72d9e320eb48b172a54fc925fa77dd681a977d9d..25854ceb2e5197587423b30171a5a35729e8e9a4 100644 (file)
@@ -30,7 +30,6 @@ set(INC
        ../blenkernel
        ../blenlib
        ../blenfont
-       ../blenloader
        ../makesdna
        ../makesrna
        ../bmesh
index 92e859a62361e437ec4c8cd911e15bf7fbed0e3a..86e1970ab6b35331dca0d201a99c3d427b371eef 100644 (file)
@@ -38,7 +38,6 @@ incs = [
     '#/extern/glew/include',
     '#/intern/opennl/extern',
     '../render/extern/include',
-    '../blenloader',
     '../bmesh',
     '../include',
     '../blenlib',
index e001855ba0b608cc7977d46e3f6618db1f513389..0cbf07ca90720f889d7c0a46126c0f8e65b81420 100644 (file)
@@ -28,7 +28,7 @@
 #include <string.h>
 #include <errno.h>
 
-#include "BLO_sys_types.h"
+#include "BLI_sys_types.h"
 #include "BLI_utildefines.h"
 #include "BLI_endian_switch.h"
 #include "BLI_fileops.h"
index b20f62a8e77b7195476ec969a771557c98cdaf44..1897454e1321747c3562b138f94e0582b09ae31b 100644 (file)
@@ -28,7 +28,7 @@
 #include <string.h>
 #include <errno.h>
 
-#include "BLO_sys_types.h"
+#include "BLI_sys_types.h"
 #include "BLI_utildefines.h"
 #include "BLI_endian_switch.h"
 #include "BLI_fileops.h"
index 5615dfc682b6c5f6efbdbee3981bb1980004a9eb..59f25326edb57b0ad45121f3ffb2357eb41417ea 100644 (file)
@@ -32,7 +32,6 @@ set(INC
        ../blenfont
        ../blenkernel
        ../blenlib
-       ../blenloader
        ../gpu
        ../imbuf
        ../makesdna
index fd4ed027f2133ae4eb37fd0c8d95d2d4c7704d09..edb9c09412195fee0a938255d18ea4cba3c8a9aa 100644 (file)
@@ -44,7 +44,6 @@ incs = [
     '../blenfont',
     '../blenkernel',
     '../blenlib',
-    '../blenloader',
     '../editors/include',
     '../gpu',
     '../imbuf',
index eb8bd694231439d0c65dc3eaadf49ebbc5f2a64d..2492de525886506369694e12e69a5c538b3a3372 100644 (file)
@@ -22,7 +22,6 @@ set(INC
        .
        ../../blenkernel
        ../../blenlib
-       ../../blenloader
        ../../makesdna
        ../../../../intern/guardedalloc
 )
index e8f8fa51a0af2950ca3547c73b467cf6ef3adc4c..0c5c4d8a9f12d356e76ee446ee486d6c1c7b3ad0 100644 (file)
@@ -28,7 +28,6 @@ set(INC
        ../avi
        ../blenkernel
        ../blenlib
-       ../blenloader
        ../imbuf
        ../imbuf/intern
        ../makesdna
index a32f325de24a3a0bca19a8506200a45a6dd9e99a..a6debf0622645f7bad58c7e74eaaae8d1aae4705 100644 (file)
@@ -47,7 +47,6 @@ incs  = ['.',
          '../avi',
          '../imbuf',
          '../imbuf/intern',
-         '../blenloader',
          '../render/extern/include',
          '../editors/include',
          '#/intern/audaspace/intern']
index 1aff682eef804d58329aedb72af884a4c1eae567..7b42c89d936160c604b8e197c9519b5e6a46e339 100644 (file)
@@ -46,7 +46,7 @@
 
 #include "BLI_blenlib.h"
 
-#include "BLO_sys_types.h"
+#include "BLI_sys_types.h"
 
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
index 2706895571f511280a7e8c48ca184bb3f3e4bb29..bee26c5348e6cfb0e10f27b56b25e08e5892864c 100644 (file)
@@ -29,7 +29,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "IMB_anim.h"
-#include "BLO_sys_types.h"
+#include "BLI_sys_types.h"
 #include "BLI_utildefines.h"
 #include "BKE_global.h"
 
index 5e114bf7379074b61a2d7d9b64d7a062c5fee117..ce4f3063082d0442aca55129f210d3f507634438 100644 (file)
@@ -47,7 +47,7 @@
 
 #include "BLI_blenlib.h"
 
-#include "BLO_sys_types.h"
+#include "BLI_sys_types.h"
 
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
index 7fb14e5da092917a4e9260dd4ae42b33cbf63a26..511b62d856a07ba2e8c5c6daa3b95abe92471daa 100644 (file)
@@ -36,7 +36,7 @@
 
 #include "MEM_guardedalloc.h"
 #include "IMB_anim.h"
-#include "BLO_sys_types.h"
+#include "BLI_sys_types.h"
 #include "BKE_global.h"
 #include "BLI_dynstr.h"
 #include "BLI_path_util.h"
index 4f1d0d234fcb3afb85d7c468615934ad8d9f46d1..a907384e19eba7730f157761b3850056f587b0d2 100644 (file)
@@ -30,7 +30,6 @@ set(INC
        ../blenfont
        ../blenkernel
        ../blenlib
-       ../blenloader
        ../imbuf
        ../makesdna
        ../makesrna
index 4303a51f9836c7fe593c7115710cf7f333d7e77e..ef5c5066426a1f8a0ef9f653004538175f9645d5 100644 (file)
@@ -37,7 +37,6 @@ incs = [
     '../blenfont',
     '../blenkernel',
     '../blenlib',
-    '../blenloader',
     '../bmesh',
     '../imbuf',
     '../include',
index b7b0f18b85376c695d7d89a77fab57ffeb869c44..42dc9bcdfb23a4400c3cc3711d66e033dc9e64de 100644 (file)
@@ -50,7 +50,7 @@
 #include "RE_shader_ext.h"     /* TexResult, ShadeResult, ShadeInput */
 #include "sunsky.h"
 
-#include "BLO_sys_types.h" // for intptr_t support
+#include "BLI_sys_types.h" // for intptr_t support
 
 struct Object;
 struct MemArena;
index 765f8fbfc315f53bd641e0183af396f54a0544b9..89c0cde2e889fc1e7ba8f4f34d64e62421737f47 100644 (file)
  *  \ingroup wm
  */
 
-
 #include <string.h>
 #include <stddef.h>
 
-#include "BLO_sys_types.h"
+#include "BLI_sys_types.h"
 
 #include "DNA_windowmanager_types.h"
 
index bf48d9e6561381d355ad8d8953d1d7a20bad07f3..fa7e4afc68c8d555c20b99be5d00e27fc60ace4f 100644 (file)
@@ -37,7 +37,7 @@
 
 #include "BLI_utildefines.h"
 
-#include "BLO_sys_types.h"
+#include "BLI_sys_types.h"
 
 #include "DNA_listBase.h"
 #include "DNA_userdef_types.h" 
index 2dbb0e00eb04f1c56f8772ec922b998aaef6b94f..59a4b18cb0e18614d386590b76131f691d79c9b5 100644 (file)
@@ -33,7 +33,6 @@ incs = [
     '#/intern/guardedalloc',
     '#/source/blender/makesdna',
     '#/source/blender/makesrna',
-    '#/source/blender/blenloader',
     '#/source/blender/blenlib',
     ]
 
index df2ad2dffa704ee290f68afad088822b4b23c647..0c7d79b4cda2c25d27a6a3e539300f778dce9bcb 100644 (file)
@@ -26,7 +26,7 @@
 set(INC
        .
        ../SceneGraph
-       ../../blender/blenloader
+       ../../blender/blenlib
        ../../../intern/guardedalloc
        ../../../intern/moto/include
        ../../../intern/string
index c40394eceb1d615d8fa3a645355bffb736dafb71..1f12a9b78e1e607fae6f5a556edaa9432bb8ac66 100644 (file)
@@ -25,7 +25,7 @@
 #include <algorithm>
 #include "BoolValue.h"
 
-#include "BLO_sys_types.h" /* for intptr_t support */
+#include "BLI_sys_types.h" /* for intptr_t support */
 
 
 //////////////////////////////////////////////////////////////////////
index a6d82a4f2da38e4c7d125170fcc1c6b07921036f..c553aaca2cc33dfc5eeb511838185428f1947138 100644 (file)
@@ -29,15 +29,22 @@ Import ('env')
 
 sources = env.Glob('*.cpp')
 
-incs ='. #intern/guardedalloc #intern/string #intern/moto/include #source/gameengine/SceneGraph #source/blender/blenloader'
+incs = [
+    '.',
+    '#intern/guardedalloc',
+    '#intern/string',
+    '#intern/moto/include',
+    '#source/gameengine/SceneGraph',
+    '#source/blender/blenlib',
+    ]
 
 defs = []
 
 if env['WITH_BF_PYTHON']:
-    incs += ' ' + env['BF_PYTHON_INC']
+    incs.append(env['BF_PYTHON_INC'])
     defs.append('WITH_PYTHON')
 
 if env['WITH_BF_CXX_GUARDEDALLOC']:
     defs.append('WITH_CXX_GUARDEDALLOC')
 
-env.BlenderLib ( 'ge_logic_expressions', sources, Split(incs), defs, libtype=['core','player'], priority = [360,80], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib('ge_logic_expressions', sources, incs, defs, libtype=['core','player'], priority = [360,80], cxx_compileflags=env['BGE_CXXFLAGS'])
index 9a19cb08fadd421221ac38da79e9b68b99c79782..a11392e946443b70a318da29a53dcc162eccf530 100644 (file)
@@ -6,7 +6,7 @@
 #include "KX_ScalarInterpolator.h"
 #include "KX_GameObject.h"
 
-#include "BLO_sys_types.h" // for intptr_t support
+#include "BLI_sys_types.h" // for intptr_t support
 
 bool KX_MaterialIpoController::Update(double currentTime)
 {
index 0690bdd6538e2d9a9f5e207c24b41cbb6fb3f9ea..1a479298d1a63721f43eb66d419d9e50d55ea0db 100644 (file)
@@ -45,7 +45,7 @@ incs += ' #source/blender/makesdna #source/blender/makesrna #source/blender/pyth
 incs += ' #source/gameengine/GameLogic #source/gameengine/Expressions #source/gameengine/Network'
 incs += ' #source/gameengine/SceneGraph #source/gameengine/Physics/common'
 incs += ' #source/gameengine/Physics/Dummy'
-incs += ' #source/blender/misc #source/blender/blenloader #extern/glew/include #source/blender/gpu'
+incs += ' #source/blender/misc #extern/glew/include #source/blender/gpu'
 incs += ' #extern/recastnavigation/Recast/Include #extern/recastnavigation/Detour/Include'
 
 incs += ' ' + env['BF_BULLET_INC']
index 11cb4b1d9f94393417b5f7bef6ccfc107f2913b9..d61f90378bbd7cde13e61d846c50baf518bdb394 100644 (file)
@@ -30,7 +30,6 @@ set(INC
        ../../SceneGraph
        ../../../blender/blenkernel
        ../../../blender/blenlib
-       ../../../blender/blenloader
        ../../../blender/gpu
        ../../../blender/makesdna
        ../../../../intern/container