diff options
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/Makefile | 6 | ||||
-rw-r--r-- | source/blender/blenloader/intern/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 | 7 | ||||
-rw-r--r-- | source/gameengine/GameLogic/Makefile | 7 | ||||
-rw-r--r-- | source/gameengine/GamePlayer/common/Makefile | 7 | ||||
-rw-r--r-- | source/gameengine/GamePlayer/common/unix/Makefile | 7 | ||||
-rw-r--r-- | source/gameengine/GamePlayer/ghost/Makefile | 7 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KXNetwork/Makefile | 7 | ||||
-rw-r--r-- | source/gameengine/Ketsji/Makefile | 6 | ||||
-rw-r--r-- | source/gameengine/Physics/BlOde/Makefile | 7 | ||||
-rw-r--r-- | source/gameengine/Physics/Dummy/Makefile | 7 | ||||
-rw-r--r-- | source/gameengine/Physics/Sumo/Makefile | 7 | ||||
-rw-r--r-- | source/gameengine/Physics/common/Makefile | 7 |
15 files changed, 85 insertions, 15 deletions
diff --git a/source/blender/blenkernel/intern/Makefile b/source/blender/blenkernel/intern/Makefile index 08202dff9cc..db586d3f017 100644 --- a/source/blender/blenkernel/intern/Makefile +++ b/source/blender/blenkernel/intern/Makefile @@ -44,7 +44,11 @@ CFLAGS += $(LEVEL_1_C_WARNINGS) # OpenGL and Python CPPFLAGS += -I$(OPENGL_HEADERS) -CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) +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_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 bbda61c53f5..24640534f64 100644 --- a/source/blender/blenloader/intern/Makefile +++ b/source/blender/blenloader/intern/Makefile @@ -44,7 +44,11 @@ endif # OpenGL and Python CPPFLAGS += $(OGL_CPPFLAGS) -CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) +ifeq ($(OS),$(findstring $(OS), "freebsd")) + CPPFLAGS += -I$(NAN_PYTHON)$(NAN_PYTHON_VERSION) +else + CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) +endif # zlib ifeq ($(OS),$(findstring $(OS), "solaris windows")) diff --git a/source/gameengine/BlenderRoutines/Makefile b/source/gameengine/BlenderRoutines/Makefile index 9a4ba217ac7..93faaa64a32 100644 --- a/source/gameengine/BlenderRoutines/Makefile +++ b/source/gameengine/BlenderRoutines/Makefile @@ -71,5 +71,9 @@ ifeq ($(OS),windows) CPPFLAGS += -I../../blender endif -CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) +ifeq ($(OS),freebsd) + CPPFLAGS += -I$(NAN_PYTHON)$(NAN_PYTHON_VERSION) +else + CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) +endif diff --git a/source/gameengine/Converter/Makefile b/source/gameengine/Converter/Makefile index ffcdf8a0693..48b4febe048 100644 --- a/source/gameengine/Converter/Makefile +++ b/source/gameengine/Converter/Makefile @@ -40,7 +40,11 @@ CCFLAGS += $(LEVEL_1_CPP_WARNINGS) CPPFLAGS += -I$(OPENGL_HEADERS) CPPFLAGS += -I$(NAN_STRING)/include -CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) +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_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 f4732b145d6..31d242543e3 100644 --- a/source/gameengine/Expressions/Makefile +++ b/source/gameengine/Expressions/Makefile @@ -38,7 +38,12 @@ include nan_compile.mk CCFLAGS += $(LEVEL_1_CPP_WARNINGS) -CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) +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_STRING)/include CPPFLAGS += -I../../kernel/gen_system diff --git a/source/gameengine/GameLogic/Makefile b/source/gameengine/GameLogic/Makefile index 6af79ae7cfe..4649f120efd 100644 --- a/source/gameengine/GameLogic/Makefile +++ b/source/gameengine/GameLogic/Makefile @@ -41,7 +41,12 @@ CCFLAGS += $(LEVEL_1_CPP_WARNINGS) CPPFLAGS += -I../Expressions CPPFLAGS += -I$(NAN_STRING)/include CPPFLAGS += -I$(NAN_MOTO)/include -CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) +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../../kernel/gen_system diff --git a/source/gameengine/GamePlayer/common/Makefile b/source/gameengine/GamePlayer/common/Makefile index f55b1198c63..08b628d45df 100644 --- a/source/gameengine/GamePlayer/common/Makefile +++ b/source/gameengine/GamePlayer/common/Makefile @@ -52,7 +52,12 @@ CPPFLAGS += -I$(NAN_FUZZICS)/include CPPFLAGS += -I$(NAN_STRING)/include CPPFLAGS += -I$(NAN_MOTO)/include CPPFLAGS += -I$(NAN_SUMO)/include -CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) +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_BMFONT)/include CPPFLAGS += -I../../../gameengine/Converter CPPFLAGS += -I../../../gameengine/Expressions diff --git a/source/gameengine/GamePlayer/common/unix/Makefile b/source/gameengine/GamePlayer/common/unix/Makefile index cbc3a358b40..ebaebc7ecca 100644 --- a/source/gameengine/GamePlayer/common/unix/Makefile +++ b/source/gameengine/GamePlayer/common/unix/Makefile @@ -43,7 +43,12 @@ CPPFLAGS += -I$(NAN_STRING)/include CPPFLAGS += -I.. CPPFLAGS += -I../../netscape/src/ketsji -CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) +ifeq ($(OS),$(findstring $(OS), "freebsd")) + CPPFLAGS += -I$(NAN_PYTHON)$(NAN_PYTHON_VERSION) +else + CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) +endif + # Game Engine CPPFLAGS += -I../../../../gameengine/Converter diff --git a/source/gameengine/GamePlayer/ghost/Makefile b/source/gameengine/GamePlayer/ghost/Makefile index 7e9735a4bd8..ba6d2b23718 100644 --- a/source/gameengine/GamePlayer/ghost/Makefile +++ b/source/gameengine/GamePlayer/ghost/Makefile @@ -78,5 +78,10 @@ CPPFLAGS += -I../../../kernel/gen_messaging CPPFLAGS += -I$(NAN_STRING)/include CPPFLAGS += -I$(NAN_GHOST)/include -CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) +ifeq ($(OS),$(findstring $(OS), "freebsd")) + CPPFLAGS += -I$(NAN_PYTHON)$(NAN_PYTHON_VERSION) +else + CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) +endif + diff --git a/source/gameengine/Ketsji/KXNetwork/Makefile b/source/gameengine/Ketsji/KXNetwork/Makefile index bce2cbc29a3..19243d53b73 100644 --- a/source/gameengine/Ketsji/KXNetwork/Makefile +++ b/source/gameengine/Ketsji/KXNetwork/Makefile @@ -38,7 +38,12 @@ include nan_compile.mk CCFLAGS += $(LEVEL_1_CPP_WARNINGS) -CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) +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_STRING)/include CPPFLAGS += -I../../Expressions CPPFLAGS += -I../../GameLogic diff --git a/source/gameengine/Ketsji/Makefile b/source/gameengine/Ketsji/Makefile index 1c11d7ca4c5..68e46a43174 100644 --- a/source/gameengine/Ketsji/Makefile +++ b/source/gameengine/Ketsji/Makefile @@ -39,7 +39,11 @@ include nan_compile.mk CCFLAGS += $(LEVEL_1_CPP_WARNINGS) CPPFLAGS += $(OGL_CPPFLAGS) -CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) +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_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 be890f660ad..99e577be06b 100644 --- a/source/gameengine/Physics/BlOde/Makefile +++ b/source/gameengine/Physics/BlOde/Makefile @@ -40,7 +40,12 @@ CCFLAGS += $(LEVEL_1_CPP_WARNINGS) CPPFLAGS += -I$(OPENGL_HEADERS) CPPFLAGS += -I$(NAN_STRING)/include -CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) +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_FUZZICS)/include -I$(NAN_SUMO)/include -I$(NAN_MOTO)/include CPPFLAGS += -I$(NAN_ODE)/include CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include diff --git a/source/gameengine/Physics/Dummy/Makefile b/source/gameengine/Physics/Dummy/Makefile index 4ef37cf97ce..5defd6f3c4c 100644 --- a/source/gameengine/Physics/Dummy/Makefile +++ b/source/gameengine/Physics/Dummy/Makefile @@ -40,7 +40,12 @@ CCFLAGS += $(LEVEL_1_CPP_WARNINGS) CPPFLAGS += -I$(OPENGL_HEADERS) CPPFLAGS += -I$(NAN_STRING)/include -CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) +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_FUZZICS)/include -I$(NAN_SUMO)/include -I$(NAN_MOTO)/include CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include CPPFLAGS += -I../../Physics/common diff --git a/source/gameengine/Physics/Sumo/Makefile b/source/gameengine/Physics/Sumo/Makefile index 3e5aca1d577..cc79a769728 100644 --- a/source/gameengine/Physics/Sumo/Makefile +++ b/source/gameengine/Physics/Sumo/Makefile @@ -40,7 +40,12 @@ CCFLAGS += $(LEVEL_1_CPP_WARNINGS) CPPFLAGS += -I$(OPENGL_HEADERS) CPPFLAGS += -I$(NAN_STRING)/include -CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) +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_FUZZICS)/include -I$(NAN_SUMO)/include -I$(NAN_MOTO)/include CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include CPPFLAGS += -I../../Physics/common diff --git a/source/gameengine/Physics/common/Makefile b/source/gameengine/Physics/common/Makefile index 3783d959e14..5f1afea1c32 100644 --- a/source/gameengine/Physics/common/Makefile +++ b/source/gameengine/Physics/common/Makefile @@ -40,7 +40,12 @@ CCFLAGS += $(LEVEL_1_CPP_WARNINGS) CPPFLAGS += -I$(OPENGL_HEADERS) CPPFLAGS += -I$(NAN_STRING)/include -CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) +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_FUZZICS)/include -I$(NAN_SUMO)/include -I$(NAN_MOTO)/include CPPFLAGS += -I../../blender # these two needed because of blenkernel |