diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-11-04 16:27:25 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-11-04 16:33:21 -0600 |
| commit | 1b61693a154bb9c2a2de5e2646893b087eb8f9f4 (patch) | |
| tree | 2d7c7f6d0845051c9df45cafb2bd497594c22be1 /sccomp | |
| parent | c4c160a4519f20d50e7189ef92aac99b83c4cc6a (diff) | |
Enough with that...
peter's gbuildifications caused and ocean of red, that
1/ was not followed up by any attempt by the author to fix
2/ I wasted a good part of the weekend to de-entangle with
only partial sucess
reverting the whole mess for now...
to be resubmited when a bit less borked...
This reverts commit c4c160a4519f20d50e7189ef92aac99b83c4cc6a.
This reverts commit faef2e51d0c7b74334a11400b205daf382805780.
This reverts commit 057ce1fe2911f51be97199bf95e175db8aebfa42.
This reverts commit a7d34af344900233ba08aee2a56a3daf85ab2421.
This reverts commit befae0ceb80deb4623f3e41ff88b6dcb63eca0ad.
This reverts commit 433b43bcd2dbd146a9d6342fab0704d653c50d29.
This reverts commit 93e2c4a9d257ebbe794fbaba888229857e7c42d8.
Diffstat (limited to 'sccomp')
| -rw-r--r-- | sccomp/Library_solver.mk | 2 | ||||
| -rw-r--r-- | sccomp/source/solver/solver.cxx | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk index 52f99ccc980f..578bd8824bc5 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,lpsolve)) +$(eval $(call gb_Library_use_external,solver,lpsolve55)) $(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 8e92c9ab9c96..fa506953d3d4 100644 --- a/sccomp/source/solver/solver.cxx +++ b/sccomp/source/solver/solver.cxx @@ -30,11 +30,7 @@ #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" |