archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

FreeBSD can use the exact same python includes as everyone else

Browse Source
This commit is contained in:
Wouter van Heyst
2003-03-25 23:36:40 +00:00
parent d5424d2321
commit 22305bc08d
18 changed files with 18 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/Makefile
View File

@@ -259,7 +259,7 @@ ifeq ($(OS),freebsd)
BINTARGETS += blenderplayer BINTARGETS += blenderplayer
BINTARGETS += plugin BINTARGETS += plugin
endif endif
PYLIB = /usr/local/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a PYLIB = $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a
PYLIB += $(NAN_MXTEXTTOOLS) PYLIB += $(NAN_MXTEXTTOOLS)
endif endif

6
source/blender/blenkernel/intern/Makefile
View File

@@ -44,11 +44,7 @@ CFLAGS += $(LEVEL_1_C_WARNINGS)
# OpenGL and Python # OpenGL and Python
CPPFLAGS += -I$(OPENGL_HEADERS) CPPFLAGS += -I$(OPENGL_HEADERS)
ifeq ($(OS),$(findstring $(OS), "freebsd")) CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
CPPFLAGS += -I$(NAN_PYTHON)$(NAN_PYTHON_VERSION)
else
CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
endif
CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
# Reference to the types in makesdna and imbuf # Reference to the types in makesdna and imbuf

6
source/blender/blenloader/intern/Makefile
View File

@@ -44,11 +44,7 @@ endif
# OpenGL and Python # OpenGL and Python
CPPFLAGS += $(OGL_CPPFLAGS) CPPFLAGS += $(OGL_CPPFLAGS)
ifeq ($(OS),$(findstring $(OS), "freebsd")) CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
CPPFLAGS += -I$(NAN_PYTHON)$(NAN_PYTHON_VERSION)
else
CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
endif
# zlib # zlib
ifeq ($(OS),$(findstring $(OS), "solaris windows")) ifeq ($(OS),$(findstring $(OS), "solaris windows"))

6
source/blender/bpython/intern/Makefile
View File

@@ -47,11 +47,7 @@ CPPFLAGS += -DFUTURE_PYTHON_API # see api.h for configuration
# OpenGL and Python # OpenGL and Python
CPPFLAGS += -I$(OPENGL_HEADERS) CPPFLAGS += -I$(OPENGL_HEADERS)
ifeq ($(OS),$(findstring $(OS), "freebsd")) CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
CPPFLAGS += -I$(NAN_PYTHON)$(NAN_PYTHON_VERSION)
else
CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
endif
CPPFLAGS += -I$(NAN_BMFONT)/include/ CPPFLAGS += -I$(NAN_BMFONT)/include/
# Reference to the types in makesdna and imbuf # Reference to the types in makesdna and imbuf

6
source/blender/src/Makefile
View File

@@ -57,11 +57,7 @@ endif
# PreProcessor stuff ------------------------------------------ # PreProcessor stuff ------------------------------------------
CPPFLAGS += -I$(OPENGL_HEADERS) CPPFLAGS += -I$(OPENGL_HEADERS)
ifeq ($(OS),$(findstring $(OS), "freebsd")) CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
CPPFLAGS += -I$(NAN_PYTHON)$(NAN_PYTHON_VERSION)
else
CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
endif
CPPFLAGS += -I$(NAN_GHOST)/include CPPFLAGS += -I$(NAN_GHOST)/include
CPPFLAGS += -I$(NAN_BMFONT)/include CPPFLAGS += -I$(NAN_BMFONT)/include

6
source/gameengine/BlenderRoutines/Makefile
View File

@@ -69,9 +69,5 @@ ifeq ($(OS),windows)
CPPFLAGS += -I../../blender CPPFLAGS += -I../../blender
endif endif
ifeq ($(OS),freebsd) CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
CPPFLAGS += -I$(NAN_PYTHON)$(NAN_PYTHON_VERSION)
else
CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
endif

6
source/gameengine/Converter/Makefile
View File

@@ -40,11 +40,7 @@ CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
CPPFLAGS += -I$(OPENGL_HEADERS) CPPFLAGS += -I$(OPENGL_HEADERS)
CPPFLAGS += -I$(NAN_STRING)/include CPPFLAGS += -I$(NAN_STRING)/include
ifeq ($(OS),$(findstring $(OS), "freebsd")) CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
CPPFLAGS += -I$(NAN_PYTHON)$(NAN_PYTHON_VERSION)
else
CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
endif
CPPFLAGS += -I$(NAN_FUZZICS)/include -I$(NAN_SUMO)/include -I$(NAN_MOTO)/include CPPFLAGS += -I$(NAN_FUZZICS)/include -I$(NAN_SUMO)/include -I$(NAN_MOTO)/include
CPPFLAGS += -I../../blender CPPFLAGS += -I../../blender
# these two needed because of blenkernel # these two needed because of blenkernel

