diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-04-14 13:52:56 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-04-15 15:26:32 +0200 |
| commit | 4811c2dc9f94929b60e7e2e0077871aad14fdc3a (patch) | |
| tree | 8754348c8dbdf9c4fb91e0d70346f96ee7455999 /lpsolve | |
| parent | 3b65852f37f1c8daf8c5c0af1d810c68cc71d8e3 (diff) | |
adapt all externals to build against MSVC debug runtime
Add patches and/or tweaks to the following modules:
curl, cppunit, icu, lcms2, libxml2, libxslt, libxmlsec,
lpsolve, nss, openssl, python3
lcms2 has an inconsistency where the .lib and the .dll don't agree on
the .dll name.
openssl gets a honorable mention because apparently it's undocumented
custom build system can build with /MDd if one picks the right
configuration but i couldn't figure out how to do that in an hour of
trying, and just patched the release config instead.
Change-Id: I7854a0fc85247e398d561b4f513d09fe2d1ebb3c
Diffstat (limited to 'lpsolve')
| -rw-r--r-- | lpsolve/ExternalProject_lpsolve.mk | 3 | ||||
| -rw-r--r-- | lpsolve/lp_solve_5.5-windows.patch | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lpsolve/ExternalProject_lpsolve.mk b/lpsolve/ExternalProject_lpsolve.mk index 7de29e53b38a..0cf95dd2f4fe 100644 --- a/lpsolve/ExternalProject_lpsolve.mk +++ b/lpsolve/ExternalProject_lpsolve.mk @@ -27,7 +27,8 @@ $(call gb_ExternalProject_get_state_target,lpsolve,build): else # $(COM)!=GCC $(call gb_ExternalProject_get_state_target,lpsolve,build): $(call gb_ExternalProject_run,build,\ - LIB="$(ILIB)" cmd /c cvc6.bat \ + LIB="$(ILIB)" RUNTIME_FLAG="$(if $(MSVC_USE_DEBUG_RUNTIME),/MDd,/MD)" \ + cmd /c cvc6.bat \ ,lpsolve55) endif # $(COM) else # $(OS)!=WNT diff --git a/lpsolve/lp_solve_5.5-windows.patch b/lpsolve/lp_solve_5.5-windows.patch index 28f7c71de5e0..d7c44e67d275 100644 --- a/lpsolve/lp_solve_5.5-windows.patch +++ b/lpsolve/lp_solve_5.5-windows.patch @@ -46,7 +46,7 @@ -rc lpsolve.rc +rc %SOLARINC% 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 %SOLARINC% /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 ++%c% -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd %SOLARINC% /LD %RUNTIME_FLAG% /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 |