[Libreoffice-commits] .: Branch 'libreoffice-3-3' - 2 commits - desktop/source shell/source

[Robert Nagy]

 desktop/source/deployment/misc/dp_platform.cxx |    6 ++++++
 shell/source/unix/misc/makefile.mk             |    2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 12631e574aa2dd56f886317cdc4abe47111db17b
Author: Robert Nagy <robert at openbsd.org>
Date:   Sat Nov 6 18:25:37 2010 +0100

    add platform definitions for openbsd

diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx
index bee6d9a..0e67097 100644
--- a/desktop/source/deployment/misc/dp_platform.cxx
+++ b/desktop/source/deployment/misc/dp_platform.cxx
@@ -68,6 +68,8 @@
 #define PLATFORM_MACOSX_X86         "macosx_x86"
 #define PLATFORM_MACOSX_PPC         "macosx_powerpc"
 #define PLATFORM_OS2_X86            "os2_x86"
+#define PLATFORM_OPENBSD_X86        "openbsd_x86"
+#define PLATFORM_OPENBSD_X86_64     "openbsd_x86_64"
 
 
 #define PLATFORM_AIX_POWERPC        "aix_powerpc"
@@ -187,6 +189,10 @@ namespace
             ret = checkOSandCPU(OUSTR("OS2"), OUSTR("x86"));
         else if (token.equals(OUSTR(PLATFORM_AIX_POWERPC)))
             ret = checkOSandCPU(OUSTR("AIX"), OUSTR("PowerPC"));
+        else if (token.equals(OUSTR(PLATFORM_OPENBSD_X86)))
+            ret = checkOSandCPU(OUSTR("OpenBSD"), OUSTR("x86"));
+        else if (token.equals(OUSTR(PLATFORM_OPENBSD_X86_64)))
+            ret = checkOSandCPU(OUSTR("OpenBSD"), OUSTR("X86_64"));
         else
         {
             OSL_ENSURE(0, "Extension Manager: The extension supports an unknown platform. "
commit 1d140604fe7d4c80f32b65f2e6dda314f45c5546
Author: Robert Nagy <robert at openbsd.org>
Date:   Thu Nov 4 12:24:29 2010 +0100

    no -ldl on OpenBSD

diff --git a/shell/source/unix/misc/makefile.mk b/shell/source/unix/misc/makefile.mk
index 67fcc70..c4f3d9c 100644
--- a/shell/source/unix/misc/makefile.mk
+++ b/shell/source/unix/misc/makefile.mk
@@ -68,7 +68,7 @@ APP1TARGET = gnome-open-url.bin
 APP1OBJS = \
     $(OBJ)$/gnome-open-url.obj
 APP1LIBS =
-.IF "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD"
+.IF "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD" && "$(OS)"!="OPENBSD"
 APP1STDLIBS=-ldl
 .ENDIF