[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [61137] trunk/blender: OSX: complety remove the cocoa options, definitions and conditionals now
jens verwiebe
info at jensverwiebe.de
Tue Nov 5 16:38:00 CET 2013
Revision: 61137
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=61137
Author: jensverwiebe
Date: 2013-11-05 15:37:59 +0000 (Tue, 05 Nov 2013)
Log Message:
-----------
OSX: complety remove the cocoa options, definitions and conditionals now
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/SConstruct
trunk/blender/build_files/scons/tools/btools.py
trunk/blender/source/blender/quicktime/SConscript
trunk/blender/source/blender/quicktime/apple/quicktime_export.c
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2013-11-05 15:37:11 UTC (rev 61136)
+++ trunk/blender/CMakeLists.txt 2013-11-05 15:37:59 UTC (rev 61137)
@@ -380,7 +380,6 @@
add_definitions("-DMACOSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}")
endif()
- option(WITH_COCOA "Use Cocoa framework instead of deprecated Carbon" ON)
option(USE_QTKIT "Use QtKit instead of Carbon quicktime (needed for having partial quicktime for 64bit)" OFF)
option(WITH_LIBS10.5 "Use 10.5 libs (needed for 64bit builds)" OFF)
if(CMAKE_OSX_ARCHITECTURES MATCHES x86_64)
@@ -1612,47 +1611,40 @@
set(PLATFORM_LINKLIBS stdc++)
endif()
- if(WITH_COCOA)
- set(PLATFORM_CFLAGS "-pipe -funsigned-char -DGHOST_COCOA")
- set(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Cocoa -framework Carbon -framework AudioUnit -framework AudioToolbox -framework CoreAudio")
- if(USE_QTKIT)
- set(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -DUSE_QTKIT")
- set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QTKit")
- if(CMAKE_OSX_ARCHITECTURES MATCHES i386)
- set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QuickTime")
- # libSDL still needs 32bit carbon quicktime
- endif()
- elseif(WITH_CODEC_QUICKTIME)
+ set(PLATFORM_CFLAGS "-pipe -funsigned-char")
+ set(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Cocoa -framework Carbon -framework AudioUnit -framework AudioToolbox -framework CoreAudio")
+ if(USE_QTKIT)
+ set(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -DUSE_QTKIT")
+ set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QTKit")
+ if(CMAKE_OSX_ARCHITECTURES MATCHES i386)
set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QuickTime")
+ # libSDL still needs 32bit carbon quicktime
endif()
+ elseif(WITH_CODEC_QUICKTIME)
+ set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QuickTime")
+ endif()
- # XXX - SOME MAC DEV PLEASE TEST WITH THE SDK INSTALLED!
- # ALSO SHOULD BE MOVED INTO OWN MODULE WHEN FUNCTIONAL
- if(WITH_INPUT_NDOF)
- # This thread it *should* work and check the framework - campbell
- # http://www.cmake.org/pipermail/cmake/2005-December/007740.html
- find_library(3DCONNEXION_CLIENT_FRAMEWORK
- NAMES 3DconnexionClient
- )
- if(NOT 3DCONNEXION_CLIENT_FRAMEWORK)
- set(WITH_INPUT_NDOF OFF)
- endif()
+ # XXX - SOME MAC DEV PLEASE TEST WITH THE SDK INSTALLED!
+ # ALSO SHOULD BE MOVED INTO OWN MODULE WHEN FUNCTIONAL
+ if(WITH_INPUT_NDOF)
+ # This thread it *should* work and check the framework - campbell
+ # http://www.cmake.org/pipermail/cmake/2005-December/007740.html
+ find_library(3DCONNEXION_CLIENT_FRAMEWORK
+ NAMES 3DconnexionClient
+ )
+ if(NOT 3DCONNEXION_CLIENT_FRAMEWORK)
+ set(WITH_INPUT_NDOF OFF)
+ endif()
- if(WITH_INPUT_NDOF)
- set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -F/Library/Frameworks -weak_framework 3DconnexionClient")
- set(NDOF_INCLUDE_DIRS /Library/Frameworks/3DconnexionClient.framework/Headers )
- endif()
+ if(WITH_INPUT_NDOF)
+ set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -F/Library/Frameworks -weak_framework 3DconnexionClient")
+ set(NDOF_INCLUDE_DIRS /Library/Frameworks/3DconnexionClient.framework/Headers )
endif()
+ endif()
if(WITH_JACK)
set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -F/Library/Frameworks -weak_framework jackmp")
endif()
-
- else()
- set(PLATFORM_CFLAGS "-pipe -funsigned-char")
- set(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Carbon -framework AGL -framework AudioUnit -framework AudioToolbox -framework CoreAudio -framework QuickTime")
- set(WITH_INPUT_NDOF OFF) # unsupported
- endif()
if(WITH_PYTHON_MODULE OR WITH_PYTHON_FRAMEWORK)
set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} /Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/Python")# force cmake to link right framework
Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct 2013-11-05 15:37:11 UTC (rev 61136)
+++ trunk/blender/SConstruct 2013-11-05 15:37:59 UTC (rev 61137)
@@ -342,9 +342,6 @@
else:
env.Append(CCFLAGS=['-fopenmp'])
-if env['WITH_GHOST_COCOA'] == True:
- env.Append(CPPFLAGS=['-DGHOST_COCOA'])
-
if env['USE_QTKIT'] == True:
env.Append(CPPFLAGS=['-DUSE_QTKIT'])
Modified: trunk/blender/build_files/scons/tools/btools.py
===================================================================
--- trunk/blender/build_files/scons/tools/btools.py 2013-11-05 15:37:11 UTC (rev 61136)
+++ trunk/blender/build_files/scons/tools/btools.py 2013-11-05 15:37:59 UTC (rev 61137)
@@ -138,7 +138,6 @@
'WITHOUT_BF_PYTHON_INSTALL', 'WITHOUT_BF_PYTHON_UNPACK', 'WITH_BF_PYTHON_INSTALL_NUMPY',
'WITHOUT_BF_OVERWRITE_INSTALL',
'WITH_BF_OPENMP', 'BF_OPENMP', 'BF_OPENMP_LIBPATH', 'WITH_BF_STATICOPENMP', 'BF_OPENMP_STATIC_STATIC',
- 'WITH_GHOST_COCOA',
'WITH_GHOST_SDL',
'WITH_GHOST_XDND',
'WITH_X11_XINPUT',
@@ -424,7 +423,6 @@
('BF_OPENMP', 'Base path to OpenMP (used when cross-compiling with older versions of WinGW)', ''),
('BF_OPENMP_INC', 'Path to OpenMP includes (used when cross-compiling with older versions of WinGW)', ''),
('BF_OPENMP_LIBPATH', 'Path to OpenMP libraries (used when cross-compiling with older versions of WinGW)', ''),
- (BoolVariable('WITH_GHOST_COCOA', 'Use Cocoa-framework if true', True)),
(BoolVariable('WITH_GHOST_SDL', 'Enable building blender against SDL for windowing rather then the native APIs', False)),
(BoolVariable('WITH_X11_XINPUT', 'Enable X11 Xinput (tablet support and unicode input)', True)),
(BoolVariable('WITH_X11_XF86VMODE', 'Enable X11 video mode switching', True)),
Modified: trunk/blender/source/blender/quicktime/SConscript
===================================================================
--- trunk/blender/source/blender/quicktime/SConscript 2013-11-05 15:37:11 UTC (rev 61136)
+++ trunk/blender/source/blender/quicktime/SConscript 2013-11-05 15:37:59 UTC (rev 61137)
@@ -58,8 +58,5 @@
defs=['WITH_QUICKTIME']
-if env['WITH_GHOST_COCOA']:
- defs.append('GHOST_COCOA')
- env.BlenderLib ('bf_quicktime', sources=source_files, includes=incs, defines=defs, libtype=types, priority=priorities, cc_compilerchange='/usr/bin/gcc', cxx_compilerchange='/usr/bin/g++') # always use default-Apple-gcc for objC language, gnu-compilers do not support it fully yet
-else:
- env.BlenderLib ('bf_quicktime', sources=source_files, includes=incs, defines=defs, libtype=types, priority=priorities)
+env.BlenderLib ('bf_quicktime', sources=source_files, includes=incs, defines=defs, libtype=types, priority=priorities, cc_compilerchange='/usr/bin/gcc', cxx_compilerchange='/usr/bin/g++') # always use default-Apple-gcc for objC language, gnu-compilers do not support it fully yet
+
Modified: trunk/blender/source/blender/quicktime/apple/quicktime_export.c
===================================================================
--- trunk/blender/source/blender/quicktime/apple/quicktime_export.c 2013-11-05 15:37:11 UTC (rev 61136)
+++ trunk/blender/source/blender/quicktime/apple/quicktime_export.c 2013-11-05 15:37:59 UTC (rev 61137)
@@ -890,7 +890,7 @@
return G.have_quicktime != FALSE;
}
-#if defined(__APPLE__) && defined(GHOST_COCOA)
+#if defined(__APPLE__)
/* Need to set up a Cocoa NSAutoReleasePool to avoid memory leak
* And it must be done in an objC file, so use a GHOST_SystemCocoa.mm function for that */
extern int cocoa_request_qtcodec_settings_exec(bContext *C, wmOperator *op);
@@ -910,7 +910,7 @@
ot->idname = "SCENE_OT_render_data_set_quicktime_codec";
/* api callbacks */
-#if defined(__APPLE__) && defined(GHOST_COCOA)
+#if defined(__APPLE__)
ot->exec = cocoa_request_qtcodec_settings_exec;
#else
ot->exec = request_qtcodec_settings_exec;
More information about the Bf-blender-cvs
mailing list