diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-09-28 13:21:59 +0300 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-10-01 13:55:18 +0200 |
| commit | 8c2662b331993f32da64bd46d4180218f55f2653 (patch) | |
| tree | 6812857d56c812cc053932a2e5fb4055025896da /scp2 | |
| parent | ac9d8ed30b81bde14f67aff2c228d30085bfedd5 (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); |