summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver-Rainer Wittmann <orw@apache.org>2013-11-15 13:40:56 +0000
committerOliver-Rainer Wittmann <orw@apache.org>2013-11-15 13:40:56 +0000
commit11dde52476f5723d874699e0f0fc58092e7e96ad (patch)
tree3bcefc63aea07d0d9b2479550c58273cc4aa9e28
parente9ca732f8aeba1a9bb2e1d9f4e95047675490d79 (diff)
fix build breaker in new module winaccessibility introduced with ia2
build breaks under Windows on non-pro build when building without stlport Patch by: hdu
Notes
Notes: ignore: obsolete
-rw-r--r--winaccessibility/source/UAccCOM/makefile.mk9
1 files changed, 1 insertions, 8 deletions
diff --git a/winaccessibility/source/UAccCOM/makefile.mk b/winaccessibility/source/UAccCOM/makefile.mk
index e190f2516608..92221404b9d7 100644
--- a/winaccessibility/source/UAccCOM/makefile.mk
+++ b/winaccessibility/source/UAccCOM/makefile.mk
@@ -46,9 +46,6 @@ CFLAGS+=-D_UNICODE -DUNICODE
.IF "$(PRODUCT)"!=""
RC+=-DPRODUCT
.ENDIF
-.IF "$(USE_STLP_DEBUG)"!=""
-CDEFS+=-D_DEBUG
-.ENDIF # "$(USE_STLP_DEBUG)"!=""
RCFILES=\
$(TARGET).rc
@@ -113,12 +110,8 @@ SHL1STDLIBS=\
.IF "$(COM)"!="GCC"
.IF "$(CCNUMVER)" > "001300000000"
-.IF "$(USE_STLP_DEBUG)" != ""
- SHL1STDLIBS+= $(ATL_LIB)$/atlsd.lib
-.ELSE
SHL1STDLIBS+= $(ATL_LIB)$/atls.lib
.ENDIF
-.ENDIF
.ENDIF
SHL1OBJS=$(SLOFILES)
@@ -139,4 +132,4 @@ ALLTAR : \
$(MISC)/$(TARGET).manifest: $(BIN)$/$(TARGET)$(DLLPOST)
cat *.rgs > $(MISC)$/$(TARGET).rgs
mt.exe -rgs:$(MISC)$/$(TARGET).rgs -tlb:$(MISC)$/$(TARGET).tlb -dll:$(TARGET).dll -out:$(MISC)$/$(TARGET).manifest
- mt.exe -manifest $(MISC)$/$(TARGET).manifest -outputresource:$(BIN)$/$(TARGET)$(DLLPOST)\;\#97 \ No newline at end of file
+ mt.exe -manifest $(MISC)$/$(TARGET).manifest -outputresource:$(BIN)$/$(TARGET)$(DLLPOST)\;\#97