diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-02-12 15:04:29 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-02-12 15:04:29 +0000 |
| commit | 6305e40668403dabac8c8e7f6d923528372c0d6c (patch) | |
| tree | c935474e51bcafb21ff353dd571e1affbf7dd2ce /lpsolve | |
| parent | 191a601568fe297387ac5798c6986734e1d14a27 (diff) | |
INTEGRATION: CWS mingwport11 (1.3.2); FILE MERGED
2008/02/11 14:47:06 vg 1.3.2.1: #i85952# catch-up fix for mingwport
Diffstat (limited to 'lpsolve')
| -rw-r--r-- | lpsolve/makefile.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk index f6fcea8dd06a..0c6c1cf760c0 100644 --- a/lpsolve/makefile.mk +++ b/lpsolve/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: nn $ $Date: 2007-12-21 09:32:37 $ +# last change: $Author: vg $ $Date: 2008-02-12 16:04:29 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -59,9 +59,13 @@ CONFIGURE_FLAGS= BUILD_DIR=lpsolve55 .IF "$(GUI)"=="WNT" +.IF "$(COM)"=="GCC" +BUILD_ACTION=cmd /c cgcc.bat +.ELSE BUILD_ACTION=cmd /c cvc6.bat -OUT2BIN=$(BUILD_DIR)$/lpsolve55.dll OUT2LIB=$(BUILD_DIR)$/lpsolve55.lib +.ENDIF +OUT2BIN=$(BUILD_DIR)$/lpsolve55.dll .ELSE .IF "$(OS)"=="MACOSX" BUILD_ACTION=sh ccc.osx |