diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-08-24 16:03:19 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-08-27 11:37:40 +0300 |
| commit | bec74ec286e1d1671763a2e5b2a6f4614f0d7669 (patch) | |
| tree | 062a552295a8138a6f43dd4ae7041722466b41d1 /lpsolve | |
| parent | c184419d523a15fd875f0565e268158be27ac703 (diff) | |
Bypass the solver component for iOS for now
Change-Id: I09551ef015d31d2337ba3ab40e720210c095670f
Diffstat (limited to 'lpsolve')
| -rw-r--r-- | lpsolve/lp_solve_5.5.patch | 15 | ||||
| -rw-r--r-- | lpsolve/makefile.mk | 14 |
2 files changed, 10 insertions, 19 deletions
diff --git a/lpsolve/lp_solve_5.5.patch b/lpsolve/lp_solve_5.5.patch index bca62f422fcd..2fdd679fafc4 100644 --- a/lpsolve/lp_solve_5.5.patch +++ b/lpsolve/lp_solve_5.5.patch @@ -133,18 +133,3 @@ +fi + +rm *.o 2>/dev/null ---- misc/build/lp_solve_5.5/lpsolve55/ccc.ios.orig Sun May 22 11:19:48 2011 -+++ misc/build/lp_solve_5.5/lpsolve55/ccc.ios Sun May 22 11:19:48 2011 -@@ -1 +1,11 @@ --dummy -+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' -+obj=`echo $src|sed -e 's/\.c/.o/g' -e 's!\([^ ]*/\)*!!g'` -+ -+opts='-O3' -+ -+def= -+ -+$CC -I.. -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I../shared $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine -c $src -+ls -l -+ar -r liblpsolve55.a $obj -+rm $obj diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk index c91e3a02de91..cfc3985d7140 100644 --- a/lpsolve/makefile.mk +++ b/lpsolve/makefile.mk @@ -36,6 +36,8 @@ TARGET=lpsolve # --- Files -------------------------------------------------------- +.IF "$(OS)" != "IOS" + TARFILE_NAME=lp_solve_5.5 TARFILE_MD5=26b3e95ddf3d9c077c480ea45874b3b8 @@ -77,10 +79,6 @@ OUT2BIN=$(BUILD_DIR)$/lpsolve55.dll .EXPORT: EXTRA_CDEFS EXTRA_LINKFLAGS verbose BUILD_ACTION=sh ccc.osx OUT2LIB=$(BUILD_DIR)$/liblpsolve55.dylib -.ELIF "$(OS)"=="IOS" -.EXPORT: EXTRA_CDEFS EXTRA_LINKFLAGS -BUILD_ACTION=sh ccc.ios -OUT2LIB=$(BUILD_DIR)$/liblpsolve55.a .ELSE .IF "$(COMNAME)"=="sunpro5" BUILD_ACTION=sh ccc.solaris @@ -95,9 +93,17 @@ OUT2LIB=$(BUILD_DIR)$/liblpsolve55.so OUT2INC=lp_lib.h lp_types.h lp_utils.h lp_Hash.h lp_matrix.h lp_mipbb.h lp_SOS.h + # --- Targets ------------------------------------------------------ .INCLUDE : set_ext.mk + +.ENDIF + .INCLUDE : target.mk + +.IF "$(OS)" != "IOS" + .INCLUDE : tg_ext.mk +.ENDIF |