diff options
| author | Peter Foley <pefoley2@verizon.net> | 2012-11-03 19:19:30 -0400 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-11-07 22:33:48 +0000 |
| commit | 085346f80da394ad5008f40679a0d3519f7a82a3 (patch) | |
| tree | 2bce02d30a8fca7679e92bca7d6a8cc94a31dee6 /sccomp | |
| parent | 74abeff02b750fb22fc3d56299abc2cd12d357d3 (diff) | |
convert lpsolve to gbuild
Change-Id: I0038b21a1b3bde4d8d3f5dd0092d15d858336680
Reviewed-on: https://gerrit.libreoffice.org/1002
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sccomp')
| -rw-r--r-- | sccomp/Library_solver.mk | 2 | ||||
| -rw-r--r-- | sccomp/source/solver/solver.cxx | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk index 578bd8824bc5..52f99ccc980f 100644 --- a/sccomp/Library_solver.mk +++ b/sccomp/Library_solver.mk @@ -41,7 +41,7 @@ $(eval $(call gb_Library_use_libraries,solver,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_use_external,solver,lpsolve55)) +$(eval $(call gb_Library_use_external,solver,lpsolve)) $(eval $(call gb_Library_add_exception_objects,solver,\ sccomp/source/solver/solver \ diff --git a/sccomp/source/solver/solver.cxx b/sccomp/source/solver/solver.cxx index fa506953d3d4..8e92c9ab9c96 100644 --- a/sccomp/source/solver/solver.cxx +++ b/sccomp/source/solver/solver.cxx @@ -30,7 +30,11 @@ #define WINAPI __stdcall #define LoadInverseLib FALSE #define LoadLanguageLib FALSE +#ifdef SYSTEM_LPSOLVE #include <lpsolve/lp_lib.h> +#else +#include <lp_lib.h> +#endif #undef LANGUAGE_NONE #include "solver.hxx" |