svn merge -r 22571:22800 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender-staging.git] / source / nan_compile.mk
index bd6dd6e1baaf81ae0fc7e43f204445c5c86bc0c0..4a4e472fa66f56a15f46963c1f815c661fcea7a6 100644 (file)
@@ -39,8 +39,6 @@ CPPFLAGS ?= $(NAN_CPPFLAGS)
 # Uncomment next lines to enable integrated game engine
 ifneq ($(NAN_NO_KETSJI), true)
     CFLAGS  += -DGAMEBLENDER=1
-    CFLAGS  += -DUSE_SUMO_SOLID
-    CCFLAGS += -DUSE_SUMO_SOLID
     ifeq ($(NAN_USE_BULLET), true)
       CFLAGS  += -DUSE_BULLET -DWITH_BULLET
       CCFLAGS += -DUSE_BULLET -DWITH_BULLET
@@ -71,21 +69,6 @@ DBG_CCFLAGS  += -g
 
 # OS dependent parts ---------------------------------------------------
 
-ifeq ($(OS),beos)
-    CC = gcc
-    CCC        = g++
-    CFLAGS     += -pipe -fPIC -funsigned-char -fno-strict-aliasing
-    CCFLAGS    += -pipe -fPIC -funsigned-char -fno-strict-aliasing
-    REL_CFLAGS += -O2
-    REL_CCFLAGS        += -O2
-    NAN_DEPEND = true
-    OPENGL_HEADERS  = .
-    CPPFLAGS   += -D__BeOS
-    AR = ar
-    ARFLAGS = ruv
-    ARFLAGSQUIET = ru
-endif
-
 ifeq ($(OS),darwin)
     CC = gcc
     CCC        = g++