From e7e8939f03940806ec3941578a101de4ade15a66 Mon Sep 17 00:00:00 2001 From: Niklas Nebel Date: Fri, 21 Dec 2007 08:32:37 +0000 Subject: #i8808# build on macosx --- lpsolve/makefile.mk | 9 +++++++-- lpsolve/prj/d.lst | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk index 7cbf9f1c08a5..f6fcea8dd06a 100644 --- a/lpsolve/makefile.mk +++ b/lpsolve/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: nn $ $Date: 2007-11-23 21:29:22 $ +# last change: $Author: nn $ $Date: 2007-12-21 09:32:37 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -63,6 +63,10 @@ BUILD_ACTION=cmd /c cvc6.bat OUT2BIN=$(BUILD_DIR)$/lpsolve55.dll OUT2LIB=$(BUILD_DIR)$/lpsolve55.lib .ELSE +.IF "$(OS)"=="MACOSX" +BUILD_ACTION=sh ccc.osx +OUT2LIB=$(BUILD_DIR)$/liblpsolve55.dylib +.ELSE .IF "$(COMNAME)"=="sunpro5" BUILD_ACTION=sh ccc.solaris .ELSE @@ -70,6 +74,7 @@ BUILD_ACTION=sh ccc .ENDIF OUT2LIB=$(BUILD_DIR)$/liblpsolve55.so .ENDIF +.ENDIF OUT2INC=lp_lib.h lp_types.h lp_utils.h lp_Hash.h lp_matrix.h lp_mipbb.h lp_SOS.h diff --git a/lpsolve/prj/d.lst b/lpsolve/prj/d.lst index d094968a6100..89980655e68d 100644 --- a/lpsolve/prj/d.lst +++ b/lpsolve/prj/d.lst @@ -2,6 +2,7 @@ mkdir: %_DEST%\inc%_EXT%\lpsolve ..\%__SRC%\inc\lp_*.h %_DEST%\inc%_EXT%\lpsolve\* ..\%__SRC%\lib\liblpsolve55.so %_DEST%\lib%_EXT%\liblpsolve55.so +..\%__SRC%\lib\liblpsolve55.dylib %_DEST%\lib%_EXT%\liblpsolve55.dylib ..\%__SRC%\lib\lpsolve55.lib %_DEST%\lib%_EXT%\lpsolve55.lib ..\%__SRC%\bin\lpsolve55.dll %_DEST%\bin%_EXT%\lpsolve55.dll -- cgit