summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcelo Lira <marcelo.lira@openbossa.org>2010-02-18 16:56:03 -0300
committerMarcelo Lira <marcelo.lira@openbossa.org>2010-02-18 16:56:03 -0300
commitd55111e3521728eee0b85eac5c3054a3901e8044 (patch)
tree49d2f6c94b68827913b8a8e198016d1c3aa571df
parent9a79bfd18af4abe30351c2091bb8ae5d3bc23b59 (diff)
downloadshiboken-d55111e3521728eee0b85eac5c3054a3901e8044.tar.gz
shiboken-d55111e3521728eee0b85eac5c3054a3901e8044.tar.xz
shiboken-d55111e3521728eee0b85eac5c3054a3901e8044.zip
libother now uses its own library export macros instead of libsample ones.
-rw-r--r--tests/libother/libothermacros.h52
-rw-r--r--tests/libother/otherderived.h4
2 files changed, 54 insertions, 2 deletions
diff --git a/tests/libother/libothermacros.h b/tests/libother/libothermacros.h
new file mode 100644
index 00000000..f7f32818
--- /dev/null
+++ b/tests/libother/libothermacros.h
@@ -0,0 +1,52 @@
+/*
+* This file is part of the Shiboken Python Bindings Generator project.
+*
+* Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+*
+* Contact: PySide team <contact@pyside.org>
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* version 2.1 as published by the Free Software Foundation. Please
+* review the following information to ensure the GNU Lesser General
+* Public License version 2.1 requirements will be met:
+* http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+*
+* As a special exception to the GNU Lesser General Public License
+* version 2.1, the object code form of a "work that uses the Library"
+* may incorporate material from a header file that is part of the
+* Library. You may distribute such object code under terms of your
+* choice, provided that the incorporated material (i) does not exceed
+* more than 5% of the total size of the Library; and (ii) is limited to
+* numerical parameters, data structure layouts, accessors, macros,
+* inline functions and templates.
+*
+* This program 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 for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA
+*/
+
+#ifndef LIBOTHERMACROS_H
+#define LIBOTHERMACROS_H
+
+#if defined _WIN32 || defined __CYGWIN__
+ #if LIBOTHER_BUILD
+ #define LIBOTHER_API __declspec(dllexport)
+ #else
+ #define LIBOTHER_API __declspec(dllimport)
+ #endif
+#else
+#if __GNUC__ >= 4
+ #define LIBOTHER_API __attribute__ ((visibility("default")))
+#else
+ #define LIBOTHER_API
+#endif
+#endif
+
+#endif
diff --git a/tests/libother/otherderived.h b/tests/libother/otherderived.h
index 447c6c56..ff425da5 100644
--- a/tests/libother/otherderived.h
+++ b/tests/libother/otherderived.h
@@ -35,7 +35,7 @@
#ifndef OTHERDERIVED_H
#define OTHERDERIVED_H
-#include "libsamplemacros.h"
+#include "libothermacros.h"
#include "abstract.h"
#include "derived.h"
#include "objecttype.h"
@@ -43,7 +43,7 @@
class ObjectType;
-class LIBSAMPLE_API OtherDerived : public Abstract
+class LIBOTHER_API OtherDerived : public Abstract
{
public:
OtherDerived(int id = -1);