diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-09-27 23:51:50 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-09-27 23:52:22 +0300 |
| commit | 05f1bf896661cf0127ca9bd9ea282d46b724db75 (patch) | |
| tree | df26ff8b4cf347cda694cf48f292bf2d4abacc3c /scp2 | |
| parent | b3888e74956bcfe027e9903ff34e10d95b2bebb3 (diff) | |
No 64-bit QuickTime
Change-Id: Ie287d12c2142342fb89650bf715a2e12edabff78
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/InstallModule_ooo.mk | 3 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index 5ca6b6c97408..459cbf644564 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -166,6 +166,9 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\ $(if $(filter-out YES,$(WITH_MYSPELL_DICTS)),\ -DWITHOUT_MYSPELL_DICTS \ ) \ + $(if $(BITNESS_OVERRIDE),\ + -DBITNESS_OVERRIDE=$(BITNESS_OVERRIDE) \ + ) \ )) ifeq ($(DISABLE_PYTHON),TRUE) diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 13579efbe147..828c4765f13d 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -528,6 +528,7 @@ File gid_File_Lib_MacOSXSpell Dir = SCP2_OOO_BIN_DIR; End +#if !defined(BITNESS_OVERRIDE) || BITNESS_OVERRIDE==32 File gid_File_Lib_avmediaQuickTime LIB_FILE_BODY; Styles = (PACKED); @@ -535,6 +536,7 @@ File gid_File_Lib_avmediaQuickTime Dir = SCP2_OOO_BIN_DIR; End #endif +#endif #ifdef WNT SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fps_ODMA, fps_odma.uno ) |