[Bf-blender-cvs] [0651547] master: CMake: remove redundant include dir

[Campbell Barton]

Commit: 06515475b9c87c553d75481abfa600a0f7a5faf8
Author: Campbell Barton
Date:   Sat Dec 6 13:01:47 2014 +0100
Branches: master
https://developer.blender.org/rB06515475b9c87c553d75481abfa600a0f7a5faf8

CMake: remove redundant include dir

===================================================================

M       source/blender/blenlib/intern/scanfill_utils.c
M       source/blender/windowmanager/CMakeLists.txt
M       source/blender/windowmanager/SConscript

===================================================================

diff --git a/source/blender/blenlib/intern/scanfill_utils.c 
b/source/blender/blenlib/intern/scanfill_utils.c
index 029e98b..6ddea30 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 088bddc..4cbadda 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 b93192d..3c44ff6 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')

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs