diff options
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | scp2/source/extensions/directory_extensions.scp | 2 | ||||
| -rw-r--r-- | scp2/source/extensions/file_extensions.scp | 2 | ||||
| -rw-r--r-- | scp2/source/extensions/module_extensions.scp | 2 | ||||
| -rw-r--r-- | sdext/Module_sdext.mk | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index eecd4d4911a0..d82828866e53 100644 --- a/configure.ac +++ b/configure.ac @@ -10230,11 +10230,11 @@ AC_SUBST(ENABLE_OPENCL) AC_MSG_CHECKING([whether to build the Presentation Minimizer extension]) if test "x$enable_ext_presenter_minimizer" != "xno" -a "x$enable_extension_integration" != "xno"; then AC_MSG_RESULT([yes]) - ENABLE_MINIMIZER=YES + ENABLE_MINIMIZER=TRUE + SCPDEFS="$SCPDEFS -DWITH_EXTENSION_MINIMIZER" else AC_MSG_RESULT([no]) - ENABLE_MINIMIZER=NO - SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_MINIMIZER" + ENABLE_MINIMIZER= fi AC_SUBST(ENABLE_MINIMIZER) diff --git a/scp2/source/extensions/directory_extensions.scp b/scp2/source/extensions/directory_extensions.scp index 75951f2eadc0..ebad203e6567 100644 --- a/scp2/source/extensions/directory_extensions.scp +++ b/scp2/source/extensions/directory_extensions.scp @@ -24,7 +24,7 @@ /* ** Presentation Minimizer ** */ -#ifndef WITHOUT_EXTENSION_MINIMIZER +#ifdef WITH_EXTENSION_MINIMIZER Directory gid_Brand_Dir_Share_Extensions_Presentation_Minimizer ParentID = gid_Brand_Dir_Share_Extensions; diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp index 29ecc21e0b32..01ea8b184ffe 100644 --- a/scp2/source/extensions/file_extensions.scp +++ b/scp2/source/extensions/file_extensions.scp @@ -24,7 +24,7 @@ /* ** Presentation Minimizer ** */ -#ifndef WITHOUT_EXTENSION_MINIMIZER +#ifdef WITH_EXTENSION_MINIMIZER File gid_File_Oxt_Presentation_Minimizer TXT_FILE_BODY; diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp index 1c7c7c7cd19e..c024341676b6 100644 --- a/scp2/source/extensions/module_extensions.scp +++ b/scp2/source/extensions/module_extensions.scp @@ -33,7 +33,7 @@ End /* ** Presentation Minimizer ** */ -#ifndef WITHOUT_EXTENSION_MINIMIZER +#ifdef WITH_EXTENSION_MINIMIZER Module gid_Module_Optional_Extensions_MINIMIZER PackageInfo = "packinfo_extensions.txt"; MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_MINIMIZER); diff --git a/sdext/Module_sdext.mk b/sdext/Module_sdext.mk index 60d74fcfe0ac..c6e48d6d38a3 100644 --- a/sdext/Module_sdext.mk +++ b/sdext/Module_sdext.mk @@ -13,7 +13,7 @@ $(eval $(call gb_Module_add_targets,sdext,\ Library_PresenterScreen \ )) -ifeq ($(ENABLE_MINIMIZER),YES) +ifeq ($(ENABLE_MINIMIZER),TRUE) $(eval $(call gb_Module_add_targets,sdext,\ Configuration_minimizer \ Extension_minimizer \ |