Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2010-12-09 20:31:42 +0300
committerDalai Felinto <dfelinto@gmail.com>2010-12-09 20:31:42 +0300
commitf1c4688e25a124a8fe38f29e4bbf7298e33aeb56 (patch)
tree94dd147be283d45a8fabdb0d09d309ec66df4d4a /source/blender/python/generic/CMakeLists.txt
parentb6c68777adff0ddf46befbca1f37caff22173e21 (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/blender/python/generic/CMakeLists.txt')
-rw-r--r--source/blender/python/generic/CMakeLists.txt4
1 files changed, 2 insertions, 2 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