From 929182933533f75f93da6042649cef2c81d4de90 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 3 Nov 2012 13:47:52 +0200 Subject: Don't bother building a static or debugging lpsolve lib that we don't use Change-Id: Ib34acf0ae4c18f40809a0a16438527dbcd9ffc80 --- lpsolve/lp_solve_5.5-windows.patch | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'lpsolve') diff --git a/lpsolve/lp_solve_5.5-windows.patch b/lpsolve/lp_solve_5.5-windows.patch index 46aff6992000..1a76c32f4bbd 100644 --- a/lpsolve/lp_solve_5.5-windows.patch +++ b/lpsolve/lp_solve_5.5-windows.patch @@ -40,13 +40,20 @@ #undef APSTUDIO_READONLY_SYMBOLS --- misc/lp_solve_5.5/lpsolve55/cvc6.bat +++ misc/build/lp_solve_5.5/lpsolve55/cvc6.bat -@@ -14,7 +14,7 @@ +@@ -14,15 +14,4 @@ set c=cl rc lpsolve.rc -%c% -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd /LD /MD /O1 /Zp8 /Gz -D_WINDLL -D_USRDLL -DWIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% lpsolve.res ..\lp_solve.def -o lpsolve55.dll +%c% -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd /LD /MD /O1 /Zp8 /Gz -D_WINDLL -D_USRDLL -DWIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% lpsolve.res ..\lp_solve.def -Felpsolve55.dll - rem /link /LINK50COMPAT - - if exist a.obj del a.obj - +-rem /link /LINK50COMPAT +- +-if exist a.obj del a.obj +-%c% -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd /MT /O1 /Zp8 /Gd /c -DWIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% +-lib *.obj /OUT:liblpsolve55.lib +- +-if exist a.obj del a.obj +-%c% -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd /MTd /O1 /Zp8 /Gd /c -DWIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% +-lib *.obj /OUT:liblpsolve55d.lib +- +-if exist *.obj del *.obj -- cgit