diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-08-24 21:56:36 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-08-25 08:50:57 +0300 |
| commit | 8b88940da2212ab1e45d316937f6bc8c06f48223 (patch) | |
| tree | 2f391d4cc2be3fca7e413e780b3086fa603bfc6d /extensions | |
| parent | 61674465b74f60d7ddb2d7a0fa0e17c9990f6301 (diff) | |
Fix _DEBUG build: Use atlsd.lib
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/activex/main/makefile.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/extensions/source/activex/main/makefile.mk b/extensions/source/activex/main/makefile.mk index bdfe30642730..e609fe5c99af 100644 --- a/extensions/source/activex/main/makefile.mk +++ b/extensions/source/activex/main/makefile.mk @@ -77,8 +77,10 @@ SHL1STDLIBS=\ $(URLMONLIB) \ $(SHLWAPILIB) -.IF "$(COM)"!="GCC" -.IF "$(CCNUMVER)" > "001300000000" +.IF "$(COM)" == "MSC" +.IF "$(USE_DEBUG_RUNTIME)" != "" + SHL1STDLIBS+= $(ATL_LIB)$/atlsd.lib +.ELSE SHL1STDLIBS+= $(ATL_LIB)$/atls.lib .ENDIF .ENDIF @@ -134,7 +136,11 @@ SHL1STDLIBS_X64+=\ SHL1OBJS_X64=$(SLOFILES_X64) SHL1DEF_X64=$(TARGET).def +.IF "$(USE_DEBUG_RUNTIME)" != "" +SHL1STDLIBS_X64+= $(ATL_LIB)$/amd64$/atlsd.lib +.ELSE SHL1STDLIBS_X64+= $(ATL_LIB)$/amd64$/atls.lib +.ENDIF .ENDIF # "$(BUILD_X64)"!="" |