summaryrefslogtreecommitdiff
path: root/automation
diff options
context:
space:
mode:
authorobo <obo@openoffice.org>2010-06-22 16:02:44 +0200
committerobo <obo@openoffice.org>2010-06-22 16:02:44 +0200
commit273fa6a6aa0d56660807ab29892f0618cfbb2e63 (patch)
tree7194f2d5cc723bcb61e05e52f917d290f555e36b /automation
parentc390fcc3334c9ac89d5e71113d98c7c6357e8606 (diff)
parent2552225a7d62185b9007a117ecb7fd095c0f982d (diff)
CWS-TOOLING: integrate CWS mingwport30
Notes
split repo tag: components_ooo/DEV300_m84 split repo tag: components_ooo/OOO330_m0
Diffstat (limited to 'automation')
-rw-r--r--automation/util/makefile.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/automation/util/makefile.mk b/automation/util/makefile.mk
index e683e73631b8..756a3d6a62e4 100644
--- a/automation/util/makefile.mk
+++ b/automation/util/makefile.mk
@@ -136,7 +136,7 @@ DEF3DES =Communication
APP1TARGET=testtool
-.IF "$(GUI)" == "UNX"
+.IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT")
APP1DEPN+=$(SHL2TARGETN) $(SHL3TARGETN)
.ELSE
APP1DEPN+=$(SHL2IMPLIBN) $(SHL3IMPLIBN)
@@ -228,7 +228,7 @@ APP3STDLIBS+= \
.ENDIF
.ENDIF
# $(AUTOMATIONLIB) is build in SHL1TARGET
-.IF "$(GUI)"=="UNX"
+.IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT")
APP3DEPN=$(SHL1TARGETN)
.ELSE
APP3DEPN=$(SHL1IMPLIBN)