[gtk+/adwaita: 7/9] Don't include the win32 theme on Linux



commit 4c95dbb05b754e14d26b561dce414e8461c999d2
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Jun 13 10:30:36 2014 -0400

    Don't include the win32 theme on Linux
    
    No need to carry around these resources when we are not
    going to use them.

 gtk/Makefile.am |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 73e01b9..28f669c 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1382,10 +1382,12 @@ gtk.gresource.xml:
          n=`basename $$f`; \
          echo -e "    <file alias=\"theme/Raleigh.css\">theme/Raleigh/$$n</file>" >> $@; \
        done; \
-       for f in $(srcdir)/resources/theme/win32/*.css; do \
-         n=`basename $$f`; \
-         echo -e "    <file alias=\"theme/$$n\">theme/win32/$$n</file>" >> $@; \
-       done; \
+       if test "$(win32_theme)" = "yes"; then \
+         for f in $(srcdir)/resources/theme/win32/*.css; do \
+           n=`basename $$f`; \
+           echo -e "    <file alias=\"theme/$$n\">theme/win32/$$n</file>" >> $@; \
+         done; \
+       fi; \
        for f in $(srcdir)/resources/cursor/*.png; do \
          n=`basename $$f`; \
          echo -e "    <file>cursor/$$n</file>" >> $@; \
@@ -1452,6 +1454,7 @@ libgtk_3_la_LIBADD = $(libadd)
 libgtk_3_la_DEPENDENCIES = $(deps)
 
 if USE_WIN32
+win32_theme=yes
 libgtk_3_la_LIBADD += -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
 libgtk_3_la_LDFLAGS += -Wl,-luuid
 libgtk_3_la_DEPENDENCIES += $(gtk_def) $(gtk_win32_res) $(deps)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]