diff options
Diffstat (limited to 'soltools')
| -rwxr-xr-x[-rw-r--r--] | soltools/adjustvisibility/makefile.mk | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | soltools/mkdepend/makefile.mk | 19 | ||||
| -rw-r--r-- | soltools/prj/build.lst | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | soltools/util/makefile.pmk | 11 |
4 files changed, 31 insertions, 5 deletions
diff --git a/soltools/adjustvisibility/makefile.mk b/soltools/adjustvisibility/makefile.mk index a4963b2eb071..d87eb9a89f07 100644..100755 --- a/soltools/adjustvisibility/makefile.mk +++ b/soltools/adjustvisibility/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 @@ -53,6 +53,8 @@ DEPOBJFILES = $(APP1OBJ) APP1STDLIBS = -lelf APP1RPATH = NONE +APP1STDLIBS+=-lstlport + .ENDIF "$(OS)"=="SOLARIS" # --- Targets ------------------------------------------------------ diff --git a/soltools/mkdepend/makefile.mk b/soltools/mkdepend/makefile.mk index ca6f57ef1c7b..7ee0d7f20a09 100644..100755 --- a/soltools/mkdepend/makefile.mk +++ b/soltools/mkdepend/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 @@ -37,6 +37,7 @@ LIBTARGET=NO # noadjust here to have dependencies over there noadjust=TRUE nodep=true +ENABLE_EXCEPTIONS=TRUE # "mkdepend" is written in K&R style C. Modern compilers will generate # lots of warning. There is no point in cleaning this up, so we just @@ -49,7 +50,7 @@ EXTERNAL_WARNINGS_NOT_ERRORS=TRUE LIBSALCPPRT= UWINAPILIB= -CDEFS+=-DNO_X11 -DXP_PC -DHW_THREADS +CDEFS+=-DNO_X11 -DXP_PC -DHW_THREADS OBJFILES= \ $(OBJ)$/cppsetup.obj \ @@ -65,6 +66,20 @@ APP1TARGET=makedepend APP1OBJS=$(OBJFILES) APP1RPATH=NONE +.IF "$(COM)"=="MSC" +.IF "$(dbgutil)"=="" +APP1STDLIBS+=msvcprt.lib +.ELSE +APP1STDLIBS+=msvcprtd.lib +CDEFS+=-D_DEBUG +.ENDIF # "$(DBG_UTIL)"=="" +.ENDIF # "$(COM)"=="MSC" + +.IF "$(OS)"=="SOLARIS" +APP1STDLIBS+=-lstlport +.ENDIF + + .INCLUDE : target.mk diff --git a/soltools/prj/build.lst b/soltools/prj/build.lst index 0a3ed598db0e..3c4e50eb0cda 100644 --- a/soltools/prj/build.lst +++ b/soltools/prj/build.lst @@ -1,4 +1,4 @@ -so soltools : stlport SUN:so_prereq NULL +so soltools : SUN:so_prereq NULL so soltools usr1 - all so_usr1 NULL so soltools\inc get - all so_inc NULL so soltools\ldump nmake - all so_ldump so_mkdep NULL diff --git a/soltools/util/makefile.pmk b/soltools/util/makefile.pmk index ad80f13bf8b9..1d0c571ec497 100644..100755 --- a/soltools/util/makefile.pmk +++ b/soltools/util/makefile.pmk @@ -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 @@ -34,3 +34,12 @@ MAKEDEPEND=$(AUGMENT_LIBRARY_PATH) $(BIN)$/makedepend # find 'adjustvisibility' in own output tree ADJUSTVISIBILITY=$(AUGMENT_LIBRARY_PATH) $(BIN)$/adjustvisibility + +# avoid STLPort +NO_DEFAULT_STL=TRUE +SOLARINC!:=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(SOLARINC)) + +.IF "$(OS)"=="SOLARIS" +SOLARINC+=-I$(COMPATH)/prod/include/CC/stlport4 +SOLARLIB+=-L$(COMPATH)/prod/lib/stlport4 +.ENDIF |