updates to the OS X build system :

- XCode project
- Scons :
    scons stopped working for Os X in the last month (dont know when) :

     * the '.' and '..' keywords in CCPPATH
          are not recognized anymore for sconscripts compiling files at
          a sub level
     * when doing a scons clean, the 3 subdirs in build dir are removed
      and scons then fail to recreate them (exten, intern, source)

this commit solve the first problem as a temp workaround
for the latter simply recreate the dirs manually

I will investigate that further when on vacations,  which i should already
 be.
 ;(

all 3 build systems are now working on Os X

10 files changed, 11 insertions, 1 deletions

diff --git a/source/blender/avi/SConscript b/source/blender/avi/SConscript
index 9311999e123..56eaff26f0f 100644
--- a/source/blender/avi/SConscript
+++ b/source/blender/avi/SConscript
@@ -14,6 +14,7 @@ source_files = ['intern/avi.c',
                 'intern/rgb32.c']
 
 avi_env.Append (CPPPATH = ['.',
+                           '../avi',
                            '#/intern/guardedalloc'])
 
 avi_env.Append (CPPPATH=user_options_dict['JPEG_INCLUDE'])
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript
index a71063f8038..620890ba7c3 100644
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@ -46,6 +46,7 @@ source_files = ['intern/constraint.c',
                 'intern/texture.c']
 
 blenkernel_env.Append (CPPPATH = ['.',
+                                  '../blenkernel',
                                   '#/intern/guardedalloc',
                                   '../include',
                                   '../blenlib',
diff --git a/source/blender/blenlib/SConscript b/source/blender/blenlib/SConscript
index f9f7012c17c..a4882587618 100644
--- a/source/blender/blenlib/SConscript
+++ b/source/blender/blenlib/SConscript
@@ -28,6 +28,7 @@ source_files = ['intern/BLI_dynstr.c',
 
 
 blenlib_env.Append (CPPPATH = ['.',
+                               '../blenlib',
                                '../makesdna',
                                '../blenkernel',
                                '#/intern/guardedalloc',
diff --git a/source/blender/blenloader/SConscript b/source/blender/blenloader/SConscript
index fa380bc791b..62a652e4174 100644
--- a/source/blender/blenloader/SConscript
+++ b/source/blender/blenloader/SConscript
@@ -11,6 +11,7 @@ source_files = ['intern/genfile.c',
                 'intern/writefile.c']
 
 blenloader_env.Append (CPPPATH = ['.',
+                                  '../blenloader',
                                   '#/intern/guardedalloc',
                                   '../blenlib',
                                   '../blenkernel',
diff --git a/source/blender/blenpluginapi/SConscript b/source/blender/blenpluginapi/SConscript
index 42d4bd5bb5a..21b89b74d24 100644
--- a/source/blender/blenpluginapi/SConscript
+++ b/source/blender/blenpluginapi/SConscript
@@ -8,6 +8,7 @@ source_files = ['intern/pluginapi.c']
 
 blenplugin_env.Append (CPPPATH = ['.',
                                   '..',
+                                  '../blenpluginapi',
                                   '#/intern/guardedalloc',
                                   '../blenlib',
                                   '../imbuf',
diff --git a/source/blender/imbuf/SConscript b/source/blender/imbuf/SConscript
index 11d7cfb2b30..94b8846c769 100644
--- a/source/blender/imbuf/SConscript
+++ b/source/blender/imbuf/SConscript
@@ -34,6 +34,7 @@ source_files = ['intern/allocimbuf.c',
                 'intern/writeimage.c']
 
 imbuf_env.Append (CPPPATH = ['.',
+                             '../imbuf',
                              '../makesdna',
                              '#/intern/guardedalloc',
                              '../blenlib',
diff --git a/source/blender/makesdna/intern/SConscript b/source/blender/makesdna/intern/SConscript
index 378f2492e3c..e30f14f69ce 100644
--- a/source/blender/makesdna/intern/SConscript
+++ b/source/blender/makesdna/intern/SConscript
@@ -12,7 +12,7 @@ source_files = ['makesdna.c']
 makesdna_tool = Environment (ENV = os.environ, CCFLAGS='-DBASE_HEADER="\\"source/blender/makesdna/\\"" ')
 
 makesdna_tool.Append (CPPPATH = ['#/intern/guardedalloc',
-                                 '..'])
+                                 '../../makesdna'])
 
 makesdna_tool.Replace (CC = user_options_dict['HOST_CC'])
 makesdna_tool.Replace (PATH = user_options_dict['PATH'])
diff --git a/source/blender/quicktime/SConscript b/source/blender/quicktime/SConscript
index 80d3192bfe2..f47611bbb13 100644
--- a/source/blender/quicktime/SConscript
+++ b/source/blender/quicktime/SConscript
@@ -11,6 +11,7 @@ source_files = ['apple/quicktime_import.c',
                 'apple/quicktime_export.c']
 
 quicktime_env.Append (CPPPATH = ['.',
+                                 '../quicktime',
                                  '../makesdna',
                                  '#/intern/guardedalloc',
                                  '../blenlib',
diff --git a/source/blender/readblenfile/SConscript b/source/blender/readblenfile/SConscript
index 751bc100a97..1f0909b1f84 100644
--- a/source/blender/readblenfile/SConscript
+++ b/source/blender/readblenfile/SConscript
@@ -7,6 +7,8 @@ readblenfile_env = library_env.Copy ()
 source_files = ['intern/BLO_readblenfile.c']
 
 readblenfile_env.Append (CPPPATH = ['.',
+
+'../readblenfile',
 									'../readstreamglue',
 									'../blenloader',
 									'../blenloader/intern',
diff --git a/source/blender/renderconverter/SConscript b/source/blender/renderconverter/SConscript
index f0da2bd5f1f..e0f777d59bf 100644
--- a/source/blender/renderconverter/SConscript
+++ b/source/blender/renderconverter/SConscript
@@ -7,6 +7,7 @@ renderconv_env = library_env.Copy ()
 source_files = ['intern/convertBlenderScene.c']
 
 renderconv_env.Append (CPPPATH = ['.',
+                                  '../renderconverter',
                                   '../blenlib',
                                   '../yafray',
                                   '../radiosity/extern/include',