sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

CMake: remove redundant include dir

Browse Source
This commit is contained in:
Campbell Barton 2014-12-06 13:01:47 +01:00
parent 81ae71fcd3
commit 06515475b9
3 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/blenlib/intern/scanfill_utils.c
View File

@ -76,7 +76,7 @@ typedef struct ScanFillIsect {
#if 0 #if 0
void BKE_scanfill_obj_dump(ScanFillContext *sf_ctx) void BLI_scanfill_obj_dump(ScanFillContext *sf_ctx)
{ {
FILE *f = fopen("test.obj", "w"); FILE *f = fopen("test.obj", "w");
unsigned int i = 1; unsigned int i = 1;
@ -96,7 +96,7 @@ void BKE_scanfill_obj_dump(ScanFillContext *sf_ctx)
#endif #endif
#if 0 #if 0
void BKE_scanfill_view3d_dump(ScanFillContext *sf_ctx) void BLI_scanfill_view3d_dump(ScanFillContext *sf_ctx)
{ {
ScanFillEdge *eed; ScanFillEdge *eed;
@ -508,8 +508,8 @@ bool BLI_scanfill_calc_self_isect(
sf_ctx->poly_nr = SF_POLY_UNSET; sf_ctx->poly_nr = SF_POLY_UNSET;
#if 0 #if 0
BKE_scanfill_view3d_dump(sf_ctx); BLI_scanfill_view3d_dump(sf_ctx);
BKE_scanfill_obj_dump(sf_ctx); BLI_scanfill_obj_dump(sf_ctx);
#endif #endif
return changed; return changed;

6
source/blender/windowmanager/CMakeLists.txt
View File

@ -130,12 +130,6 @@ if(WITH_BUILDINFO)
add_definitions(-DWITH_BUILDINFO) add_definitions(-DWITH_BUILDINFO)
endif() endif()
if(WIN322)
list(APPEND INC
../../../intern/utfconv
)
endif()
if(WITH_COMPOSITOR) if(WITH_COMPOSITOR)
add_definitions(-DWITH_COMPOSITOR) add_definitions(-DWITH_COMPOSITOR)
endif() endif()

1
source/blender/windowmanager/SConscript
View File

@ -65,7 +65,6 @@ if env['WITH_BF_COLLADA']:
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'): if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
incs += ' ' + env['BF_PTHREADS_INC'] incs += ' ' + env['BF_PTHREADS_INC']
incs += ' ../../intern/utfconv'
if env['BF_BUILDINFO']: if env['BF_BUILDINFO']:
defs.append('WITH_BUILDINFO') defs.append('WITH_BUILDINFO')