Add option WITH_GCC_VISIBILITY.

Fix building with hidden visibility.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/11/head
Slávek Banko 2 years ago
parent 49ce296ac5
commit 7085e78f62
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -47,6 +47,12 @@ tde_setup_paths( )
set( ENV{PKG_CONFIG_PATH} "${PKG_CONFIG_PATH}:$ENV{PKG_CONFIG_PATH}:${LIB_INSTALL_DIR}/pkgconfig" ) set( ENV{PKG_CONFIG_PATH} "${PKG_CONFIG_PATH}:$ENV{PKG_CONFIG_PATH}:${LIB_INSTALL_DIR}/pkgconfig" )
##### optional stuff
option( WITH_ALL_OPTIONS "Enable all optional support" OFF )
option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
##### user requested modules ##### user requested modules
option( BUILD_ALL "Build all" ON ) option( BUILD_ALL "Build all" ON )

@ -18,6 +18,10 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/ ***************************************************************************/
#if defined( HAVE_CONFIG_H )
# include "config.h"
#endif
#include <tqlayout.h> #include <tqlayout.h>
#include <tdelocale.h> #include <tdelocale.h>
@ -68,7 +72,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_gtk, KcmGtkFactory("gtk"))*/
extern "C" extern "C"
{ {
TDECModule *create_kcmgtk( TQWidget * parent, const char * name ) KDE_EXPORT TDECModule *create_kcmgtk( TQWidget * parent, const char * name )
{ {
TDEGlobal::locale()->insertCatalogue( "gtk-qt-engine" ); TDEGlobal::locale()->insertCatalogue( "gtk-qt-engine" );
return new KcmGtk( parent, "kcmgtk" ); return new KcmGtk( parent, "kcmgtk" );

@ -1,3 +1,8 @@
#if defined( HAVE_CONFIG_H )
# include "config.h"
#endif
#include <kdemacros.h>
#include <gmodule.h> #include <gmodule.h>
#include <stdio.h> #include <stdio.h>
#include "qt_rc_style.h" #include "qt_rc_style.h"
@ -5,25 +10,24 @@
#include "qt_qt_wrapper.h" #include "qt_qt_wrapper.h"
G_MODULE_EXPORT void theme_init (GTypeModule *module); KDE_EXPORT void theme_init (GTypeModule *module);
G_MODULE_EXPORT void theme_exit (void); KDE_EXPORT void theme_exit (void);
G_MODULE_EXPORT GtkRcStyle * theme_create_rc_style (void); KDE_EXPORT GtkRcStyle * theme_create_rc_style (void);
G_MODULE_EXPORT void theme_init (GTypeModule *module) KDE_EXPORT void theme_init (GTypeModule *module)
{ {
createTQApp(); createTQApp();
qtengine_rc_style_register_type (module); qtengine_rc_style_register_type (module);
qtengine_style_register_type (module); qtengine_style_register_type (module);
} }
G_MODULE_EXPORT void theme_exit (void) KDE_EXPORT void theme_exit (void)
{ {
destroyTQApp(); destroyTQApp();
} }
G_MODULE_EXPORT GtkRcStyle * theme_create_rc_style (void) KDE_EXPORT GtkRcStyle * theme_create_rc_style (void)
{ {
void *ptr = GTK_RC_STYLE (g_object_new (TQTENGINE_TYPE_RC_STYLE, NULL)); void *ptr = GTK_RC_STYLE (g_object_new (TQTENGINE_TYPE_RC_STYLE, NULL));
return (GtkRcStyle *)ptr; return (GtkRcStyle *)ptr;
} }

Loading…
Cancel
Save