diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-07-21 23:22:58 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-07-21 23:23:18 +0300 |
| commit | a628deba874a71d804afadfa07c17b59af609779 (patch) | |
| tree | 64678ef2d043ad075580fea63d3430c27bb861d0 /solenv/inc | |
| parent | Using -L/lib and -L/usr/lib on MacOSX builds is unnecessary and wrong (diff) | |
| download | core-a628deba874a71d804afadfa07c17b59af609779.tar.gz core-a628deba874a71d804afadfa07c17b59af609779.zip | |
We create some import libraries ourselves from .def files from Wine
Diffstat (limited to 'solenv/inc')
| -rw-r--r-- | solenv/inc/wntgcci.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk index 2622ca6b1927..34faf329fda0 100644 --- a/solenv/inc/wntgcci.mk +++ b/solenv/inc/wntgcci.mk @@ -199,15 +199,15 @@ OLDNAMESLIB=-lmoldname MSIMG32LIB=-lmsimg32 PROPSYSLIB=-lpropsys -# Libraries that neither mingw.org or mingw-w64 have. -# Thus have to use the Windows SDK ones. -GDIPLUSLIB=$(WINDOWS_SDK_HOME)$/lib$/gdiplus.lib -MSILIB=$(WINDOWS_SDK_HOME)$/lib$/msi.lib -URLMONLIB=$(WINDOWS_SDK_HOME)$/lib$/urlmon.lib +# Libraries for which we use an import library built +# from Wine's .def file +MSILIB=-lmsi +GDIPLUSLIB=-lgdiplus +URLMONLIB=-lurlmon # Libraries that mingw-w64 has but mingw.org doesn't. At least the OBS MinGW # cross-compiler is based on mingw-w64. When using MinGW natively on Windows -# (which as such I don't think we want to support) let's use the Windows SDK +# (which as such I don't think we want to support) we use the Windows SDK # libraries. .IF "$(CROSS_COMPILING)"=="YES" DBGHELPLIB=-ldbghelp |