FreeBSD can use the exact same python includes as everyone else
authorWouter van Heyst <larstiq-bforge@larstiq.dyndns.org>
Tue, 25 Mar 2003 23:36:40 +0000 (23:36 +0000)
committerWouter van Heyst <larstiq-bforge@larstiq.dyndns.org>
Tue, 25 Mar 2003 23:36:40 +0000 (23:36 +0000)
18 files changed:
source/Makefile
source/blender/blenkernel/intern/Makefile
source/blender/blenloader/intern/Makefile
source/blender/bpython/intern/Makefile
source/blender/src/Makefile
source/gameengine/BlenderRoutines/Makefile
source/gameengine/Converter/Makefile
source/gameengine/Expressions/Makefile
source/gameengine/GameLogic/Makefile
source/gameengine/GamePlayer/common/Makefile
source/gameengine/GamePlayer/common/unix/Makefile
source/gameengine/GamePlayer/ghost/Makefile
source/gameengine/Ketsji/KXNetwork/Makefile
source/gameengine/Ketsji/Makefile
source/gameengine/Physics/BlOde/Makefile
source/gameengine/Physics/Dummy/Makefile
source/gameengine/Physics/Sumo/Makefile
source/gameengine/Physics/common/Makefile

index 905041900b1b6b9baaf456d64720588df36a5ee8..19d49e16acd56405e0b7faa75854d63151ca08b7 100644 (file)
@@ -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
 
index db586d3f0179eabe31a37e88524d286d4d044ba8..08202dff9ccb3d52e5f419e0c4acb31e8e6f1a30 100644 (file)
@@ -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
index 24640534f6430751c295cae2983638c186153527..bbda61c53f5a645c08dbd5bb7227ba27838cfccb 100644 (file)
@@ -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"))
index b6c84196f4dbc36475ff018222334f3d626316e5..cb67e195aa8551034b225d99d7bed608664766ab 100644 (file)
@@ -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
index 38d28469af34e30471c1001a18aaac514e1a6449..faae6598263471b8086d2afc2877ae5389d20c60 100644 (file)
@@ -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
 
index d09a8d613d7f7c63cfded2ff6e2f2fa2ba65da34..c9507130ef59fd09c9e51b7359b5fd1ba8f5acb6 100644 (file)
@@ -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)
 
index 48b4febe0484cece46ea2748d37a3f6210a44d3d..ffcdf8a0693e8e56af42e2402a164a331c056ae5 100644 (file)
@@ -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
index 31d242543e3208cda935294ada50626f7fb2a861..88746c18eae328297bbf099c61af126876523d5c 100644 (file)
@@ -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
index 4649f120efd05f1dccd61228f3a91a94f7ae5e5d..520be0d89e952f36f8e03831e6c968e3aac57416 100644 (file)
@@ -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
 
index 08b628d45df826d40d060ea4dfa20473d1800c64..1dfbe22c0ca469cbb6442d2d70a829fb6aaa735d 100644 (file)
@@ -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
index ebaebc7ecca213432547fde2a2f6781540200368..e246ebc3578af5f4d434df453d759d3cb87367b8 100644 (file)
@@ -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
index 8498ecf7d078c81253eb6eb56873d135f62d57f7..1d75afc0389ef59c4c82c660dad09681c34d0a4c 100644 (file)
@@ -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)
 
 
index 19243d53b7373b6983d2bab06d5f0ce4f3992c1d..ee8ddc45c3bc5a4834c84e575e6ad2d0f3708830 100644 (file)
@@ -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
index 68e46a4317426e17657b7aa778a505a2eb021438..1c11d7ca4c57e1182035fa595e46029b8fe90f7d 100644 (file)
@@ -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
index fef57dfbcfa11b01a3fdd776d2019a9a9d9ca811..b85c8b13bc4ecbd9087573985e8fc65f57c552c4 100644 (file)
@@ -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
index 5defd6f3c4c2588e54e0251afa94e425d7044214..0ecb3fa786a38d9ed6d0ffdc5510f12b90b5f18a 100644 (file)
@@ -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
index cc79a769728ec58fef420d3aa89ee0f2356078fe..deb59c2d18fa6a653b2f04f30f08f09bac3d7f66 100644 (file)
@@ -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
index 5f1afea1c32811cc48bd2134e2f7e6ad9a0c8348..a9f43aeb5a7c2e51126a5c8aeda83103e2a1cbb2 100644 (file)
@@ -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