diff options
author | Wouter van Heyst <larstiq-bforge@larstiq.dyndns.org> | 2003-03-26 02:36:40 +0300 |
---|---|---|
committer | Wouter van Heyst <larstiq-bforge@larstiq.dyndns.org> | 2003-03-26 02:36:40 +0300 |
commit | 22305bc08d681618ecd36a7f57535c527180abae (patch) | |
tree | 1b2a95ac566b97ecff9bcd42cd148530a0de2f36 | |
parent | d5424d2321902b075a5f95ba2163758fa8218db7 (diff) |
FreeBSD can use the exact same python includes as everyone else
-rw-r--r-- | source/Makefile | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/Makefile | 6 | ||||
-rw-r--r-- | source/blender/blenloader/intern/Makefile | 6 | ||||
-rw-r--r-- | source/blender/bpython/intern/Makefile | 6 | ||||
-rw-r--r-- | source/blender/src/Makefile | 6 | ||||
-rw-r--r-- | source/gameengine/BlenderRoutines/Makefile | 6 | ||||
-rw-r--r-- | source/gameengine/Converter/Makefile | 6 | ||||
-rw-r--r-- | source/gameengine/Expressions/Makefile | 6 | ||||
-rw-r--r-- | source/gameengine/GameLogic/Makefile | 6 | ||||
-rw-r--r-- | source/gameengine/GamePlayer/common/Makefile | 6 | ||||
-rw-r--r-- | source/gameengine/GamePlayer/common/unix/Makefile | 6 | ||||
-rw-r--r-- | source/gameengine/GamePlayer/ghost/Makefile | 6 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KXNetwork/Makefile | 6 | ||||
-rw-r--r-- | source/gameengine/Ketsji/Makefile | 6 | ||||
-rw-r--r-- | source/gameengine/Physics/BlOde/Makefile | 6 | ||||
-rw-r--r-- | source/gameengine/Physics/Dummy/Makefile | 6 | ||||
-rw-r--r-- | source/gameengine/Physics/Sumo/Makefile | 6 | ||||
-rw-r--r-- | source/gameengine/Physics/common/Makefile | 6 |
18 files changed, 18 insertions, 86 deletions
diff --git a/source/Makefile b/source/Makefile index 905041900b1..19d49e16acd 100644 --- a/source/Makefile +++ b/source/Makefile @@ -259,7 +259,7 @@ ifeq ($(OS),freebsd) BINTARGETS += blenderplayer BINTARGETS += plugin 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) endif diff --git a/source/blender/blenkernel/intern/Makefile b/source/blender/blenkernel/intern/Makefile index db586d3f017..08202dff9cc 100644 --- a/source/blender/blenkernel/intern/Makefile +++ b/source/blender/blenkernel/intern/Makefile @@ -44,11 +44,7 @@ CFLAGS += $(LEVEL_1_C_WARNINGS) # OpenGL and Python CPPFLAGS += -I$(OPENGL_HEADERS) -ifeq ($(OS),$(findstring $(OS), "freebsd")) - CPPFLAGS += -I$(NAN_PYTHON)$(NAN_PYTHON_VERSION) -else - CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) -endif +CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include # Reference to the types in makesdna and imbuf diff --git a/source/blender/blenloader/intern/Makefile b/source/blender/blenloader/intern/Makefile index 24640534f64..bbda61c53f5 100644 --- a/source/blender/blenloader/intern/Makefile +++ b/source/blender/blenloader/intern/Makefile @@ -44,11 +44,7 @@ endif # OpenGL and Python CPPFLAGS += $(OGL_CPPFLAGS) -ifeq ($(OS),$(findstring $(OS), "freebsd")) - CPPFLAGS += -I$(NAN_PYTHON)$(NAN_PYTHON_VERSION) -else - CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) -endif +CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) # zlib ifeq ($(OS),$(findstring $(OS), "solaris windows")) diff --git a/source/blender/bpython/intern/Makefile b/source/blender/bpython/intern/Makefile index b6c84196f4d..cb67e195aa8 100644 --- a/source/blender/bpython/intern/Makefile +++ b/source/blender/bpython/intern/Makefile @@ -47,11 +47,7 @@ CPPFLAGS += -DFUTURE_PYTHON_API # see api.h for configuration # OpenGL and Python CPPFLAGS += -I$(OPENGL_HEADERS) -ifeq ($(OS),$(findstring $(OS), "freebsd")) - CPPFLAGS += -I$(NAN_PYTHON)$(NAN_PYTHON_VERSION) -else - CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) -endif +CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) CPPFLAGS += -I$(NAN_BMFONT)/include/ # Reference to the types in makesdna and imbuf diff --git a/source/blender/src/Makefile b/source/blender/src/Makefile index 38d28469af3..faae6598263 100644 --- a/source/blender/src/Makefile +++ b/source/blender/src/Makefile @@ -57,11 +57,7 @@ endif # PreProcessor stuff ------------------------------------------ CPPFLAGS += -I$(OPENGL_HEADERS) -ifeq ($(OS),$(findstring $(OS), "freebsd")) - CPPFLAGS += -I$(NAN_PYTHON)$(NAN_PYTHON_VERSION) -else - CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) -endif +CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) CPPFLAGS += -I$(NAN_GHOST)/include CPPFLAGS += -I$(NAN_BMFONT)/include diff --git a/source/gameengine/BlenderRoutines/Makefile b/source/gameengine/BlenderRoutines/Makefile index d09a8d613d7..c9507130ef5 100644 --- a/source/gameengine/BlenderRoutines/Makefile +++ b/source/gameengine/BlenderRoutines/Makefile @@ -69,9 +69,5 @@ ifeq ($(OS),windows) CPPFLAGS += -I../../blender endif -ifeq ($(OS),freebsd) - CPPFLAGS += -I$(NAN_PYTHON)$(NAN_PYTHON_VERSION) -else - CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) -endif +CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) diff --git a/source/gameengine/Converter/Makefile b/source/gameengine/Converter/Makefile index 48b4febe048..ffcdf8a0693 100644 --- a/source/gameengine/Converter/Makefile +++ b/source/gameengine/Converter/Makefile @@ -40,11 +40,7 @@ CCFLAGS += $(LEVEL_1_CPP_WARNINGS) CPPFLAGS += -I$(OPENGL_HEADERS) CPPFLAGS += -I$(NAN_STRING)/include -ifeq ($(OS),$(findstring $(OS), "freebsd")) - CPPFLAGS += -I$(NAN_PYTHON)$(NAN_PYTHON_VERSION) -else - CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) -endif +CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) CPPFLAGS += -I$(NAN_FUZZICS)/include -I$(NAN_SUMO)/include -I$(NAN_MOTO)/include CPPFLAGS += -I../../blender # these two needed because of blenkernel diff --git a/source/gameengine/Expressions/Makefile b/source/gameengine/Expressions/Makefile index 31d242543e3..88746c18eae 100644 --- a/source/gameengine/Expressions/Makefile +++ b/source/gameengine/Expressions/Makefile @@ -38,11 +38,7 @@ include nan_compile.mk CCFLAGS += $(LEVEL_1_CPP_WARNINGS) -ifeq ($(OS),$(findstring $(OS), "freebsd")) - CPPFLAGS += -I$(NAN_PYTHON)$(NAN_PYTHON_VERSION) -else - CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) -endif +CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) CPPFLAGS += -I$(NAN_STRING)/include CPPFLAGS += -I../../kernel/gen_system diff --git a/source/gameengine/GameLogic/Makefile b/source/gameengine/GameLogic/Makefile index 4649f120efd..520be0d89e9 100644 --- a/source/gameengine/GameLogic/Makefile +++ b/source/gameengine/GameLogic/Makefile @@ -41,11 +41,7 @@ CCFLAGS += $(LEVEL_1_CPP_WARNINGS) CPPFLAGS += -I../Expressions CPPFLAGS += -I$(NAN_STRING)/include CPPFLAGS += -I$(NAN_MOTO)/include -ifeq ($(OS),$(findstring $(OS), "freebsd")) - CPPFLAGS += -I$(NAN_PYTHON)$(NAN_PYTHON_VERSION) -else - CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) -endif +CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) CPPFLAGS += -I../../kernel/gen_system diff --git a/source/gameengine/GamePlayer/common/Makefile b/source/gameengine/GamePlayer/common/Makefile index 08b628d45df..1dfbe22c0ca 100644 --- a/source/gameengine/GamePlayer/common/Makefile +++ b/source/gameengine/GamePlayer/common/Makefile @@ -52,11 +52,7 @@ CPPFLAGS += -I$(NAN_FUZZICS)/include CPPFLAGS += -I$(NAN_STRING)/include CPPFLAGS += -I$(NAN_MOTO)/include CPPFLAGS += -I$(NAN_SUMO)/include -ifeq ($(OS),$(findstring $(OS), "freebsd")) - CPPFLAGS += -I$(NAN_PYTHON)$(NAN_PYTHON_VERSION) -else - CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) -endif +CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) CPPFLAGS += -I$(NAN_BMFONT)/include CPPFLAGS += -I../../../gameengine/Converter diff --git a/source/gameengine/GamePlayer/common/unix/Makefile b/source/gameengine/GamePlayer/common/unix/Makefile index ebaebc7ecca..e246ebc3578 100644 --- a/source/gameengine/GamePlayer/common/unix/Makefile +++ b/source/gameengine/GamePlayer/common/unix/Makefile @@ -43,11 +43,7 @@ CPPFLAGS += -I$(NAN_STRING)/include CPPFLAGS += -I.. CPPFLAGS += -I../../netscape/src/ketsji -ifeq ($(OS),$(findstring $(OS), "freebsd")) - CPPFLAGS += -I$(NAN_PYTHON)$(NAN_PYTHON_VERSION) -else - CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) -endif +CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) # Game Engine diff --git a/source/gameengine/GamePlayer/ghost/Makefile b/source/gameengine/GamePlayer/ghost/Makefile index 8498ecf7d07..1d75afc0389 100644 --- a/source/gameengine/GamePlayer/ghost/Makefile +++ b/source/gameengine/GamePlayer/ghost/Makefile @@ -79,10 +79,6 @@ CPPFLAGS += -I../../../kernel/gen_messaging CPPFLAGS += -I$(NAN_STRING)/include CPPFLAGS += -I$(NAN_GHOST)/include -ifeq ($(OS),$(findstring $(OS), "freebsd")) - CPPFLAGS += -I$(NAN_PYTHON)$(NAN_PYTHON_VERSION) -else - CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) -endif +CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) diff --git a/source/gameengine/Ketsji/KXNetwork/Makefile b/source/gameengine/Ketsji/KXNetwork/Makefile index 19243d53b73..ee8ddc45c3b 100644 --- a/source/gameengine/Ketsji/KXNetwork/Makefile +++ b/source/gameengine/Ketsji/KXNetwork/Makefile @@ -38,11 +38,7 @@ include nan_compile.mk CCFLAGS += $(LEVEL_1_CPP_WARNINGS) -ifeq ($(OS),$(findstring $(OS), "freebsd")) - CPPFLAGS += -I$(NAN_PYTHON)$(NAN_PYTHON_VERSION) -else - CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) -endif +CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) CPPFLAGS += -I$(NAN_STRING)/include CPPFLAGS += -I../../Expressions diff --git a/source/gameengine/Ketsji/Makefile b/source/gameengine/Ketsji/Makefile index 68e46a43174..1c11d7ca4c5 100644 --- a/source/gameengine/Ketsji/Makefile +++ b/source/gameengine/Ketsji/Makefile @@ -39,11 +39,7 @@ include nan_compile.mk CCFLAGS += $(LEVEL_1_CPP_WARNINGS) CPPFLAGS += $(OGL_CPPFLAGS) -ifeq ($(OS),$(findstring $(OS), "freebsd")) - CPPFLAGS += -I$(NAN_PYTHON)$(NAN_PYTHON_VERSION) -else - CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) -endif +CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) CPPFLAGS += -I$(NAN_STRING)/include CPPFLAGS += -I$(NAN_FUZZICS)/include -I$(NAN_SUMO)/include -I$(NAN_MOTO)/include CPPFLAGS += -I../Rasterizer -I../GameLogic -I../SceneGraph diff --git a/source/gameengine/Physics/BlOde/Makefile b/source/gameengine/Physics/BlOde/Makefile index fef57dfbcfa..b85c8b13bc4 100644 --- a/source/gameengine/Physics/BlOde/Makefile +++ b/source/gameengine/Physics/BlOde/Makefile @@ -40,11 +40,7 @@ CCFLAGS += $(LEVEL_1_CPP_WARNINGS) CPPFLAGS += -I$(OPENGL_HEADERS) CPPFLAGS += -I$(NAN_STRING)/include -ifeq ($(OS),$(findstring $(OS), "freebsd")) - CPPFLAGS += -I$(NAN_PYTHON)$(NAN_PYTHON_VERSION) -else - CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) -endif +CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) CPPFLAGS += -I$(NAN_FUZZICS)/include -I$(NAN_SUMO)/include -I$(NAN_MOTO)/include CPPFLAGS += -I$(NAN_ODE)/include diff --git a/source/gameengine/Physics/Dummy/Makefile b/source/gameengine/Physics/Dummy/Makefile index 5defd6f3c4c..0ecb3fa786a 100644 --- a/source/gameengine/Physics/Dummy/Makefile +++ b/source/gameengine/Physics/Dummy/Makefile @@ -40,11 +40,7 @@ CCFLAGS += $(LEVEL_1_CPP_WARNINGS) CPPFLAGS += -I$(OPENGL_HEADERS) CPPFLAGS += -I$(NAN_STRING)/include -ifeq ($(OS),$(findstring $(OS), "freebsd")) - CPPFLAGS += -I$(NAN_PYTHON)$(NAN_PYTHON_VERSION) -else - CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) -endif +CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) CPPFLAGS += -I$(NAN_FUZZICS)/include -I$(NAN_SUMO)/include -I$(NAN_MOTO)/include CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include diff --git a/source/gameengine/Physics/Sumo/Makefile b/source/gameengine/Physics/Sumo/Makefile index cc79a769728..deb59c2d18f 100644 --- a/source/gameengine/Physics/Sumo/Makefile +++ b/source/gameengine/Physics/Sumo/Makefile @@ -40,11 +40,7 @@ CCFLAGS += $(LEVEL_1_CPP_WARNINGS) CPPFLAGS += -I$(OPENGL_HEADERS) CPPFLAGS += -I$(NAN_STRING)/include -ifeq ($(OS),$(findstring $(OS), "freebsd")) - CPPFLAGS += -I$(NAN_PYTHON)$(NAN_PYTHON_VERSION) -else - CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) -endif +CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) CPPFLAGS += -I$(NAN_FUZZICS)/include -I$(NAN_SUMO)/include -I$(NAN_MOTO)/include CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include diff --git a/source/gameengine/Physics/common/Makefile b/source/gameengine/Physics/common/Makefile index 5f1afea1c32..a9f43aeb5a7 100644 --- a/source/gameengine/Physics/common/Makefile +++ b/source/gameengine/Physics/common/Makefile @@ -40,11 +40,7 @@ CCFLAGS += $(LEVEL_1_CPP_WARNINGS) CPPFLAGS += -I$(OPENGL_HEADERS) CPPFLAGS += -I$(NAN_STRING)/include -ifeq ($(OS),$(findstring $(OS), "freebsd")) - CPPFLAGS += -I$(NAN_PYTHON)$(NAN_PYTHON_VERSION) -else - CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) -endif +CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) CPPFLAGS += -I$(NAN_FUZZICS)/include -I$(NAN_SUMO)/include -I$(NAN_MOTO)/include CPPFLAGS += -I../../blender |