diff options
author | David Tardon <dtardon@redhat.com> | 2011-12-24 09:20:23 +0100 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2011-12-24 16:47:32 +0100 |
commit | a784a81051c992e71476c60a1dabc5768480d0ef (patch) | |
tree | 2de728604c5ad7efeeecd1e2095327e5456c4570 /jvmaccess/util | |
parent | 63712b8439fd954ec4247cd62224dbba49dea35f (diff) |
gbuildize jvmaccess
Diffstat (limited to 'jvmaccess/util')
-rw-r--r-- | jvmaccess/util/gcc3.map | 12 | ||||
-rw-r--r-- | jvmaccess/util/makefile.mk | 77 |
2 files changed, 12 insertions, 77 deletions
diff --git a/jvmaccess/util/gcc3.map b/jvmaccess/util/gcc3.map index 330651a1cf6e..42cd8e1a048d 100644 --- a/jvmaccess/util/gcc3.map +++ b/jvmaccess/util/gcc3.map @@ -86,3 +86,15 @@ UDK_3.4 { # OOo 2.3 _ZN9jvmaccess9ClassPath11doLoadClassERKN3com3sun4star3uno9ReferenceINS4_17XComponentContextEEEPvRKN3rtl8OUStringESE_; # jvmaccess::ClassPath::doLoadClass(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const &, void *, rtl::OUString const &, rtl::OUString const &) _ZN9jvmaccess9ClassPath17doTranslateToUrlsERKN3com3sun4star3uno9ReferenceINS4_17XComponentContextEEEPvRKN3rtl8OUStringE; # jvmaccess::ClassPath::doTranslateToUrls(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const &, void *, rtl::OUString const &) } UDK_3.3; + +UDK_3.5 { # LibO 3.6 + global: + # jvmaccess/unovirtualmachine.hxx: + _ZTIN9jvmaccess17UnoVirtualMachine17CreationExceptionE; # typeinfo for jvmaccess::UnoVirtualMachine::CreationException + _ZTSN9jvmaccess17UnoVirtualMachine17CreationExceptionE; # typeinfo name for jvmaccess::UnoVirtualMachine::CreationException + _ZTVN9jvmaccess17UnoVirtualMachine17CreationExceptionE; # vtable for jvmaccess::UnoVirtualMachine::CreationException + # jvmaccess/virtualmachine.hxx: + _ZTIN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; # typeinfo for jvmaccess::VirtualMachine::AttachGuard::CreationException + _ZTSN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; # typeinfo name for jvmaccess::VirtualMachine::AttachGuard::CreationException + _ZTVN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; # vtable for jvmaccess::VirtualMachine::AttachGuard::CreationException +} UDK_3.4; diff --git a/jvmaccess/util/makefile.mk b/jvmaccess/util/makefile.mk deleted file mode 100644 index 9553973361b5..000000000000 --- a/jvmaccess/util/makefile.mk +++ /dev/null @@ -1,77 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ = .. -PRJNAME = jvmaccess -TARGET = $(PRJNAME) - -ENABLE_EXCEPTIONS = TRUE - -.IF "$(OS)" != "WNT" -UNIXVERSIONNAMES = UDK -.ENDIF # WNT - -.INCLUDE: settings.mk - -.IF "$(OS)" == "IOS" -ALL: - @echo Nothing done for $(OS) -.ENDIF - -.IF "$(UNIXVERSIONNAMES)" == "" -SHL1TARGET = $(TARGET)$(UDK_MAJOR)$(COMID) -.ELSE # UNIXVERSIONNAMES -SHL1TARGET = $(TARGET)$(COMID) -.ENDIF # UNIXVERSIONNAMES - -.IF "$(COM)" == "MSC" -SHL1IMPLIB = i$(TARGET) -.ELSE -SHL1IMPLIB = $(TARGET)$(COMID) -.ENDIF -SHL1LIBS = $(SLB)$/$(TARGET).lib -SHL1STDLIBS = $(CPPULIB) $(SALLIB) $(SALHELPERLIB) -.IF "$(OS)" == "WNT" -SHL1STDLIBS += $(ADVAPI32LIB) -.ENDIF # WNT -SHL1RPATH = URELIB - -.IF "$(COMNAME)" == "msci" -SHL1VERSIONMAP = msvc_win32_intel.map -.ELIF "$(COMNAME)" == "mscx" -SHL1VERSIONMAP = msvc_win32_x86-64.map -.ELIF "$(COMNAME)" == "sunpro5" -SHL1VERSIONMAP = cc5_solaris_sparc.map -.ELIF "$(GUI)$(COM)" == "WNTGCC" -SHL1VERSIONMAP = mingw.map -.ELIF "$(COMNAME)" == "gcc3" -SHL1VERSIONMAP = gcc3.map -.ENDIF - -DEF1NAME = $(SHL1TARGET) - -.INCLUDE: target.mk |