diff options
author | Jean-Luc Peurière <jlp@nerim.net> | 2005-08-04 20:05:28 +0400 |
---|---|---|
committer | Jean-Luc Peurière <jlp@nerim.net> | 2005-08-04 20:05:28 +0400 |
commit | b12f80168174623742ebe99186a89746a2646a97 (patch) | |
tree | f4ed834ce9a208189e2622d615096c809433476d /intern | |
parent | cd1430db46aae24d767a74d584bd2246349e06c1 (diff) |
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
Diffstat (limited to 'intern')
-rw-r--r-- | intern/SoundSystem/SConscript | 1 | ||||
-rw-r--r-- | intern/bmfont/SConscript | 1 | ||||
-rw-r--r-- | intern/container/SConscript | 2 | ||||
-rw-r--r-- | intern/ghost/SConscript | 1 | ||||
-rw-r--r-- | intern/guardedalloc/SConscript | 2 | ||||
-rw-r--r-- | intern/memutil/SConscript | 2 | ||||
-rw-r--r-- | intern/string/SConscript | 2 |
7 files changed, 7 insertions, 4 deletions
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) |