diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-12-06 15:01:47 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-12-06 15:39:46 +0300 |
| commit | 06515475b9c87c553d75481abfa600a0f7a5faf8 (patch) | |
| tree | 9a878aca9ccb745261a02106b2ca4faf83494ba6 /source | |
| parent | 81ae71fcd3ea1406f0bca05471c17d984738ff4c (diff) | |
CMake: remove redundant include dir
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenlib/intern/scanfill_utils.c | 8 | ||||
| -rw-r--r-- | source/blender/windowmanager/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | source/blender/windowmanager/SConscript | 1 |
3 files changed, 4 insertions, 11 deletions
diff --git a/source/blender/blenlib/intern/scanfill_utils.c b/source/blender/blenlib/intern/scanfill_utils.c index 029e98bad5e..6ddea300404 100644 --- a/source/blender/blenlib/intern/scanfill_utils.c +++ b/source/blender/blenlib/intern/scanfill_utils.c @@ -76,7 +76,7 @@ typedef struct ScanFillIsect { #if 0 -void BKE_scanfill_obj_dump(ScanFillContext *sf_ctx) +void BLI_scanfill_obj_dump(ScanFillContext *sf_ctx) { FILE *f = fopen("test.obj", "w"); unsigned int i = 1; @@ -96,7 +96,7 @@ void BKE_scanfill_obj_dump(ScanFillContext *sf_ctx) #endif #if 0 -void BKE_scanfill_view3d_dump(ScanFillContext *sf_ctx) +void BLI_scanfill_view3d_dump(ScanFillContext *sf_ctx) { ScanFillEdge *eed; @@ -508,8 +508,8 @@ bool BLI_scanfill_calc_self_isect( sf_ctx->poly_nr = SF_POLY_UNSET; #if 0 - BKE_scanfill_view3d_dump(sf_ctx); - BKE_scanfill_obj_dump(sf_ctx); + BLI_scanfill_view3d_dump(sf_ctx); + BLI_scanfill_obj_dump(sf_ctx); #endif return changed; diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt index 088bddc8a76..4cbadda1732 100644 --- a/source/blender/windowmanager/CMakeLists.txt +++ b/source/blender/windowmanager/CMakeLists.txt @@ -130,12 +130,6 @@ if(WITH_BUILDINFO) add_definitions(-DWITH_BUILDINFO) endif() -if(WIN322) - list(APPEND INC - ../../../intern/utfconv - ) -endif() - if(WITH_COMPOSITOR) add_definitions(-DWITH_COMPOSITOR) endif() diff --git a/source/blender/windowmanager/SConscript b/source/blender/windowmanager/SConscript index b93192d5067..3c44ff6107c 100644 --- a/source/blender/windowmanager/SConscript +++ b/source/blender/windowmanager/SConscript @@ -65,7 +65,6 @@ if env['WITH_BF_COLLADA']: if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'): incs += ' ' + env['BF_PTHREADS_INC'] - incs += ' ../../intern/utfconv' if env['BF_BUILDINFO']: defs.append('WITH_BUILDINFO') |