diff options
| author | David Tardon <dtardon@redhat.com> | 2012-03-04 11:49:35 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-03-04 13:13:14 +0100 |
| commit | f65ed052f124f51bd5aaf538752bfd121c6c483c (patch) | |
| tree | e8c21aa9c86f1631b05c2ff70bb0c62697130fea /lpsolve | |
| parent | cd5bcd60266f0b99ad015c193d567c992f7e65bd (diff) | |
mingw: change liblpsolve.a -> .dll.a
Diffstat (limited to 'lpsolve')
| -rw-r--r-- | lpsolve/lp_solve_5.5.patch | 9 | ||||
| -rw-r--r-- | lpsolve/makefile.mk | 2 | ||||
| -rw-r--r-- | lpsolve/prj/d.lst | 1 |
3 files changed, 9 insertions, 3 deletions
diff --git a/lpsolve/lp_solve_5.5.patch b/lpsolve/lp_solve_5.5.patch index 88e8828e8256..590da2ef2dbc 100644 --- a/lpsolve/lp_solve_5.5.patch +++ b/lpsolve/lp_solve_5.5.patch @@ -1,6 +1,6 @@ --- misc/build/lp_solve_5.5/lpsolve55/ccc.orig Sat Jun 11 21:27:18 2005 +++ misc/build/lp_solve_5.5/lpsolve55/ccc Sun May 22 11:20:19 2011 -@@ -1,15 +1,28 @@ +@@ -1,25 +1,40 @@ src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c' -c=cc +c=$CC @@ -19,9 +19,11 @@ +inline= +if [ "$GUI" = "WNT" -a "$COM" = "GCC" ]; then + so=dll ++ a=dll.a + inline=-DINLINE=static +else + so=so ++ a=a + soprefix=lib + libs="-lm" + pic=-fpic @@ -35,7 +37,10 @@ opts='-O3' $c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src -@@ -18,8 +31,8 @@ +-ar rv liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` +-ranlib liblpsolve55.a ++ar rv liblpsolve55.$a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` ++ranlib liblpsolve55.$a if [ "$so" != "" ] then diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk index 7e47591e3d74..232faad5d9a0 100644 --- a/lpsolve/makefile.mk +++ b/lpsolve/makefile.mk @@ -65,7 +65,7 @@ lpsolve_LIBS=$(MINGW_SHARED_LIBSTDCPP) BUILD_ACTION=lpsolve_LDFLAGS=$(lpsolve_LDFLAGS) lpsolve_LIBS=$(lpsolve_LIBS) cmd /c cgcc.bat .ELSE BUILD_ACTION=sh ccc -OUT2LIB=$(BUILD_DIR)$/liblpsolve55.a +OUT2LIB=$(BUILD_DIR)$/liblpsolve55.dll.a .ENDIF .ELSE BUILD_ACTION=cmd /c cvc6.bat diff --git a/lpsolve/prj/d.lst b/lpsolve/prj/d.lst index 68001dc50b93..bf8d87c4eef0 100644 --- a/lpsolve/prj/d.lst +++ b/lpsolve/prj/d.lst @@ -5,6 +5,7 @@ mkdir: %_DEST%\inc\lpsolve ..\%__SRC%\lib\liblpsolve55.dylib %_DEST%\lib\liblpsolve55.dylib ..\%__SRC%\lib\liblpsolve55.lib %_DEST%\lib\liblpsolve55.lib ..\%__SRC%\lib\liblpsolve55.a %_DEST%\lib\liblpsolve55.a +..\%__SRC%\lib\liblpsolve55.dll.a %_DEST%\lib\liblpsolve55.dll.a ..\%__SRC%\lib\lpsolve55.lib %_DEST%\lib\lpsolve55.lib ..\%__SRC%\bin\lpsolve55.dll %_DEST%\bin\lpsolve55.dll |