6
source/gameengine/Expressions/Makefile
View File

@@ -38,11 +38,7 @@ include nan_compile.mk
CCFLAGS += $(LEVEL_1_CPP_WARNINGS) CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
ifeq ($(OS),$(findstring $(OS), "freebsd")) CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
CPPFLAGS += -I$(NAN_PYTHON)$(NAN_PYTHON_VERSION)
else
CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
endif
CPPFLAGS += -I$(NAN_STRING)/include CPPFLAGS += -I$(NAN_STRING)/include
CPPFLAGS += -I../../kernel/gen_system CPPFLAGS += -I../../kernel/gen_system

6
source/gameengine/GameLogic/Makefile
View File

@@ -41,11 +41,7 @@ CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
CPPFLAGS += -I../Expressions CPPFLAGS += -I../Expressions
CPPFLAGS += -I$(NAN_STRING)/include CPPFLAGS += -I$(NAN_STRING)/include
CPPFLAGS += -I$(NAN_MOTO)/include CPPFLAGS += -I$(NAN_MOTO)/include
ifeq ($(OS),$(findstring $(OS), "freebsd")) CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
CPPFLAGS += -I$(NAN_PYTHON)$(NAN_PYTHON_VERSION)
else
CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
endif
CPPFLAGS += -I../../kernel/gen_system CPPFLAGS += -I../../kernel/gen_system

6
source/gameengine/GamePlayer/common/Makefile
View File

@@ -52,11 +52,7 @@ CPPFLAGS += -I$(NAN_FUZZICS)/include
CPPFLAGS += -I$(NAN_STRING)/include CPPFLAGS += -I$(NAN_STRING)/include
CPPFLAGS += -I$(NAN_MOTO)/include CPPFLAGS += -I$(NAN_MOTO)/include
CPPFLAGS += -I$(NAN_SUMO)/include CPPFLAGS += -I$(NAN_SUMO)/include
ifeq ($(OS),$(findstring $(OS), "freebsd")) CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
CPPFLAGS += -I$(NAN_PYTHON)$(NAN_PYTHON_VERSION)
else
CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
endif
CPPFLAGS += -I$(NAN_BMFONT)/include CPPFLAGS += -I$(NAN_BMFONT)/include
CPPFLAGS += -I../../../gameengine/Converter CPPFLAGS += -I../../../gameengine/Converter

6
source/gameengine/GamePlayer/common/unix/Makefile
View File

@@ -43,11 +43,7 @@ CPPFLAGS += -I$(NAN_STRING)/include
CPPFLAGS += -I.. CPPFLAGS += -I..
CPPFLAGS += -I../../netscape/src/ketsji CPPFLAGS += -I../../netscape/src/ketsji
ifeq ($(OS),$(findstring $(OS), "freebsd")) CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
CPPFLAGS += -I$(NAN_PYTHON)$(NAN_PYTHON_VERSION)
else
CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
endif
# Game Engine # Game Engine

6
source/gameengine/GamePlayer/ghost/Makefile
View File

@@ -79,10 +79,6 @@ CPPFLAGS += -I../../../kernel/gen_messaging
CPPFLAGS += -I$(NAN_STRING)/include CPPFLAGS += -I$(NAN_STRING)/include
CPPFLAGS += -I$(NAN_GHOST)/include CPPFLAGS += -I$(NAN_GHOST)/include
ifeq ($(OS),$(findstring $(OS), "freebsd")) CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
CPPFLAGS += -I$(NAN_PYTHON)$(NAN_PYTHON_VERSION)
else
CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
endif

6
source/gameengine/Ketsji/KXNetwork/Makefile
View File

@@ -38,11 +38,7 @@ include nan_compile.mk
CCFLAGS += $(LEVEL_1_CPP_WARNINGS) CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
ifeq ($(OS),$(findstring $(OS), "freebsd")) CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
CPPFLAGS += -I$(NAN_PYTHON)$(NAN_PYTHON_VERSION)
else
CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
endif
CPPFLAGS += -I$(NAN_STRING)/include CPPFLAGS += -I$(NAN_STRING)/include
CPPFLAGS += -I../../Expressions CPPFLAGS += -I../../Expressions

6
source/gameengine/Ketsji/Makefile
View File

