diff options
| author | Mathias Bauer <mba@openoffice.org> | 2009-09-09 11:45:13 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2009-09-09 11:45:13 +0200 |
| commit | ed19c2b7675b480019529d3fee401e21088a0eef (patch) | |
| tree | ca5360bd4349adac6ffb30dde5fd34c5b8900661 /lpsolve | |
| parent | 7980eecf81d9e4dbf370c3a13b96e4979c7923cf (diff) | |
| parent | 4a5bdf1727fd9be7c59485dd977e5a507ad48cd7 (diff) | |
merge commit to DEV300_m57
Diffstat (limited to 'lpsolve')
| -rw-r--r-- | lpsolve/lp_solve_5.5-windows.patch | 4 | ||||
| -rw-r--r-- | lpsolve/makefile.mk | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/lpsolve/lp_solve_5.5-windows.patch b/lpsolve/lp_solve_5.5-windows.patch index 48acb6c5a8a4..aae56fcdfe75 100644 --- a/lpsolve/lp_solve_5.5-windows.patch +++ b/lpsolve/lp_solve_5.5-windows.patch @@ -1,5 +1,5 @@ *** misc/lp_solve_5.5/lpsolve55/cgcc.bat Sun Jun 12 04:27:28 2005 ---- misc/build/lp_solve_5.5/lpsolve55/cgcc.bat Sun Feb 10 07:55:19 2008 +--- misc/build/lp_solve_5.5/lpsolve55/cgcc.bat Sun Dec 14 07:55:19 2008 *************** *** 7,14 **** @@ -15,7 +15,7 @@ set c=gcc ! windres lpsolve.rc lpsolve_res.obj -! %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -mno-cygwin -enable-stdcall-fixup -D_USRDLL -DWIN32 -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% lpsolve_res.obj ..\lp_solve.def -o lpsolve55.dll +! %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -mno-cygwin -enable-stdcall-fixup -mthreads %lpsolve_LDFLAGS% -D_USRDLL -DWIN32 -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% lpsolve_res.obj ..\lp_solve.def %lpsolve_LIBS% -o lpsolve55.dll %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -D_USRDLL -DWIN32 -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% -o liblpsolve55.so diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk index a69d5494d2a2..8401f8092dcf 100644 --- a/lpsolve/makefile.mk +++ b/lpsolve/makefile.mk @@ -56,7 +56,13 @@ CONFIGURE_FLAGS= BUILD_DIR=lpsolve55 .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" -BUILD_ACTION=cmd /c cgcc.bat +.IF "$(MINGW_SHARED_GCCLIB)"=="YES" +lpsolve_LDFLAGS=-shared-libgcc +.ENDIF +.IF "$(MINGW_SHARED_GXXLIB)"=="YES" +lpsolve_LIBS=-lstdc++_s +.ENDIF +BUILD_ACTION=lpsolve_LDFLAGS=$(lpsolve_LDFLAGS) lpsolve_LIBS=$(lpsolve_LIBS) cmd /c cgcc.bat .ELSE BUILD_ACTION=cmd /c cvc6.bat OUT2LIB=$(BUILD_DIR)$/lpsolve55.lib |