diff options
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/InstallModule_calc.mk | 7 | ||||
| -rw-r--r-- | scp2/InstallModule_ooo.mk | 1 | ||||
| -rw-r--r-- | scp2/source/calc/file_calc.scp | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/scp2/InstallModule_calc.mk b/scp2/InstallModule_calc.mk index 2c41acd8b028..b64ae2abac10 100644 --- a/scp2/InstallModule_calc.mk +++ b/scp2/InstallModule_calc.mk @@ -12,11 +12,16 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/calc)) $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/calc,calc)) $(eval $(call gb_InstallModule_define_if_set,scp2/calc,\ - ENABLE_LPSOLVE \ ENABLE_MACOSX_MACLIKE_APP_STRUCTURE \ ENABLE_MACOSX_SANDBOX \ )) +ifneq (,$(WITH_LPSOLVER)) +$(eval $(call gb_InstallModule_add_defs,scp2/calc,\ + -DWITH_LPSOLVER \ +)) +endif + $(eval $(call gb_InstallModule_add_templates,scp2/calc,\ scp2/source/templates/module_langpack_calc \ )) diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index 5f149c3a0c2a..63d8b1bc1748 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -24,7 +24,6 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ ENABLE_GTK \ ENABLE_KDE \ ENABLE_LIBLANGTAG \ - ENABLE_LPSOLVE \ ENABLE_MACOSX_MACLIKE_APP_STRUCTURE \ ENABLE_MACOSX_SANDBOX \ ENABLE_NPAPI_FROM_BROWSER \ diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp index 371a08ff1030..c3d2ed2b4ab6 100644 --- a/scp2/source/calc/file_calc.scp +++ b/scp2/source/calc/file_calc.scp @@ -50,7 +50,7 @@ File gid_File_Exe_Scalc End #endif -#if defined(ENABLE_LPSOLVE) +#if defined(WITH_LPSOLVER) STD_RES_FILE( gid_File_Res_Solver, solver) |