From b12f80168174623742ebe99186a89746a2646a97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Luc=20Peuri=C3=A8re?= Date: Thu, 4 Aug 2005 16:05:28 +0000 Subject: 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 --- SConstruct | 4 ++-- intern/SoundSystem/SConscript | 1 + intern/bmfont/SConscript | 1 + intern/container/SConscript | 2 +- intern/ghost/SConscript | 1 + intern/guardedalloc/SConscript | 2 +- intern/memutil/SConscript | 2 +- intern/string/SConscript | 2 +- source/blender/avi/SConscript | 1 + source/blender/blenkernel/SConscript | 1 + source/blender/blenlib/SConscript | 1 + source/blender/blenloader/SConscript | 1 + source/blender/blenpluginapi/SConscript | 1 + source/blender/imbuf/SConscript | 1 + source/blender/makesdna/intern/SConscript | 2 +- source/blender/quicktime/SConscript | 1 + source/blender/readblenfile/SConscript | 2 ++ source/blender/renderconverter/SConscript | 1 + 18 files changed, 20 insertions(+), 7 deletions(-) diff --git a/SConstruct b/SConstruct index d6d1678c294..06d49f1000c 100644 --- a/SConstruct +++ b/SConstruct @@ -241,8 +241,8 @@ elif sys.platform == 'darwin': '-framework', 'IOKit' , '-framework', 'AppKit'] # International stuff - ftgl_lib = [] - ftgl_libpath = [] + ftgl_lib = ['libftgl'] + ftgl_libpath = [darwin_precomp + 'ftgl/lib'] ftgl_include = ['#extern/bFTGL/include'] freetype_lib = ['libfreetype'] freetype_libpath = [darwin_precomp + 'freetype/lib'] diff --git a/intern/SoundSystem/SConscript b/intern/SoundSystem/SConscript index 7652ac92db6..0ff757b54a7 100644 --- a/intern/SoundSystem/SConscript +++ b/intern/SoundSystem/SConscript @@ -21,6 +21,7 @@ source_files = ['dummy/SND_DummyDevice.cpp', 'intern/SND_WaveSlot.cpp'] soundsys_env.Append (CPPPATH = ['.', + '../SoundSystem', 'intern', '../moto/include', '../string', diff --git a/intern/bmfont/SConscript b/intern/bmfont/SConscript index e35b1df3738..3c2bf973c14 100644 --- a/intern/bmfont/SConscript +++ b/intern/bmfont/SConscript @@ -17,6 +17,7 @@ source_files = ['intern/BMF_Api.cpp', 'intern/BMF_font_scr15.cpp'] bmfont_env.Append (CPPPATH = ['.', + '../bmfont', 'intern']) bmfont_env.Append (CPPPATH = user_options_dict['OPENGL_INCLUDE']) diff --git a/intern/container/SConscript b/intern/container/SConscript index b45a2af07e1..a7e7c7d39e7 100644 --- a/intern/container/SConscript +++ b/intern/container/SConscript @@ -6,6 +6,6 @@ cont_env = library_env.Copy () source_files = ['intern/CTR_List.cpp'] -cont_env.Append (CPPPATH = ['.']) +cont_env.Append (CPPPATH = ['.','../container']) cont_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_CTR', source=source_files) diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript index 8a82b0dfd87..23a741bb3b9 100644 --- a/intern/ghost/SConscript +++ b/intern/ghost/SConscript @@ -35,6 +35,7 @@ else: print "Unknown window system specified." ghost_env.Append (CPPPATH = ['.', + '../ghost', '../string']) ghost_env.Append (CPPPATH = user_options_dict['OPENGL_INCLUDE']) diff --git a/intern/guardedalloc/SConscript b/intern/guardedalloc/SConscript index 7d89e02faf4..4044aa82e4f 100644 --- a/intern/guardedalloc/SConscript +++ b/intern/guardedalloc/SConscript @@ -6,6 +6,6 @@ guardal_env = library_env.Copy () source_files = ['intern/mallocn.c'] -guardal_env.Append (CPPPATH = ['.']) +guardal_env.Append (CPPPATH = ['../guardedalloc']) guardal_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_guardedalloc', source=source_files) diff --git a/intern/memutil/SConscript b/intern/memutil/SConscript index dd4412e98bc..febb6364a05 100644 --- a/intern/memutil/SConscript +++ b/intern/memutil/SConscript @@ -6,6 +6,6 @@ memutil_env = library_env.Copy () source_files = ['intern/MEM_RefCountedC-Api.cpp'] -memutil_env.Append (CPPPATH = ['.']) +memutil_env.Append (CPPPATH = ['.','../memutil']) memutil_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_MEM', source=source_files) diff --git a/intern/string/SConscript b/intern/string/SConscript index 1644a14718f..16833832d0d 100644 --- a/intern/string/SConscript +++ b/intern/string/SConscript @@ -6,6 +6,6 @@ string_env = library_env.Copy () source_files = ['intern/STR_String.cpp'] -string_env.Append (CPPPATH = ['.']) +string_env.Append (CPPPATH = ['.', '../string']) string_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_STR', source=source_files) 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', -- cgit v1.2.3