diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-19 05:49:58 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-19 05:49:58 +0400 |
| commit | d433cd65f7127d60e17d05a824290423ad226eae (patch) | |
| tree | f0a9c821f6046e97b74c6969d41269b558fd52ab /SConstruct | |
| parent | 10f0f66560234a04aed3295c74fff20adacbc57f (diff) | |
| parent | f10dea7e3b9b431edae9c787fa1a9e09cd567ed7 (diff) | |
Merged changes in the trunk up to revision 53146.
Conflicts resolved:
release/datafiles/startup.blend
source/blender/blenkernel/CMakeLists.txt
source/blender/blenlib/intern/bpath.c
source/blender/blenloader/intern/readfile.c
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct index c2bae0459ca..4630b7b8c87 100644 --- a/SConstruct +++ b/SConstruct @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # The Original Code is Copyright (C) 2006, Blender Foundation # All rights reserved. @@ -294,7 +294,8 @@ if env['OURPLATFORM']=='darwin': print "3D_CONNEXION_CLIENT_LIBRARY not found, disabling WITH_BF_3DMOUSE" # avoid build errors ! env['WITH_BF_3DMOUSE'] = 0 else: - env.Append(LINKFLAGS=['-Xlinker','-weak_framework','-Xlinker','3DconnexionClient']) + env.Append(LINKFLAGS=['-F/Library/Frameworks','-Xlinker','-weak_framework','-Xlinker','3DconnexionClient']) + env['BF_3DMOUSE_INC'] = '/Library/Frameworks/3DconnexionClient.framework/Headers' # for now, Mac builders must download and install the JackOSX framework # necessary header file lives here when installed: @@ -304,7 +305,7 @@ if env['OURPLATFORM']=='darwin': print "JackOSX install not found, disabling WITH_BF_JACK" # avoid build errors ! env['WITH_BF_JACK'] = 0 else: - env.Append(LINKFLAGS=['-Xlinker','-weak_framework','-Xlinker','Jackmp']) + env.Append(LINKFLAGS=['-L/Library/Frameworks','-Xlinker','-weak_framework','-Xlinker','Jackmp']) if env['WITH_BF_CYCLES_OSL'] == 1: OSX_OSL_LIBPATH = Dir(env.subst(env['BF_OSL_LIBPATH'])).abspath @@ -531,7 +532,8 @@ data_to_c_simple("release/datafiles/bfont.ttf") data_to_c_simple("release/datafiles/bmonofont.ttf") data_to_c_simple("release/datafiles/splash.png") -data_to_c_simple("release/datafiles/blender_icons.png") +data_to_c_simple("release/datafiles/blender_icons16.png") +data_to_c_simple("release/datafiles/blender_icons32.png") data_to_c_simple("release/datafiles/prvicons.png") data_to_c_simple("release/datafiles/brushicons/add.png") |