diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2013-06-04 14:02:48 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-06-04 17:45:42 +0100 |
| commit | c32c11fbd49e0194534be9d21c22da6799728be3 (patch) | |
| tree | 2ce05f2cd61416625dc31d7d9ff7fb278b8c4fb1 /scp2 | |
| parent | ea9b4a69469cbd8bdbbd972638612632adf31d66 (diff) | |
MPLv2 subset improvements.
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/InstallModule_calc.mk | 1 | ||||
| -rw-r--r-- | scp2/InstallModule_ooo.mk | 1 | ||||
| -rw-r--r-- | scp2/source/calc/file_calc.scp | 8 |
3 files changed, 8 insertions, 2 deletions
diff --git a/scp2/InstallModule_calc.mk b/scp2/InstallModule_calc.mk index d91b1fe9931e..dba59607002b 100644 --- a/scp2/InstallModule_calc.mk +++ b/scp2/InstallModule_calc.mk @@ -10,6 +10,7 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/calc)) $(eval $(call gb_InstallModule_define_if_set,scp2/calc,\ + ENABLE_LPSOLVE \ SYSTEM_LPSOLVE \ )) diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index 40cdafc335c7..b8c6130ea196 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -31,6 +31,7 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ ENABLE_KDE \ ENABLE_KDE4 \ ENABLE_LIBLANGTAG \ + ENABLE_LPSOLVE \ ENABLE_NPAPI_FROM_BROWSER \ ENABLE_NPAPI_INTO_BROWSER \ ENABLE_ONLINE_UPDATE \ diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp index 91bcc94d06ef..115681b9c901 100644 --- a/scp2/source/calc/file_calc.scp +++ b/scp2/source/calc/file_calc.scp @@ -43,8 +43,6 @@ STD_LIB_FILE( gid_File_Lib_Scfilt, scfilt) STD_LIB_FILE( gid_File_Lib_Scd, scd) -STD_RES_FILE( gid_File_Res_Solver, solver) - STD_RES_FILE( gid_File_Res_Analysis, analysis) STD_RES_FILE( gid_File_Res_Date, date) @@ -70,9 +68,15 @@ File gid_File_Exe_Scalc End #endif +#if defined(ENABLE_LPSOLVE) + +STD_RES_FILE( gid_File_Res_Solver, solver) + #if ! defined (SYSTEM_LPSOLVE) File gid_File_Lib_Lpsolve PACKED_LIB_FILE_BODY; Name = SPECIAL_NAME(lpsolve55); End #endif + +#endif |