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:
-rw-r--r--config/darwin-config.py4
-rw-r--r--config/linux2-config.py2
-rw-r--r--config/openbsd3-config.py2
-rw-r--r--config/sunos5-config.py2
-rw-r--r--config/win32-vc-config.py2
-rw-r--r--source/nan_definitions.mk3
6 files changed, 9 insertions, 6 deletions
diff --git a/config/darwin-config.py b/config/darwin-config.py
index 08fdbb41baa..c2b68b12f83 100644
--- a/config/darwin-config.py
+++ b/config/darwin-config.py
@@ -65,8 +65,8 @@ BF_FTGL = '#extern/bFTGL'
BF_FTGL_INC = '${BF_FTGL}/include'
BF_FTGL_LIB = 'extern_ftgl'
-WITH_BF_GAMEENGINE='true'
-WITH_BF_PLAYER='true'
+WITH_BF_GAMEENGINE='false'
+WITH_BF_PLAYER='false'
WITH_BF_ODE = 'false'
BF_ODE = LIBDIR + '/ode'
diff --git a/config/linux2-config.py b/config/linux2-config.py
index c56a3d1d8f7..4d2b9e9ca3a 100644
--- a/config/linux2-config.py
+++ b/config/linux2-config.py
@@ -59,7 +59,7 @@ BF_FTGL = '#extern/bFTGL'
BF_FTGL_INC = '${BF_FTGL}/include'
BF_FTGL_LIB = 'extern_ftgl'
-WITH_BF_GAMEENGINE='true'
+WITH_BF_GAMEENGINE='false'
WITH_BF_ODE = 'false'
BF_ODE = LIBDIR + '/ode'
diff --git a/config/openbsd3-config.py b/config/openbsd3-config.py
index 303f79c9bc8..50a77dccc4d 100644
--- a/config/openbsd3-config.py
+++ b/config/openbsd3-config.py
@@ -60,7 +60,7 @@ BF_FTGL = '#extern/bFTGL'
BF_FTGL_INC = '${BF_FTGL}/include'
BF_FTGL_LIB = 'extern_ftgl'
-WITH_BF_GAMEENGINE='true'
+WITH_BF_GAMEENGINE='false'
WITH_BF_ODE = 'false'
BF_ODE = LIBDIR + '/ode'
diff --git a/config/sunos5-config.py b/config/sunos5-config.py
index 71f1e7a1b48..4441d3c9a51 100644
--- a/config/sunos5-config.py
+++ b/config/sunos5-config.py
@@ -62,7 +62,7 @@ BF_FTGL = '#extern/bFTGL'
BF_FTGL_INC = '${BF_FTGL}/include'
BF_FTGL_LIB = 'extern_ftgl'
-WITH_BF_GAMEENGINE='true'
+WITH_BF_GAMEENGINE='false'
WITH_BF_ODE = 'false'
BF_ODE = LIBDIR + '/ode'
diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py
index cccd7f24009..63964a3c5ed 100644
--- a/config/win32-vc-config.py
+++ b/config/win32-vc-config.py
@@ -83,7 +83,7 @@ BF_FTGL = LIBDIR + '/ftgl'
BF_FTGL_INC = '${BF_FTGL}/include'
BF_FTGL_LIB = 'extern_ftgl'
-WITH_BF_GAMEENGINE = 'true'
+WITH_BF_GAMEENGINE = 'false'
WITH_BF_ODE = 'true'
BF_ODE = LIBDIR + '/ode'
diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk
index a75c913ab93..ac2bf7b6b76 100644
--- a/source/nan_definitions.mk
+++ b/source/nan_definitions.mk
@@ -34,6 +34,9 @@
sinclude ../user-def.mk
+#game engine temporarily disabled: need to upgrade to Bullet 2.x
+export NAN_NO_KETSJI=true
+
ifndef CONFIG_GUESS
ifeq (debug, $(findstring debug, $(MAKECMDGOALS)))
ifeq (all, $(findstring all, $(MAKECMDGOALS)))