Kaydet (Commit) 736b7fc2 authored tarafından Robert Nagy's avatar Robert Nagy Kaydeden (comit) Petr Mladek

correctly build GTK systray icon

the setting was lost during move the GNU make
Signed-off-by: 's avatarPetr Mladek <pmladek@suse.cz>
üst 2cab78b1
...@@ -48,6 +48,13 @@ $(eval $(call gb_Library_set_defs,qstart_gtk,\ ...@@ -48,6 +48,13 @@ $(eval $(call gb_Library_set_defs,qstart_gtk,\
-DENABLE_QUICKSTART_APPLET \ -DENABLE_QUICKSTART_APPLET \
)) ))
ifeq ($(ENABLE_SYSTRAY_GTK),TRUE)
$(eval $(call gb_Library_set_defs,qstart_gtk,\
$$(DEFS) \
-DENABLE_SYSTRAY_GTK \
))
endif
$(eval $(call gb_Library_set_cflags,qstart_gtk,\ $(eval $(call gb_Library_set_cflags,qstart_gtk,\
$$(CFLAGS) \ $$(CFLAGS) \
$(filter-out -I%,$(GTK_CFLAGS)) \ $(filter-out -I%,$(GTK_CFLAGS)) \
......
...@@ -60,6 +60,15 @@ $(eval $(call gb_Library_set_defs,sfx,\ ...@@ -60,6 +60,15 @@ $(eval $(call gb_Library_set_defs,sfx,\
-DSFX2_DLLIMPLEMENTATION \ -DSFX2_DLLIMPLEMENTATION \
)) ))
ifeq ($(ENABLE_SYSTRAY_GTK),TRUE)
$(eval $(call gb_Library_set_defs,sfx,\
$$(DEFS) \
-DENABLE_QUICKSTART_APPLET \
-DENABLE_SYSTRAY_GTK \
-DPLUGIN_NAME=libqstart_gtk$(gb_Library_OOOEXT) \
))
endif
$(eval $(call gb_Library_add_linked_libs,sfx,\ $(eval $(call gb_Library_add_linked_libs,sfx,\
comphelper \ comphelper \
cppu \ cppu \
......
...@@ -90,7 +90,7 @@ extern "C" { static void SAL_CALL thisModule() {} } ...@@ -90,7 +90,7 @@ extern "C" { static void SAL_CALL thisModule() {} }
# endif # endif
#endif #endif
#if defined(UNX) && defined(ENABLE_SYSTRAY_GTK) #if defined(UNX) && defined(ENABLE_SYSTRAY_GTK) && !defined(PLUGIN_NAME)
#define PLUGIN_NAME "libqstart_gtkli.so" #define PLUGIN_NAME "libqstart_gtkli.so"
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment