diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-06-06 15:56:44 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-06-06 15:56:44 +0000 |
| commit | c53b53c4e476de843238dd9f08d3ed49a73bfb8e (patch) | |
| tree | 102ae7be4703ebfabe566f7e0263694a5ccaf87e /embedserv/util | |
| parent | 468d7a76990fd665f4399acf40ea9cc11565d891 (diff) | |
INTEGRATION: CWS mingwport13 (1.16.4); FILE MERGED
2008/05/05 14:02:38 vg 1.16.4.1: #i88772# MinGW fixes for DEV300
Diffstat (limited to 'embedserv/util')
| -rwxr-xr-x | embedserv/util/makefile.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/embedserv/util/makefile.mk b/embedserv/util/makefile.mk index a8f33f6ff895..192ada413a37 100755 --- a/embedserv/util/makefile.mk +++ b/embedserv/util/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.16 $ +# $Revision: 1.17 $ # # This file is part of OpenOffice.org. # @@ -71,6 +71,7 @@ SHL1STDLIBS=\ $(UUIDLIB) \ $(OLEAUT32LIB) +.IF "$(COM)"=="MSC" .IF "$(CCNUMVER)" >= "001300000000" && "$(CCNUMVER)" <= "001399999999" SHL1STDLIBS+=\ $(ADVAPI32LIB) \ @@ -82,6 +83,7 @@ SHL1STDLIBS+=\ $(ADVAPI32LIB) \ $(ATL_LIB)$/atls.lib .ENDIF # "$(WINDOWS_VISTA_PSDK)"!="" +.ENDIF # "$(COM)"=="MSC" SHL1DEF= $(MISC)$/$(SHL1TARGET).def |