diff options
| author | tono <tono@openoffice.org> | 2010-06-18 22:43:04 +0900 |
|---|---|---|
| committer | tono <tono@openoffice.org> | 2010-06-18 22:43:04 +0900 |
| commit | e17103e84253cc404467f6b25acb99183b7015bb (patch) | |
| tree | 3259073d2b986f426b61f3cee0863a3f697e0a18 /sw | |
| parent | 846a16d184b196ab72daf018a3bf26bc253c8c43 (diff) | |
Backed out changeset: d80a58fd55d9
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/util/makefile.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/util/makefile.mk b/sw/util/makefile.mk index be8469b16c48..49c4390d6ae6 100644 --- a/sw/util/makefile.mk +++ b/sw/util/makefile.mk @@ -169,7 +169,7 @@ SHL3TARGET= swui$(DLLPOSTFIX) SHL3IMPLIB= swuiimp SHL3VERSIONMAP= swui.map SHL3DEF=$(MISC)$/$(SHL3TARGET).def -.IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT") +.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" SHL3DEPN=$(SHL1TARGETN) .ELSE SHL3DEPN=$(SHL1IMPLIBN) @@ -313,7 +313,7 @@ SHL3OBJS += $(SLO)$/pchname.obj \ SHL4TARGET=msword$(DLLPOSTFIX) SHL4VERSIONMAP=msword.map SHL4LIBS=$(SLB)$/rtf.lib $(SLB)$/ww8.lib -.IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT") +.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" SHL4DEPN=$(SHL1TARGETN) .ELSE SHL4DEPN=$(SHL1IMPLIBN) @@ -377,7 +377,7 @@ SHL5STDLIBS= \ $(SVXCORELIB) \ $(SVXMSFILTERLIB) -.IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT") +.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" SHL5DEPN=$(SHL1TARGETN) .ELSE SHL5DEPN=$(SHL1IMPLIBN) |