From 1206b0a117afc2299047ebd33392084658e60bf8 Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Thu, 20 Dec 2012 12:35:12 +0000 Subject: [PATCH] Update lpsolve55j library (for Win). git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6246 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/ext/lp_solve_5.5_java/Makefile | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/prism/ext/lp_solve_5.5_java/Makefile b/prism/ext/lp_solve_5.5_java/Makefile index 802d3a6e..b203304e 100644 --- a/prism/ext/lp_solve_5.5_java/Makefile +++ b/prism/ext/lp_solve_5.5_java/Makefile @@ -17,13 +17,6 @@ checks: lpsolve55java: @echo Making sure lpsolve55 Java wrapper is compatible with $(OSTYPE) $(EARCH) - @(if [ "$(OSTYPE)" = "darwin" ]; then \ - echo "Rebuild lpsolve55 Java wrapper for MacOS"; \ - pushd lib/mac/ ; \ - sh build-osx; \ - popd; \ - cp lib/lpsolve55j.jar lib/mac/liblpsolve55j.jnilib ../../lib/ ; \ - fi) @(if [ "$(OSTYPE)" = "linux" ]; then \ echo "Rebuild lpsolve55 Java wrapper for Linux"; \ pushd lib/ ; \ @@ -35,6 +28,16 @@ lpsolve55java: cp lib/lpsolve55j.jar lib/ux64/liblpsolve55j.so ../../lib/ ; \ fi; \ fi) + @(if [ "$(OSTYPE)" = "darwin" ]; then \ + echo "Rebuild lpsolve55 Java wrapper for MacOS"; \ + pushd lib/mac/ ; \ + sh build-osx; \ + popd; \ + cp lib/lpsolve55j.jar lib/mac/liblpsolve55j.jnilib ../../lib/ ; \ + fi) + @(if [ "$(OSTYPE)" = "cygwin" ]; then \ + cp lib/lpsolve55j.jar lib/win32/lpsolve55j.dll ../../lib/ ; \ + fi) clean: checks rm -f $(LPSOLVE55JAVA_DIR)/lib/lpsolve55j.jar