Kaydet (Commit) f65ed052 authored tarafından David Tardon's avatar David Tardon

mingw: change liblpsolve.a -> .dll.a

üst cd5bcd60
--- misc/build/lp_solve_5.5/lpsolve55/ccc.orig Sat Jun 11 21:27:18 2005 --- 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 +++ 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' 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
+c=$CC +c=$CC
...@@ -19,9 +19,11 @@ ...@@ -19,9 +19,11 @@
+inline= +inline=
+if [ "$GUI" = "WNT" -a "$COM" = "GCC" ]; then +if [ "$GUI" = "WNT" -a "$COM" = "GCC" ]; then
+ so=dll + so=dll
+ a=dll.a
+ inline=-DINLINE=static + inline=-DINLINE=static
+else +else
+ so=so + so=so
+ a=a
+ soprefix=lib + soprefix=lib
+ libs="-lm" + libs="-lm"
+ pic=-fpic + pic=-fpic
...@@ -35,7 +37,10 @@ ...@@ -35,7 +37,10 @@
opts='-O3' 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 $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" != "" ] if [ "$so" != "" ]
then then
......
...@@ -65,7 +65,7 @@ lpsolve_LIBS=$(MINGW_SHARED_LIBSTDCPP) ...@@ -65,7 +65,7 @@ lpsolve_LIBS=$(MINGW_SHARED_LIBSTDCPP)
BUILD_ACTION=lpsolve_LDFLAGS=$(lpsolve_LDFLAGS) lpsolve_LIBS=$(lpsolve_LIBS) cmd /c cgcc.bat BUILD_ACTION=lpsolve_LDFLAGS=$(lpsolve_LDFLAGS) lpsolve_LIBS=$(lpsolve_LIBS) cmd /c cgcc.bat
.ELSE .ELSE
BUILD_ACTION=sh ccc BUILD_ACTION=sh ccc
OUT2LIB=$(BUILD_DIR)$/liblpsolve55.a OUT2LIB=$(BUILD_DIR)$/liblpsolve55.dll.a
.ENDIF .ENDIF
.ELSE .ELSE
BUILD_ACTION=cmd /c cvc6.bat BUILD_ACTION=cmd /c cvc6.bat
......
...@@ -5,6 +5,7 @@ mkdir: %_DEST%\inc\lpsolve ...@@ -5,6 +5,7 @@ mkdir: %_DEST%\inc\lpsolve
..\%__SRC%\lib\liblpsolve55.dylib %_DEST%\lib\liblpsolve55.dylib ..\%__SRC%\lib\liblpsolve55.dylib %_DEST%\lib\liblpsolve55.dylib
..\%__SRC%\lib\liblpsolve55.lib %_DEST%\lib\liblpsolve55.lib ..\%__SRC%\lib\liblpsolve55.lib %_DEST%\lib\liblpsolve55.lib
..\%__SRC%\lib\liblpsolve55.a %_DEST%\lib\liblpsolve55.a ..\%__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%\lib\lpsolve55.lib %_DEST%\lib\lpsolve55.lib
..\%__SRC%\bin\lpsolve55.dll %_DEST%\bin\lpsolve55.dll ..\%__SRC%\bin\lpsolve55.dll %_DEST%\bin\lpsolve55.dll
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment