Author: orw
Date: Fri Nov 15 13:40:56 2013
New Revision: 1542268
URL: http://svn.apache.org/r1542268
Log:
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
Modified:
openoffice/trunk/main/winaccessibility/source/UAccCOM/makefile.mk
Modified: openoffice/trunk/main/winaccessibility/source/UAccCOM/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/winaccessibility/source/UAccCOM/makefile.mk?rev=1542268&r1=1542267&r2=1542268&view=diff
==============================================================================
--- openoffice/trunk/main/winaccessibility/source/UAccCOM/makefile.mk (original)
+++ openoffice/trunk/main/winaccessibility/source/UAccCOM/makefile.mk Fri Nov
15 13:40:56 2013
@@ -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
