summaryrefslogtreecommitdiff
path: root/sccomp
diff options
context:
space:
mode:
authorPeter Foley <pefoley2@verizon.net>2012-11-03 19:19:30 -0400
committerPeter Foley <pefoley2@verizon.net>2012-11-03 19:52:07 -0400
commit93e2c4a9d257ebbe794fbaba888229857e7c42d8 (patch)
tree6edb48bc971b3ac6240f0f9ed7ebf56eb443a06d /sccomp
parentbdcdbf5da0aa17f7a347ab25b5f6e0b1bea87d62 (diff)
convert lpsolve to gbuild
Change-Id: I0038b21a1b3bde4d8d3f5dd0092d15d858336680
Diffstat (limited to 'sccomp')
-rw-r--r--sccomp/Library_solver.mk2
-rw-r--r--sccomp/source/solver/solver.cxx4
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"