[ooo-build-commit] Branch 'ooo/master' - 2 commits - solenv/inc

[Jan Holesovsky]

 solenv/inc/minor.mk    |    6 +++---
 solenv/inc/unxmacxi.mk |    7 +++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit b852e7be00f22a3045e89ce1d52c147fb7383593
Author: Kurt Zenker <kz at openoffice.org>
Date:   Fri Oct 16 10:28:37 2009 +0000

    DEV300

diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index db285c3..dbebc62 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
 RSCVERSION=300
-RSCREVISION=300m61(Build:9427)
-BUILD=9427
-LAST_MINOR=m61
+RSCREVISION=300m62(Build:9433)
+BUILD=9433
+LAST_MINOR=m62
 SOURCEVERSION=DEV300
commit dcae9018f8b82c20bff6d1b3f29ea96c50c7aefe
Author: Kurt Zenker <kz at openoffice.org>
Date:   Fri Oct 16 09:28:56 2009 +0000

    CWS-TOOLING: integrate CWS obo39
    2009-10-16 12:12:31 +0200 obo  r276961 : undo changes
    2009-10-08 12:31:19 +0200 obo  r276783 : #i105618# use correct java class target, avoid collision of libsqlite3.dylib form module nss with Framework/Security
    2009-10-07 17:05:05 +0200 obo  r276760 : #i105618# draw back changes
    2009-10-07 17:04:23 +0200 obo  r276759 : #i105618# draw back changes
    2009-10-06 11:48:25 +0200 obo  r276696 : #i105618# improved version
    2009-10-05 16:16:28 +0200 obo  r276685 : #i105618# don't use hard coded g++/gcc, special patch and setting when building with MacOSX 10.6
    2009-10-05 15:38:10 +0200 obo  r276683 : #i105618# Fix for building with MacOSX10.4u.sdk on Snow Leopard

diff --git a/solenv/inc/unxmacxi.mk b/solenv/inc/unxmacxi.mk
index c843d24..6d27121 100644
--- a/solenv/inc/unxmacxi.mk
+++ b/solenv/inc/unxmacxi.mk
@@ -52,5 +52,12 @@ CFLAGSENABLESYMBOLS=-g1
 .ELSE
 CFLAGSENABLESYMBOLS=-g
 .ENDIF
+
+.IF "$(SNOW_LEOPARD_10_4)"!=""
+JAVACOMPILER+=-target 1.5
+DYLD_INSERT_LIBRARIES=/usr/lib/libsqlite3.dylib
+.EXPORT: DYLD_INSERT_LIBRARIES
+.ENDIF # "$(SNOW_LEOPARD_10_4)"!=""
+
 # Include generic Mac OS X makefile
 .INCLUDE : unxmacx.mk