diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-07-06 13:24:28 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-07-06 13:24:28 +0000 |
| commit | 10e802322c60785ab91cbb244c84783a1b876968 (patch) | |
| tree | b0c3918a5dff23bd9dc701686e17c729073579e4 /soltools | |
| parent | 26d7b1017ecc288380ce62e62cac5986f721ae00 (diff) | |
INTEGRATION: CWS warningfixes01 (1.2.2); FILE MERGED
2006/06/27 12:34:08 sb 1.2.2.2: #i66700# Minimal adaption to cygwin platform (no functional testhxx yet, but build does not break any more).
2006/06/27 08:44:28 sb 1.2.2.1: #i66725# CAPTURE_COMMAND must be set before settings.mk is included.
Diffstat (limited to 'soltools')
| -rw-r--r-- | soltools/testhxx/makefile.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/soltools/testhxx/makefile.mk b/soltools/testhxx/makefile.mk index 1a616a5051e3..c77fe0e3c78c 100644 --- a/soltools/testhxx/makefile.mk +++ b/soltools/testhxx/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: hr $ $Date: 2006-06-20 05:09:53 $ +# last change: $Author: kz $ $Date: 2006-07-06 14:24:28 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -38,15 +38,15 @@ TARGET := testhxx LIBTARGET := NO ENABLE_EXCEPTIONS := TRUE -.INCLUDE: $(PRJ)$/util$/makefile.pmk -.INCLUDE: settings.mk - CAPTURE_COMMAND = echo CAPTURE_OUTPUT = > $(MISC)$/testhxx.output +.INCLUDE: $(PRJ)$/util$/makefile.pmk +.INCLUDE: settings.mk + SLOFILES = $(SLO)$/testhxx.obj -.IF "$(OS)" == "WNT" +.IF "$(USE_SHELL)" == "4nt" MY_SCRIPT_EXT := .btm MY_EXECUTABLE := @ echo .ELSE |