From 225c5fee6b046b9829643f82cf6cbce159e4e007 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Tue, 28 May 2013 19:35:26 +0000
Subject: move BLO_sys_types.h -> BLI_sys_types.h (it had nothing todo with
 loading) remove MEM_sys_types.h which was a duplicate.

---
 source/gameengine/Expressions/CMakeLists.txt |  2 +-
 source/gameengine/Expressions/ListValue.cpp  |  2 +-
 source/gameengine/Expressions/SConscript     | 13 ++++++++++---
 3 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'source/gameengine/Expressions')

diff --git a/source/gameengine/Expressions/CMakeLists.txt b/source/gameengine/Expressions/CMakeLists.txt
index df2ad2dffa7..0c7d79b4cda 100644
--- a/source/gameengine/Expressions/CMakeLists.txt
+++ b/source/gameengine/Expressions/CMakeLists.txt
@@ -26,7 +26,7 @@
 set(INC
 	.
 	../SceneGraph
-	../../blender/blenloader
+	../../blender/blenlib
 	../../../intern/guardedalloc
 	../../../intern/moto/include
 	../../../intern/string
diff --git a/source/gameengine/Expressions/ListValue.cpp b/source/gameengine/Expressions/ListValue.cpp
index c40394eceb1..1f12a9b78e1 100644
--- a/source/gameengine/Expressions/ListValue.cpp
+++ b/source/gameengine/Expressions/ListValue.cpp
@@ -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 */
 
 
 //////////////////////////////////////////////////////////////////////
diff --git a/source/gameengine/Expressions/SConscript b/source/gameengine/Expressions/SConscript
index a6d82a4f2da..c553aaca2cc 100644
--- a/source/gameengine/Expressions/SConscript
+++ b/source/gameengine/Expressions/SConscript
@@ -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'])
-- 
cgit v1.2.3