diff options
| author | Andras Timar <atimar@suse.com> | 2012-11-11 18:24:14 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-11-11 18:24:14 +0100 |
| commit | 06ec1c089519ef3249464aa09eadf03a8db93a39 (patch) | |
| tree | 85b2eb6d8ba6ca95e18e1ff82151224cb14106f6 /sccomp | |
| parent | 8e0d67bed54633d555a4601a5d79e2d5ba7ab2bb (diff) | |
| parent | 3f899eae02eaad0b967de749fe09b869ba93ad6d (diff) | |
Merge branch 'master' into feature/killsdf
Conflicts:
Repository.mk
RepositoryFixes.mk
connectivity/prj/build.lst
extensions/prj/build.lst
filter/prj/build.lst
fpicker/prj/build.lst
l10ntools/StaticLibrary_transex.mk
saxon/build.xml
shell/prj/build.lst
solenv/gbuild/AllLangResTarget.mk
solenv/gbuild/Configuration.mk
solenv/gbuild/UI.mk
ucb/source/ucp/webdav/webdavcontent.cxx
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" |