diff options
| author | Tomas Chvatal <tchvatal@suse.cz> | 2012-05-14 19:10:15 +0200 |
|---|---|---|
| committer | Tomas Chvatal <tchvatal@suse.cz> | 2012-05-14 19:15:39 +0200 |
| commit | 21155b8739b1a90455e75b9b527c75e27390455c (patch) | |
| tree | 8d4f11d914d00101c05989162de89f97dee817b2 /lpsolve/makefile.mk | |
| parent | 18e6e7d929c2be209407ed2e56b8ec4d5e6c4900 (diff) | |
Update lpsolve to 5.5.2.0. Resolves bug fdo#39496.
Change-Id: I10b6043bf43d0b65a982a8c4f0067ac726189c53
Diffstat (limited to 'lpsolve/makefile.mk')
| -rw-r--r-- | lpsolve/makefile.mk | 76 |
1 files changed, 27 insertions, 49 deletions
diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk index c91e3a02de91..8c7fc32aec86 100644 --- a/lpsolve/makefile.mk +++ b/lpsolve/makefile.mk @@ -36,65 +36,43 @@ TARGET=lpsolve # --- Files -------------------------------------------------------- -TARFILE_NAME=lp_solve_5.5 -TARFILE_MD5=26b3e95ddf3d9c077c480ea45874b3b8 - -.IF "$(GUI_FOR_BUILD)"=="WNT" -PATCH_FILES=lp_solve_5.5-windows.patch -.ELSE -PATCH_FILES=\ - lp_solve_5.5.patch \ - lp_solve-aix.patch -ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.ios -.ENDIF +TARFILE_NAME=$(PRJNAME)-5.5.2.0 +TARFILE_MD5=b7aeff93c2cf713056b30f832843ba3e CONFIGURE_DIR= -CONFIGURE_ACTION= +CONFIGURE_ACTION=.$/configure CONFIGURE_FLAGS= +.IF "$(CROSS_COMPILING)"=="YES" +BUILD_AND_HOST=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) +CONFIGURE_FLAGS+=$(BUILD_AND_HOST) +.ENDIF # "$(CROSS_COMPILING)"=="YES" + +.IF "$(OS)"=="IOS" +CONFIGURE_FLAGS+=--disable-shared +.ELSE # "$(OS)"=="IOS" +CONFIGURE_FLAGS+=--disable-static +.ENDIF # "$(OS)"=="IOS" + +BUILD_DIR=$(CONFIGURE_DIR) +BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS) + +OUTDIR2INC=.$/ -BUILD_DIR=lpsolve55 -.IF "$(GUI)"=="WNT" -.IF "$(COM)"=="GCC" -.IF "$(MINGW_SHARED_GCCLIB)"=="YES" -lpsolve_LDFLAGS=-shared-libgcc -.ENDIF -.IF "$(MINGW_SHARED_GXXLIB)"=="YES" -lpsolve_LIBS=$(MINGW_SHARED_LIBSTDCPP) -.ENDIF -.IF "$(GUI_FOR_BUILD)"=="WNT" -BUILD_ACTION=lpsolve_LDFLAGS=$(lpsolve_LDFLAGS) lpsolve_LIBS=$(lpsolve_LIBS) cmd /c cgcc.bat -.ELSE -BUILD_ACTION=sh ccc -OUT2LIB=$(BUILD_DIR)$/liblpsolve55.dll.a -.ENDIF -.ELSE -BUILD_ACTION=cmd /c cvc6.bat -OUT2LIB=$(BUILD_DIR)$/lpsolve55.lib -.ENDIF -OUT2BIN=$(BUILD_DIR)$/lpsolve55.dll -.ELSE .IF "$(OS)"=="MACOSX" -.EXPORT: EXTRA_CDEFS EXTRA_LINKFLAGS verbose -BUILD_ACTION=sh ccc.osx -OUT2LIB=$(BUILD_DIR)$/liblpsolve55.dylib +EXTRPATH=URELIB +OUT2LIB+=.libs$/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 -.ELIF "$(OS)$(COM)"=="AIXGCC" -BUILD_ACTION=lpsolve_LDFLAGS="$(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO)" sh ccc.aix.gcc +OUT2LIB+=.libs$/liblpsolve55.a +.ELIF "$(OS)"=="WNT" +.IF "$(COM)"=="GCC" +OUT2LIB+=.libs$/liblpsolve55*.a .ELSE -BUILD_ACTION=sh ccc -.ENDIF -OUT2LIB=$(BUILD_DIR)$/liblpsolve55.so +OUT2LIB+=win32$/bin.msvc$/*.lib .ENDIF +.ELSE +OUT2LIB+=.libs$/liblpsolve55.so* .ENDIF -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 |