[Libreoffice-commits] .: Branch 'feature/gnumake2.1' - 2 commits - RepositoryFixes.mk solenv/gbuild

[Norbert Thiebaud]

 RepositoryFixes.mk               |    2 ++
 solenv/gbuild/platform/macosx.mk |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit c2c0eac5dcc2f65932681bf4daa26745c6959f88
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sun Jan 16 20:06:57 2011 -0600

    tweak library name on MacOS

diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 2f6c897..1687dea 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -59,6 +59,8 @@ gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_c
 gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst vbaswobj:vbaswobj%,vbaswobj:libvbaswobjmxi%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst vbaobj:vbaobj%,vbaobj:libvbaobjmxi%,$(gb_Library_FILENAMES))
 
 ifeq ($(USE_SYSTEM_STL),YES)
 gb_Library_FILENAMES := $(patsubst stl:%,stl:libstdc++.dylib,$(gb_Library_FILENAMES))
commit 60d98f881effca97b0165c8d391950e0d5da3e3d
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sun Jan 16 20:06:41 2011 -0600

    starmath need to have _DLL_ defined, even on MacOS

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index fee4cef..a215cff 100755
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -251,7 +251,7 @@ endef
 
 # Library class
 
-gb_Library_DEFS :=
+gb_Library_DEFS := -D_DLL_
 gb_Library_TARGETTYPEFLAGS := -dynamiclib -single_module
 gb_Library_SYSPRE := lib
 gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_