diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-09 11:24:19 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-09 11:24:19 +0000 |
| commit | 6b800cb3f1e39be8927d0dfebedbbe275c7df5c0 (patch) | |
| tree | af561810d715c1316fa77f93a7cda0cb2e116837 /cppuhelper | |
| parent | ae3386243c7a81bab79a04840c689d984fc53b65 (diff) | |
INTEGRATION: CWS sb87 (1.52.26); FILE MERGED
2008/04/24 13:02:27 sb 1.52.26.2: RESYNC: (1.52-1.53); FILE MERGED
2008/04/24 11:50:49 sb 1.52.26.1: #i88687# extracted cppuhelper_detail_findSofficePath from odk/source/unoapploader
Diffstat (limited to 'cppuhelper')
| -rw-r--r-- | cppuhelper/source/makefile.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/cppuhelper/source/makefile.mk b/cppuhelper/source/makefile.mk index b303fad40bd6..17dad41fae22 100644 --- a/cppuhelper/source/makefile.mk +++ b/cppuhelper/source/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.53 $ +# $Revision: 1.54 $ # # This file is part of OpenOffice.org. # @@ -146,7 +146,10 @@ SLOFILES= \ $(SLO)$/access_control.obj \ $(SLO)$/macro_expander.obj \ $(SLO)$/unourl.obj \ - $(SLO)$/propertysetmixin.obj + $(SLO)$/propertysetmixin.obj \ + $(SLO)$/findsofficepath.obj + +OBJFILES = $(OBJ)$/findsofficepath.obj .IF "$(GUI)" == "WNT" SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID) @@ -161,6 +164,9 @@ SHL1STDLIBS= \ $(SALLIB) \ $(SALHELPERLIB) \ $(CPPULIB) +.IF "$(OS)" == "WNT" +SHL1STDLIBS += $(ADVAPI32LIB) +.ENDIF SHL1DEPN= SHL1IMPLIB=i$(TARGET) |