diff options
| -rw-r--r-- | dtrans/source/win32/dtobj/DataFmtTransl.cxx | 6 | ||||
| -rw-r--r-- | dtrans/source/win32/misc/ImplHelper.cxx | 5 | ||||
| -rw-r--r-- | dtrans/source/win32/workbench/makefile.mk | 8 | ||||
| -rw-r--r-- | dtrans/test/win32/dnd/makefile.mk | 8 | ||||
| -rw-r--r-- | dtrans/util/makefile.mk | 25 |
5 files changed, 30 insertions, 22 deletions
diff --git a/dtrans/source/win32/dtobj/DataFmtTransl.cxx b/dtrans/source/win32/dtobj/DataFmtTransl.cxx index ce952d442e75..2761241d9479 100644 --- a/dtrans/source/win32/dtobj/DataFmtTransl.cxx +++ b/dtrans/source/win32/dtobj/DataFmtTransl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: DataFmtTransl.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: rt $ $Date: 2001-08-07 16:45:42 $ + * last change: $Author: hro $ $Date: 2002-08-14 14:46:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -103,8 +103,6 @@ #include "Fetc.hxx" #endif -#include <systools/win32/user9x.h> - #include <windows.h> #if (_MSC_VER < 1300) diff --git a/dtrans/source/win32/misc/ImplHelper.cxx b/dtrans/source/win32/misc/ImplHelper.cxx index 25ded299d481..5b75114e2b15 100644 --- a/dtrans/source/win32/misc/ImplHelper.cxx +++ b/dtrans/source/win32/misc/ImplHelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ImplHelper.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: tra $ $Date: 2001-05-10 09:43:48 $ + * last change: $Author: hro $ $Date: 2002-08-14 14:48:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -82,7 +82,6 @@ #include <memory> #include <windows.h> -#include <systools/win32/user9x.h> //------------------------------------------------------------------------ // defines diff --git a/dtrans/source/win32/workbench/makefile.mk b/dtrans/source/win32/workbench/makefile.mk index 7cd4056a4daf..bd0066cf3dd3 100644 --- a/dtrans/source/win32/workbench/makefile.mk +++ b/dtrans/source/win32/workbench/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: tra $ $Date: 2001-09-28 12:28:09 $ +# last change: $Author: hro $ $Date: 2002-08-14 14:50:43 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -96,13 +96,13 @@ APP1OBJS= $(OBJ)$/test_wincb.obj APP1STDLIBS= $(SALLIB) \ $(CPPULIB) \ $(CPPUHELPERLIB) \ + unicows.lib\ user32.lib \ ole32.lib\ comdlg32.lib APP1LIBS= $(SLB)$/dtutils.lib\ - $(SOLARLIBDIR)$/user9x.lib\ - $(SOLARLIBDIR)$/tools32.lib + $(SOLARLIBDIR)$/uwinapi.lib APP1NOSAL= TRUE diff --git a/dtrans/test/win32/dnd/makefile.mk b/dtrans/test/win32/dnd/makefile.mk index ba8193b158c9..77490a9d3d1c 100644 --- a/dtrans/test/win32/dnd/makefile.mk +++ b/dtrans/test/win32/dnd/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # -# last change: $Author: jl $ $Date: 2001-07-19 11:14:24 $ +# last change: $Author: hro $ $Date: 2002-08-14 14:53:43 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -123,6 +123,8 @@ APP1STDLIBS= \ $(SALLIB) \ $(CPPUHELPERLIB) \ $(CPPULIB) \ + uwinapi.lib \ + unicows.lib\ user32.lib \ ole32.lib \ comsupp.lib \ @@ -131,8 +133,6 @@ APP1STDLIBS= \ uuid.lib APP1LIBS= \ - $(SOLARLIBDIR)$/user9x.lib\ - $(SOLARLIBDIR)$/tools32.lib\ $(SLB)$/dtobjfact.lib \ $(SLB)$/dtutils.lib diff --git a/dtrans/util/makefile.mk b/dtrans/util/makefile.mk index 10cb571e370b..67afae2f33fe 100644 --- a/dtrans/util/makefile.mk +++ b/dtrans/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # -# last change: $Author: hjs $ $Date: 2001-09-04 12:03:51 $ +# last change: $Author: hro $ $Date: 2002-08-14 14:43:03 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -83,7 +83,11 @@ SHL1LIBS=$(SLB)$/mcnttype.lib SHL1STDLIBS= \ $(SALLIB) \ $(CPPULIB) \ - $(CPPUHELPERLIB) + $(CPPUHELPERLIB) \ + uwinapi.lib \ + unicows.lib + + SHL1IMPLIB=i$(SHL1TARGET) @@ -107,6 +111,9 @@ SHL2STDLIBS= \ $(SALLIB) \ $(CPPULIB) \ $(CPPUHELPERLIB)\ + uwinapi.lib\ + unicows.lib\ + advapi32.lib\ ole32.lib\ gdi32.lib @@ -124,13 +131,15 @@ SHL3TARGET=$(TARGET3) SHL3LIBS=$(SLB)$/sysdtrans.lib\ $(SLB)$/dtutils.lib\ $(SLB)$/dtobjfact.lib\ - $(SLB)$/mtaolecb.lib\ - $(SOLARLIBDIR)$/user9x.lib + $(SLB)$/mtaolecb.lib SHL3STDLIBS= \ $(SALLIB) \ $(CPPULIB) \ $(CPPUHELPERLIB)\ + uwinapi.lib\ + unicows.lib\ + advapi32.lib\ ole32.lib\ comsupp.lib\ oleaut32.lib\ @@ -150,13 +159,15 @@ SHL4TARGET=$(TARGET4) SHL4LIBS= \ $(SLB)$/dnd.lib\ $(SLB)$/dtobjfact.lib\ - $(SLB)$/dtutils.lib\ - $(SOLARLIBDIR)$/user9x.lib + $(SLB)$/dtutils.lib SHL4STDLIBS= \ $(SALLIB) \ $(CPPULIB) \ $(CPPUHELPERLIB) \ + uwinapi.lib\ + unicows.lib\ + advapi32.lib\ ole32.lib\ comsupp.lib\ oleaut32.lib\ |