diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2013-11-05 19:37:59 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2013-11-05 19:37:59 +0400 |
| commit | 78d8a1417467a27986b8f63d1aed2f27560a6acd (patch) | |
| tree | 8cdf212305b516048fed1fc80e423977a5a02d4e /source/blender/quicktime | |
| parent | a7253add34b6a35b65840d8653a86bf5f5c23f25 (diff) | |
OSX: complety remove the cocoa options, definitions and conditionals now
Diffstat (limited to 'source/blender/quicktime')
| -rw-r--r-- | source/blender/quicktime/SConscript | 7 | ||||
| -rw-r--r-- | source/blender/quicktime/apple/quicktime_export.c | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/source/blender/quicktime/SConscript b/source/blender/quicktime/SConscript index a6debf06226..7d726ed7c7a 100644 --- a/source/blender/quicktime/SConscript +++ b/source/blender/quicktime/SConscript @@ -58,8 +58,5 @@ priorities = [200,235] 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 + diff --git a/source/blender/quicktime/apple/quicktime_export.c b/source/blender/quicktime/apple/quicktime_export.c index 52ef21e4f39..67be8b169c6 100644 --- a/source/blender/quicktime/apple/quicktime_export.c +++ b/source/blender/quicktime/apple/quicktime_export.c @@ -890,7 +890,7 @@ static int ED_operator_setqtcodec(bContext *C) 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 @@ void SCENE_OT_render_data_set_quicktime_codec(wmOperatorType *ot) 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; |