From f1c4688e25a124a8fe38f29e4bbf7298e33aeb56 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Thu, 9 Dec 2010 17:31:42 +0000 Subject: 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). --- source/blender/python/generic/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/python/generic/CMakeLists.txt') 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 -- cgit v1.2.3