diff options
| author | Mathias Bauer <mba@openoffice.org> | 2009-11-10 10:36:57 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2009-11-10 10:36:57 +0100 |
| commit | d1eacba8a2be9f82557ba795a2ea4f6b67549cad (patch) | |
| tree | 77a2a83772b4f979454a029da90a254cf4eaf146 /soltools | |
| parent | #i106641#: no crash report info on DEV code line (diff) | |
| download | core-d1eacba8a2be9f82557ba795a2ea4f6b67549cad.tar.gz core-d1eacba8a2be9f82557ba795a2ea4f6b67549cad.zip | |
#i103496#: fix for building nonpro of mkdepend on Windows
Diffstat (limited to 'soltools')
| -rwxr-xr-x | soltools/mkdepend/makefile.mk | 8 | ||||
| -rw-r--r-- | soltools/prj/build.lst | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/soltools/mkdepend/makefile.mk b/soltools/mkdepend/makefile.mk index b8e3d85200b8..7ee0d7f20a09 100755 --- a/soltools/mkdepend/makefile.mk +++ b/soltools/mkdepend/makefile.mk @@ -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 \ @@ -66,7 +67,12 @@ 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" 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 |