KDE/kdelibs/kjsembed/kjsembed

Christian Ehrlicher Ch.Ehrlicher at gmx.de
Mon Mar 13 17:19:17 CET 2006


SVN commit 518284 by chehrlic:

seems like unsermake doesn't define MAKE_KJSEMBED_LIB and therefore it doesn't work as expected.
can we use kdelibs_export.h here or must it stay kde-independent?
CCMAIL: kde-buildsystem at kde.org

 M  +8 -3      global.h  


--- trunk/KDE/kdelibs/kjsembed/kjsembed/global.h #518283:518284
@@ -23,10 +23,15 @@
 #define KJSEMBED_GLOBAL_H
 
 #include <qglobal.h>	// we need some macros
-#if (defined(KJSEMBED_DLL) && defined(KJSEMBED_MAKE_DLL)) || defined(MAKE_KJSEMBED_LIB)
-# define KJSEMBED_EXPORT Q_DECL_EXPORT
+// unsermake seems not to like our macros - disable it for linux for now
+#if defined(Q_OS_WIN)
+# if (defined(KJSEMBED_DLL) && defined(KJSEMBED_MAKE_DLL)) || defined(MAKE_KJSEMBED_LIB)
+#  define KJSEMBED_EXPORT Q_DECL_EXPORT
+# else
+#  define KJSEMBED_EXPORT Q_DECL_IMPORT
+# endif
 #else
-# define KJSEMBED_EXPORT Q_DECL_EXPORT
+# define KJSEMBED_EXPORT 
 #endif
 
 #if !defined(Q_OS_WIN)


More information about the Kde-buildsystem mailing list