updates to the OS X build system :
authorJean-Luc Peurière <jlp@nerim.net>
Thu, 4 Aug 2005 16:05:28 +0000 (16:05 +0000)
committerJean-Luc Peurière <jlp@nerim.net>
Thu, 4 Aug 2005 16:05:28 +0000 (16:05 +0000)
- 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

18 files changed:
SConstruct
intern/SoundSystem/SConscript
intern/bmfont/SConscript
intern/container/SConscript
intern/ghost/SConscript
intern/guardedalloc/SConscript
intern/memutil/SConscript
intern/string/SConscript
source/blender/avi/SConscript
source/blender/blenkernel/SConscript
source/blender/blenlib/SConscript
source/blender/blenloader/SConscript
source/blender/blenpluginapi/SConscript
source/blender/imbuf/SConscript
source/blender/makesdna/intern/SConscript
source/blender/quicktime/SConscript
source/blender/readblenfile/SConscript
source/blender/renderconverter/SConscript

index d6d1678c2946d9909cacc19e62eda2cc9daf4667..06d49f1000cc3204b45c619ce13183d2d8c19572 100644 (file)
@@ -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']
index 7652ac92db66254a95973aa569b17843bc3b0ca5..0ff757b54a70714bda82b7a1dd1a9cc307eac1c7 100644 (file)
@@ -21,6 +21,7 @@ source_files = ['dummy/SND_DummyDevice.cpp',
                 'intern/SND_WaveSlot.cpp']
 
 soundsys_env.Append (CPPPATH = ['.',
+                                '../SoundSystem',
                                 'intern',
                                 '../moto/include',
                                 '../string',
index e35b1df3738079b431c6dd3e28b59fd6cf4caf1a..3c2bf973c14f6c7c1a566c1505c962698e7d1514 100644 (file)
@@ -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'])
index b45a2af07e1b80fc4331157b3491ee76e5cee1aa..a7e7c7d39e7f1878066c37c686f252e65823fa70 100644 (file)
@@ -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)
index 8a82b0dfd87ba68de76ee5aafbf52764164876cd..23a741bb3b9102aa6ed0e3c454508f9db2cc8d15 100644 (file)
@@ -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'])
index 7d89e02faf435489bc8cb83767b2cc6cffc21475..4044aa82e4f0d9cc1694a9da3cdbb8dcb96722f7 100644 (file)
@@ -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)
index dd4412e98bcb639fcd0829d4956b1c3d2cca2828..febb6364a0535e17947247d024c184d17cded87c 100644 (file)
@@ -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)
index 1644a14718f6541f3f9b9d2302487bc49743b787..16833832d0dba469178a84d22610e5632427d4fe 100644 (file)
@@ -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)
index 9311999e123cec5ff257679bc5aaede080bde6fe..56eaff26f0f535c0608e82415e772f6523460ef5 100644 (file)
@@ -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'])
index a71063f8038ef378f936c3703ab914642e711c25..620890ba7c3deecc3348a13fb9fe70f9fb15c124 100644 (file)
@@ -46,6 +46,7 @@ source_files = ['intern/constraint.c',
                 'intern/texture.c']
 
 blenkernel_env.Append (CPPPATH = ['.',
+                                  '../blenkernel',
                                   '#/intern/guardedalloc',
                                   '../include',
                                   '../blenlib',
index f9f7012c17cb53103cd3ea4b0dc30277f5fe9f75..a4882587618a8b0c271f31589adcda4e65fdbf13 100644 (file)
@@ -28,6 +28,7 @@ source_files = ['intern/BLI_dynstr.c',
 
 
 blenlib_env.Append (CPPPATH = ['.',
+                               '../blenlib',
                                '../makesdna',
                                '../blenkernel',
                                '#/intern/guardedalloc',
index fa380bc791b1ed2bcce5140e876c8d1c1832a825..62a652e41746af1a97108053a4f4f71995fced19 100644 (file)
@@ -11,6 +11,7 @@ source_files = ['intern/genfile.c',
                 'intern/writefile.c']
 
 blenloader_env.Append (CPPPATH = ['.',
+                                  '../blenloader',
                                   '#/intern/guardedalloc',
                                   '../blenlib',
                                   '../blenkernel',
index 42d4bd5bb5a6332dd46a6d5b1727280fe7cf7c81..21b89b74d243c77294c7b1270723c1905f95d787 100644 (file)
@@ -8,6 +8,7 @@ source_files = ['intern/pluginapi.c']
 
 blenplugin_env.Append (CPPPATH = ['.',
                                   '..',
+                                  '../blenpluginapi',
                                   '#/intern/guardedalloc',
                                   '../blenlib',
                                   '../imbuf',
index 11d7cfb2b30854dda0a014fba71e98351c5913d6..94b8846c7691c31fb4a96a958c5ff8d8c9257d8f 100644 (file)
@@ -34,6 +34,7 @@ source_files = ['intern/allocimbuf.c',
                 'intern/writeimage.c']
 
 imbuf_env.Append (CPPPATH = ['.',
+                             '../imbuf',
                              '../makesdna',
                              '#/intern/guardedalloc',
                              '../blenlib',
index 378f2492e3c1e2537cf478cfbf9bf33de4751fad..e30f14f69cece5d8cf1dba253a75a70237653c6e 100644 (file)
@@ -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'])
index 80d3192bfe2f42ba4606ac983910a3449468fa70..f47611bbb139bc922c097ae8346fcdc77cb1bba0 100644 (file)
@@ -11,6 +11,7 @@ source_files = ['apple/quicktime_import.c',
                 'apple/quicktime_export.c']
 
 quicktime_env.Append (CPPPATH = ['.',
+                                 '../quicktime',
                                  '../makesdna',
                                  '#/intern/guardedalloc',
                                  '../blenlib',
index 751bc100a97c86c15148d569874a4b48fe17cd12..1f0909b1f84201135df2efec99361337b0bf9c69 100644 (file)
@@ -7,6 +7,8 @@ readblenfile_env = library_env.Copy ()
 source_files = ['intern/BLO_readblenfile.c']
 
 readblenfile_env.Append (CPPPATH = ['.',
+
+'../readblenfile',
                                                                        '../readstreamglue',
                                                                        '../blenloader',
                                                                        '../blenloader/intern',
index f0da2bd5f1fdb08714a9ca85e10f5c4e7833c030..e0f777d59bf020784917df5a88ad2858cad55046 100644 (file)
@@ -7,6 +7,7 @@ renderconv_env = library_env.Copy ()
 source_files = ['intern/convertBlenderScene.c']
 
 renderconv_env.Append (CPPPATH = ['.',
+                                  '../renderconverter',
                                   '../blenlib',
                                   '../yafray',
                                   '../radiosity/extern/include',