From 8c2662b331993f32da64bd46d4180218f55f2653 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Fri, 28 Sep 2012 13:21:59 +0300
Subject: No need for BITNESS_OVERRIDE in makefilery as CPU etc work fine

Change-Id: I59f4d5ad275af62c997723908754112c062a31be
---
 scp2/InstallModule_ooo.mk            | 3 ---
 scp2/source/ooo/file_library_ooo.scp | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

(limited to 'scp2')

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);
-- 
cgit v1.2.3