diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-05-15 19:53:07 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-05-15 19:53:07 +0300 |
| commit | 9986f236d6b56ad773adfbc2107bfc1c6bd181d0 (patch) | |
| tree | 5ab39c9fe5924809fb1b5df0547105d9d1d54eb8 /scp2 | |
| parent | 2a9018b9f52bd90396912a8cb49925646eeb3485 (diff) | |
Don't reference the avmediaMacAVF library if not built
Change-Id: If4f5c51e986b51f5795012b9535ab7a7ea51337b
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/InstallModule_ooo.mk | 3 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index 4396ef4f2a8f..4564c72cd1ba 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -69,6 +69,9 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\ $(if $(SYSTEM_HSQLDB),\ -DHSQLDB_JAR=\""$(call gb_Helper_make_path,$(HSQLDB_JAR))"\" \ ) \ + $(if $(MACOSX_SDK_VERSION),\ + -DMACOSX_SDK_VERSION=$(MACOSX_SDK_VERSION) \ + ) \ $(if $(filter MSC,$(COM)),$(if $(MSVC_USE_DEBUG_RUNTIME),-DMSVC_PKG_DEBUG_RUNTIME)) \ )) diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 81ad4de3d2a6..fa610872e05c 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -107,11 +107,16 @@ File gid_File_Lib_avmediaQuickTime Name = LIBNAME(avmediaQuickTime); End +#if MAXOSX_SDK_VERSION >= 1070 +#ifdef X86_64 File gid_File_Lib_avmediaMacAVF PACKED_LIB_FILE_BODY; Name = LIBNAME(avmediaMacAVF); End #endif +#endif + +#endif #if defined(MACOSX) File gid_File_Lib_Basebmp |