diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-12-05 09:50:36 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-12-05 09:50:36 +0100 |
| commit | 4565afec9e87090aef6ced9ae582910e4c46d2d9 (patch) | |
| tree | 14d715117e01fa3f8077d9e2b2d9ac34c374881c /scp2/InstallModule_ooo.mk | |
| parent | d9cf110dae8030c93c4cc7909b30c779b523359f (diff) | |
Clean up scp2 flags
Change-Id: Ib4f5c28478d24a97131b6d9b3b1539d4982f762d
Diffstat (limited to 'scp2/InstallModule_ooo.mk')
| -rw-r--r-- | scp2/InstallModule_ooo.mk | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index 95ea166edf2c..a9c272e539a3 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -33,6 +33,8 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ ENABLE_CAIRO_CANVAS \ ENABLE_DIRECTX \ ENABLE_EVOAB2 \ + ENABLE_GSTREAMER \ + ENABLE_GSTREAMER_0_10 \ ENABLE_GTK \ ENABLE_GTK3 \ ENABLE_KAB \ @@ -76,6 +78,8 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ SYSTEM_REDLAND \ SYSTEM_SNDFILE \ SYSTEM_STDLIBS \ + WITH_MOZAB4WIN \ + WITH_MYSPELL_DICTS \ )) $(eval $(call gb_InstallModule_define_value_if_set,scp2/ooo,\ @@ -133,27 +137,12 @@ $(eval $(call gb_InstallModule_define_mingw_dll_if_set,scp2/ooo,\ )) $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\ - $(if $(filter gcj,$(JDK)),\ - -DGCJ \ - ) \ - $(if $(filter TRUE,$(ENABLE_GSTREAMER)),\ - -DGSTREAMER \ - ) \ - $(if $(filter TRUE,$(ENABLE_GSTREAMER_0_10)),\ - -DGSTREAMER_0_10 \ - ) \ $(if $(WINDOWS_SDK_HOME),\ -DHAVE_WINDOWS_SDK \ ) \ $(if $(filter YES,$(SYSTEM_HSQLDB)),\ -DHSQLDB_JAR=\""$(call gb_Helper_make_path,$(HSQLDB_JAR))"\" \ ) \ - $(if $(filter YES,$(WITH_MOZAB4WIN)),\ - -DWITH_MOZAB4WIN \ - ) \ - $(if $(filter-out YES,$(WITH_MYSPELL_DICTS)),\ - -DWITHOUT_MYSPELL_DICTS \ - ) \ )) ifeq ($(DISABLE_PYTHON),TRUE) |