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/gameengine/Ketsji | |
| 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/gameengine/Ketsji')
| -rw-r--r-- | source/gameengine/Ketsji/KX_PythonInit.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 */ } |