forked from bartvdbraak/blender
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
This commit is contained in:
Jean-Luc Peurière
parent
cd1430db46
commit
b12f801681
@ -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']
|
||||
|
||||
@ -21,6 +21,7 @@ source_files = ['dummy/SND_DummyDevice.cpp',
|
||||
'intern/SND_WaveSlot.cpp']
|
||||
|
||||
soundsys_env.Append (CPPPATH = ['.',
|
||||
'../SoundSystem',
|
||||
'intern',
|
||||
'../moto/include',
|
||||
'../string',
|
||||
|
||||
@ -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'])
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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'])
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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'])
|
||||
|
||||
@ -46,6 +46,7 @@ source_files = ['intern/constraint.c',
|
||||
'intern/texture.c']
|
||||
|
||||
blenkernel_env.Append (CPPPATH = ['.',
|
||||
'../blenkernel',
|
||||
'#/intern/guardedalloc',
|
||||
'../include',
|
||||
'../blenlib',
|
||||
|
||||
@ -28,6 +28,7 @@ source_files = ['intern/BLI_dynstr.c',
|
||||
|
||||
|
||||
blenlib_env.Append (CPPPATH = ['.',
|
||||
'../blenlib',
|
||||
'../makesdna',
|
||||
'../blenkernel',
|
||||
'#/intern/guardedalloc',
|
||||
|
||||
@ -11,6 +11,7 @@ source_files = ['intern/genfile.c',
|
||||
'intern/writefile.c']
|
||||
|
||||
blenloader_env.Append (CPPPATH = ['.',
|
||||
'../blenloader',
|
||||
'#/intern/guardedalloc',
|
||||
'../blenlib',
|
||||
'../blenkernel',
|
||||
|
||||
@ -8,6 +8,7 @@ source_files = ['intern/pluginapi.c']
|
||||
|
||||
blenplugin_env.Append (CPPPATH = ['.',
|
||||
'..',
|
||||
'../blenpluginapi',
|
||||
'#/intern/guardedalloc',
|
||||
'../blenlib',
|
||||
'../imbuf',
|
||||
|
||||
@ -34,6 +34,7 @@ source_files = ['intern/allocimbuf.c',
|
||||
'intern/writeimage.c']
|
||||
|
||||
imbuf_env.Append (CPPPATH = ['.',
|
||||
'../imbuf',
|
||||
'../makesdna',
|
||||
'#/intern/guardedalloc',
|
||||
'../blenlib',
|
||||
|
||||
@ -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'])
|
||||
|
||||
@ -11,6 +11,7 @@ source_files = ['apple/quicktime_import.c',
|
||||
'apple/quicktime_export.c']
|
||||
|
||||
quicktime_env.Append (CPPPATH = ['.',
|
||||
'../quicktime',
|
||||
'../makesdna',
|
||||
'#/intern/guardedalloc',
|
||||
'../blenlib',
|
||||
|
||||
@ -7,6 +7,8 @@ readblenfile_env = library_env.Copy ()
|
||||
source_files = ['intern/BLO_readblenfile.c']
|
||||
|
||||
readblenfile_env.Append (CPPPATH = ['.',
|
||||
|
||||
'../readblenfile',
|
||||
'../readstreamglue',
|
||||
'../blenloader',
|
||||
'../blenloader/intern',
|
||||
|
||||
@ -7,6 +7,7 @@ renderconv_env = library_env.Copy ()
|
||||
source_files = ['intern/convertBlenderScene.c']
|
||||
|
||||
renderconv_env.Append (CPPPATH = ['.',
|
||||
'../renderconverter',
|
||||
'../blenlib',
|
||||
'../yafray',
|
||||
'../radiosity/extern/include',
|
||||
|
||||
Loading…
Reference in New Issue
Block a user