summaryrefslogtreecommitdiffstats
path: root/fpicker
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@novell.com>2011-07-20 22:53:41 +0300
committerTor Lillqvist <tlillqvist@novell.com>2011-07-20 22:53:41 +0300
commit13b2080cf5cbd598d2df43d8989d65f22ce0ef70 (patch)
tree86cd15ac0daf2908a44193d9d96693be82f67262 /fpicker
parentFix MSVC warnings and errors, fallout from previous commit (diff)
downloadcore-13b2080cf5cbd598d2df43d8989d65f22ce0ef70.tar.gz
core-13b2080cf5cbd598d2df43d8989d65f22ce0ef70.zip
Use delay loading only with MSC
Diffstat (limited to 'fpicker')
-rw-r--r--fpicker/util/makefile.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/fpicker/util/makefile.mk b/fpicker/util/makefile.mk
index 39fb31837731..7d42971c25ef 100644
--- a/fpicker/util/makefile.mk
+++ b/fpicker/util/makefile.mk
@@ -58,9 +58,13 @@ SHL1STDLIBS= $(COMMON_LIBS) \
$(OLEAUT32LIB)\
$(COMDLG32LIB)\
$(KERNEL32LIB)\
- $(UUIDLIB)\
+ $(UUIDLIB)
+
+.IF "$(COM)" == "MSC"
+SHL1STDLIBS+=\
Delayimp.lib\
/DELAYLOAD:shell32.dll
+.ENDIF
SHL1DEPN=
SHL1IMPLIB=i$(SHL1TARGET)