diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-09-28 13:21:59 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-09-29 08:16:31 +0300 |
| commit | 4671e25d99bb2ad0f4f8f68c25fcc1bfce9e79b8 (patch) | |
| tree | d24cb643497867e9ac2b5057e2d6c9e145e209bf /scp2 | |
| parent | 0919d45d514642ed6cc62fe20227a99295a09d40 (diff) | |
No need for BITNESS_OVERRIDE in makefilery as CPU etc work fine
Change-Id: I59f4d5ad275af62c997723908754112c062a31be
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, 1 insertions, 4 deletions
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index 459cbf644564..5ca6b6c97408 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -166,9 +166,6 @@ $(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 828c4765f13d..3cc740ba3daa 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -528,7 +528,7 @@ File gid_File_Lib_MacOSXSpell Dir = SCP2_OOO_BIN_DIR; End -#if !defined(BITNESS_OVERRIDE) || BITNESS_OVERRIDE==32 +#ifndef X86_64 File gid_File_Lib_avmediaQuickTime LIB_FILE_BODY; Styles = (PACKED); |