forked from bartvdbraak/blender
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).
This commit is contained in:
parent
b6c68777ad
commit
f1c4688e25
@ -31,7 +31,7 @@ set(INC
|
|||||||
set(SRC
|
set(SRC
|
||||||
IDProp.c
|
IDProp.c
|
||||||
bgl.c
|
bgl.c
|
||||||
blf_api.c
|
blf_py_api.c
|
||||||
bpy_internal_import.c
|
bpy_internal_import.c
|
||||||
mathutils.c
|
mathutils.c
|
||||||
mathutils_color.c
|
mathutils_color.c
|
||||||
@ -45,7 +45,7 @@ set(SRC
|
|||||||
|
|
||||||
IDProp.h
|
IDProp.h
|
||||||
bgl.h
|
bgl.h
|
||||||
blf_api.h
|
blf_py_api.h
|
||||||
bpy_internal_import.h
|
bpy_internal_import.h
|
||||||
mathutils.h
|
mathutils.h
|
||||||
mathutils_color.h
|
mathutils_color.h
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include <Python.h>
|
#include <Python.h>
|
||||||
#include "blf_api.h"
|
#include "blf_py_api.h"
|
||||||
|
|
||||||
#include "../../blenfont/BLF_api.h"
|
#include "../../blenfont/BLF_api.h"
|
||||||
#include "BKE_utildefines.h"
|
#include "BKE_utildefines.h"
|
@ -44,7 +44,7 @@
|
|||||||
/* external util modules */
|
/* external util modules */
|
||||||
#include "../generic/mathutils.h"
|
#include "../generic/mathutils.h"
|
||||||
#include "../generic/bgl.h"
|
#include "../generic/bgl.h"
|
||||||
#include "../generic/blf_api.h"
|
#include "../generic/blf_py_api.h"
|
||||||
#include "../generic/IDProp.h"
|
#include "../generic/IDProp.h"
|
||||||
|
|
||||||
#include "AUD_PyInit.h"
|
#include "AUD_PyInit.h"
|
||||||
|
@ -51,7 +51,7 @@ extern "C" {
|
|||||||
#include "py_capi_utils.h"
|
#include "py_capi_utils.h"
|
||||||
#include "mathutils.h" // Blender.Mathutils module copied here so the blenderlayer can use.
|
#include "mathutils.h" // Blender.Mathutils module copied here so the blenderlayer can use.
|
||||||
#include "bgl.h"
|
#include "bgl.h"
|
||||||
#include "blf_api.h"
|
#include "blf_py_api.h"
|
||||||
|
|
||||||
#include "marshal.h" /* python header for loading/saving dicts */
|
#include "marshal.h" /* python header for loading/saving dicts */
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user