@@ -39,11 +39,7 @@ include nan_compile.mk
CCFLAGS += $(LEVEL_1_CPP_WARNINGS) CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
CPPFLAGS += $(OGL_CPPFLAGS) CPPFLAGS += $(OGL_CPPFLAGS)
ifeq ($(OS),$(findstring $(OS), "freebsd")) CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
CPPFLAGS += -I$(NAN_PYTHON)$(NAN_PYTHON_VERSION)
else
CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
endif
CPPFLAGS += -I$(NAN_STRING)/include CPPFLAGS += -I$(NAN_STRING)/include
CPPFLAGS += -I$(NAN_FUZZICS)/include -I$(NAN_SUMO)/include -I$(NAN_MOTO)/include CPPFLAGS += -I$(NAN_FUZZICS)/include -I$(NAN_SUMO)/include -I$(NAN_MOTO)/include
CPPFLAGS += -I../Rasterizer -I../GameLogic -I../SceneGraph CPPFLAGS += -I../Rasterizer -I../GameLogic -I../SceneGraph

6
source/gameengine/Physics/BlOde/Makefile
View File

@@ -40,11 +40,7 @@ CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
CPPFLAGS += -I$(OPENGL_HEADERS) CPPFLAGS += -I$(OPENGL_HEADERS)
CPPFLAGS += -I$(NAN_STRING)/include CPPFLAGS += -I$(NAN_STRING)/include
ifeq ($(OS),$(findstring $(OS), "freebsd")) CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
CPPFLAGS += -I$(NAN_PYTHON)$(NAN_PYTHON_VERSION)
else
CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
endif
CPPFLAGS += -I$(NAN_FUZZICS)/include -I$(NAN_SUMO)/include -I$(NAN_MOTO)/include CPPFLAGS += -I$(NAN_FUZZICS)/include -I$(NAN_SUMO)/include -I$(NAN_MOTO)/include
CPPFLAGS += -I$(NAN_ODE)/include CPPFLAGS += -I$(NAN_ODE)/include

6
source/gameengine/Physics/Dummy/Makefile
View File

@@ -40,11 +40,7 @@ CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
CPPFLAGS += -I$(OPENGL_HEADERS) CPPFLAGS += -I$(OPENGL_HEADERS)
CPPFLAGS += -I$(NAN_STRING)/include CPPFLAGS += -I$(NAN_STRING)/include
ifeq ($(OS),$(findstring $(OS), "freebsd")) CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
CPPFLAGS += -I$(NAN_PYTHON)$(NAN_PYTHON_VERSION)
else
CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
endif
CPPFLAGS += -I$(NAN_FUZZICS)/include -I$(NAN_SUMO)/include -I$(NAN_MOTO)/include CPPFLAGS += -I$(NAN_FUZZICS)/include -I$(NAN_SUMO)/include -I$(NAN_MOTO)/include
CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include

6
source/gameengine/Physics/Sumo/Makefile
View File

@@ -40,11 +40,7 @@ CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
CPPFLAGS += -I$(OPENGL_HEADERS) CPPFLAGS += -I$(OPENGL_HEADERS)
CPPFLAGS += -I$(NAN_STRING)/include CPPFLAGS += -I$(NAN_STRING)/include
ifeq ($(OS),$(findstring $(OS), "freebsd")) CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
CPPFLAGS += -I$(NAN_PYTHON)$(NAN_PYTHON_VERSION)
else
CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
endif
CPPFLAGS += -I$(NAN_FUZZICS)/include -I$(NAN_SUMO)/include -I$(NAN_MOTO)/include CPPFLAGS += -I$(NAN_FUZZICS)/include -I$(NAN_SUMO)/include -I$(NAN_MOTO)/include
CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include

6
source/gameengine/Physics/common/Makefile
View File

@@ -40,11 +40,7 @@ CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
CPPFLAGS += -I$(OPENGL_HEADERS) CPPFLAGS += -I$(OPENGL_HEADERS)
CPPFLAGS += -I$(NAN_STRING)/include CPPFLAGS += -I$(NAN_STRING)/include
ifeq ($(OS),$(findstring $(OS), "freebsd")) CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
CPPFLAGS += -I$(NAN_PYTHON)$(NAN_PYTHON_VERSION)
else
CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
endif
CPPFLAGS += -I$(NAN_FUZZICS)/include -I$(NAN_SUMO)/include -I$(NAN_MOTO)/include CPPFLAGS += -I$(NAN_FUZZICS)/include -I$(NAN_SUMO)/include -I$(NAN_MOTO)/include
CPPFLAGS += -I../../blender CPPFLAGS += -I../../blender