diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-19 16:31:37 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-19 16:31:37 +0000 |
| commit | 458547ebf23b4d77f60658a6752cf0d85eec112f (patch) | |
| tree | 725d69c809a31091483125037272b77158547735 /cpputools/source | |
| parent | ab86e92fa219718c5c172c373e8c7c3d016a2d31 (diff) | |
MWS_SRX644: migrate branch mws_srx644 -> HEAD
Diffstat (limited to 'cpputools/source')
| -rw-r--r-- | cpputools/source/registercomponent/makefile.mk | 5 | ||||
| -rw-r--r-- | cpputools/source/registercomponent/registercomponent.cxx | 10 | ||||
| -rw-r--r-- | cpputools/source/unoexe/makefile.mk | 7 |
3 files changed, 12 insertions, 10 deletions
diff --git a/cpputools/source/registercomponent/makefile.mk b/cpputools/source/registercomponent/makefile.mk index 323f29167c0a..42e1743f0446 100644 --- a/cpputools/source/registercomponent/makefile.mk +++ b/cpputools/source/registercomponent/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: jbu $ $Date: 2002-10-02 12:00:25 $ +# last change: $Author: hr $ $Date: 2003-03-19 17:31:37 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -105,6 +105,7 @@ APP1OBJS= $(OBJ)$/registercomponent.obj APP1STDLIBS=\ $(SALLIB) \ + $(TOOLSLIB) \ $(CPPULIB) \ $(CPPUHELPERLIB) diff --git a/cpputools/source/registercomponent/registercomponent.cxx b/cpputools/source/registercomponent/registercomponent.cxx index 1c913825892b..23207ddc208a 100644 --- a/cpputools/source/registercomponent/registercomponent.cxx +++ b/cpputools/source/registercomponent/registercomponent.cxx @@ -2,9 +2,9 @@ * * $RCSfile: registercomponent.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: jbu $ $Date: 2002-10-02 13:16:34 $ + * last change: $Author: hr $ $Date: 2003-03-19 17:31:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -328,8 +328,8 @@ sal_Bool parseOptions(int ac, char* av[], Options& rOptions, sal_Bool bCmdFile) // the pointer sal_Char * p = (sal_Char *) rtl_allocateMemory( 13+ strlen( av[i] ) ); p[0] = 0; - strcat( p, "CLASSPATH=" ); - strcat( p, av[i] ); + strcat( p, "CLASSPATH=" ); // #100211# - checked + strcat( p, av[i] ); // #100211# - checked putenv( p ); } @@ -461,7 +461,7 @@ sal_Bool parseOptions(int ac, char* av[], Options& rOptions, sal_Bool bCmdFile) buf.append( "." ); throw IllegalArgument( buf.makeStringAndClear() ); } - strcpy( rargv[rargc] , buffer ); + strcpy( rargv[rargc] , buffer ); // #100211# - checked rargc++; } fclose(cmdFile); diff --git a/cpputools/source/unoexe/makefile.mk b/cpputools/source/unoexe/makefile.mk index f02917720926..254c042dad88 100644 --- a/cpputools/source/unoexe/makefile.mk +++ b/cpputools/source/unoexe/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.8 $ # -# last change: $Author: hjs $ $Date: 2002-03-27 16:35:03 $ +# last change: $Author: hr $ $Date: 2003-03-19 17:31:37 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -70,7 +70,9 @@ NO_BSYMBOLIC=TRUE # --- Settings ----------------------------------------------------- +.INCLUDE : svpre.mk .INCLUDE : settings.mk +.INCLUDE : sv.mk UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb @@ -109,7 +111,6 @@ CXXFILES= \ APP1TARGET=$(TARGET) APP1OBJS=$(OBJ)$/unoexe.obj -DEPOBJFILES+=$(APP1OBJFILES) APP1STDLIBS= \ $(SALLIB) \ |