diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-09 09:55:09 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-09 09:55:09 +0100 |
| commit | 89c4f8907fb3cf30b7e0a8837c01f525b8609d00 (patch) | |
| tree | e3151b3bd808b097c08e29519e59d0fe906950df /lpsolve | |
| parent | b54d64f2b8234f620b0f11fbc298dcb68119b408 (diff) | |
| parent | 890599fd2bd872aaa52a278febc7b72036ce0664 (diff) | |
Merge commit 'ooo/DEV300_m101' into intm101
Conflicts:
cppunit/ldflags.patch
hyphen/hyphen-2.4.patch
libegg/source/eggtrayicon.c
libtextcat/makefile.mk
Diffstat (limited to 'lpsolve')
| -rw-r--r-- | lpsolve/makefile.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk index 70460646803d..9eb0120f3a77 100644 --- a/lpsolve/makefile.mk +++ b/lpsolve/makefile.mk @@ -63,7 +63,7 @@ BUILD_DIR=lpsolve55 lpsolve_LDFLAGS=-shared-libgcc .ENDIF .IF "$(MINGW_SHARED_GXXLIB)"=="YES" -lpsolve_LIBS=-lstdc++_s +lpsolve_LIBS=$(MINGW_SHARED_LIBSTDCPP) .ENDIF BUILD_ACTION=lpsolve_LDFLAGS=$(lpsolve_LDFLAGS) lpsolve_LIBS=$(lpsolve_LIBS) cmd /c cgcc.bat .ELSE |