diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2010-12-09 20:31:42 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2010-12-09 20:31:42 +0300 |
commit | f1c4688e25a124a8fe38f29e4bbf7298e33aeb56 (patch) | |
tree | 94dd147be283d45a8fabdb0d09d309ec66df4d4a /source | |
parent | b6c68777adff0ddf46befbca1f37caff22173e21 (diff) |
renaming blf_api.h to blf_py_api.h
In windows this was producing Linking dependence errors because we have BLF_api.h in the /blenfont/ and blf_api.h in /python/generic/. It doesn't produces crash out of the box but I was trying to link both "api" files to the same project (Ketjsi folder). For the linking order was determining what header to use. A workaround is to "include" the file using some ../../ relative folder. But renaming it is less error prone.
Probably Ketsji folder shouldn't link to BLF_api.h anyways, but this is something I will look better later before another commit. In the mean time it's not a good idea to have 2 api files with the same name (for non case-sensitive systems).
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/python/generic/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/python/generic/blf_py_api.c (renamed from source/blender/python/generic/blf_api.c) | 2 | ||||
-rw-r--r-- | source/blender/python/generic/blf_py_api.h (renamed from source/blender/python/generic/blf_api.h) | 0 | ||||
-rw-r--r-- | source/blender/python/intern/bpy.c | 2 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_PythonInit.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/python/generic/CMakeLists.txt b/source/blender/python/generic/CMakeLists.txt index 5569dda2ce6..e8a7a7149db 100644 --- a/source/blender/python/generic/CMakeLists.txt +++ b/source/blender/python/generic/CMakeLists.txt @@ -31,7 +31,7 @@ set(INC set(SRC IDProp.c bgl.c - blf_api.c + blf_py_api.c bpy_internal_import.c mathutils.c mathutils_color.c @@ -45,7 +45,7 @@ set(SRC IDProp.h bgl.h - blf_api.h + blf_py_api.h bpy_internal_import.h mathutils.h mathutils_color.h diff --git a/source/blender/python/generic/blf_api.c b/source/blender/python/generic/blf_py_api.c index e81b885f7bb..8821aa6d6e7 100644 --- a/source/blender/python/generic/blf_api.c +++ b/source/blender/python/generic/blf_py_api.c @@ -23,7 +23,7 @@ */ #include <Python.h> -#include "blf_api.h" +#include "blf_py_api.h" #include "../../blenfont/BLF_api.h" #include "BKE_utildefines.h" diff --git a/source/blender/python/generic/blf_api.h b/source/blender/python/generic/blf_py_api.h index db17f62337b..db17f62337b 100644 --- a/source/blender/python/generic/blf_api.h +++ b/source/blender/python/generic/blf_py_api.h diff --git a/source/blender/python/intern/bpy.c b/source/blender/python/intern/bpy.c index 2b6fbd7aaa5..834d472d786 100644 --- a/source/blender/python/intern/bpy.c +++ b/source/blender/python/intern/bpy.c @@ -44,7 +44,7 @@ /* external util modules */ #include "../generic/mathutils.h" #include "../generic/bgl.h" -#include "../generic/blf_api.h" +#include "../generic/blf_py_api.h" #include "../generic/IDProp.h" #include "AUD_PyInit.h" diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp index 99870c42018..48e002fc3c2 100644 --- a/source/gameengine/Ketsji/KX_PythonInit.cpp +++ b/source/gameengine/Ketsji/KX_PythonInit.cpp @@ -51,7 +51,7 @@ extern "C" { #include "py_capi_utils.h" #include "mathutils.h" // Blender.Mathutils module copied here so the blenderlayer can use. #include "bgl.h" - #include "blf_api.h" + #include "blf_py_api.h" #include "marshal.h" /* python header for loading/saving dicts */ } |