diff options
| author | Ingrid Halama <iha@openoffice.org> | 2010-01-28 16:29:55 +0100 |
|---|---|---|
| committer | Ingrid Halama <iha@openoffice.org> | 2010-01-28 16:29:55 +0100 |
| commit | 4d25f2a41929080258462cb53b843c52d084d0c9 (patch) | |
| tree | e22c6dfac5970f28a0b60c2f28c4d100e28a1e72 /sal/qa/osl/file | |
| parent | 837894606a612539ab16f4eb3256b5bc5153f27d (diff) | |
| parent | a2cadf4bc167c9a5ad534af03f7960c6ef477c05 (diff) | |
chartmultiline: merge with DEV300_m70
Diffstat (limited to 'sal/qa/osl/file')
| -rw-r--r-- | sal/qa/osl/file/makefile.mk | 24 | ||||
| -rw-r--r-- | sal/qa/osl/file/osl_File.cxx | 2 | ||||
| -rw-r--r-- | sal/qa/osl/file/osl_old_test_file.cxx | 2 | ||||
| -rwxr-xr-x | sal/qa/osl/file/test_cpy_wrt_file.cxx | 2 |
4 files changed, 7 insertions, 23 deletions
diff --git a/sal/qa/osl/file/makefile.mk b/sal/qa/osl/file/makefile.mk index 7c6d1232c1a0..0d83a06b7124 100644 --- a/sal/qa/osl/file/makefile.mk +++ b/sal/qa/osl/file/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -47,15 +47,7 @@ CXXFLAGS+= $(LFS_CFLAGS) SHL1OBJS= \ $(SLO)$/osl_File.obj SHL1TARGET= osl_File -SHL1STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) -# .IF "$(GUI)" == "WNT" -# SHL1STDLIBS+= $(SOLARLIBDIR)$/cppunit.lib -# .ENDIF -# .IF "$(GUI)" == "UNX" -# SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a -# .ENDIF +SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL1IMPLIB= i$(SHL1TARGET) @@ -66,13 +58,7 @@ SHL1VERSIONMAP = $(PRJ)$/qa$/export.map SHL2OBJS=$(SLO)$/test_cpy_wrt_file.obj SHL2TARGET=tcwf -SHL2STDLIBS=$(SALLIB) -.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2" -SHL2STDLIBS+=$(SOLARLIBDIR)$/cppunit.lib -.ENDIF -.IF "$(GUI)" == "UNX" -SHL2STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a -.ENDIF +SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL2IMPLIB=i$(SHL2TARGET) SHL2DEF=$(MISC)$/$(SHL2TARGET).def SHL2VERSIONMAP = $(PRJ)$/qa$/export.map @@ -85,9 +71,7 @@ DEF2NAME =$(SHL2TARGET) SHL3OBJS= \ $(SLO)$/osl_old_test_file.obj SHL3TARGET= osl_old_test_file -SHL3STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) +SHL3STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) SHL3IMPLIB= i$(SHL3TARGET) diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index 3a44c565d162..a1cb3fa54e9e 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.cxx @@ -44,7 +44,7 @@ #include <osl/file.hxx> #include <osl_File_Const.h> -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> // #ifdef WNT // # define UNICODE diff --git a/sal/qa/osl/file/osl_old_test_file.cxx b/sal/qa/osl/file/osl_old_test_file.cxx index 18be1d38e40c..64258b8e9006 100644 --- a/sal/qa/osl/file/osl_old_test_file.cxx +++ b/sal/qa/osl/file/osl_old_test_file.cxx @@ -51,7 +51,7 @@ #define TEST_VOLUME "c:/" #endif -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> namespace osl_test_file { diff --git a/sal/qa/osl/file/test_cpy_wrt_file.cxx b/sal/qa/osl/file/test_cpy_wrt_file.cxx index 6c4986f485b3..05910ea3ddd7 100755 --- a/sal/qa/osl/file/test_cpy_wrt_file.cxx +++ b/sal/qa/osl/file/test_cpy_wrt_file.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> #include <osl/file.hxx> #include <osl/thread.h> #include <rtl/ustring.hxx> |