Fix icons on win32

- Logo in help page remains broken because we haven't bundled svg
  libraries

diff --git a/data/Makefile.am b/data/Makefile.am
index 05845141202748d264367d031037cc1011585925..c782b17d115e7f893bd51a3bf5ff0f6231bd1d83 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -10,9 +10,6 @@ dist_logo_DATA = logo.svg
 colordir = $(datadir)/aweather/colors/
 dist_color_DATA = colors/*.clr
 
-if WIN32
-noinst_DATA = icons/48x48/aweather.ico
-else
 desktopdir = $(datadir)/applications
 dist_desktop_DATA = aweather.desktop
 
@@ -29,11 +26,12 @@ dist_icon24_DATA = icons/24x24/aweather.png
 dist_icon32_DATA = icons/32x32/aweather.png
 dist_iconSC_DATA = icons/scalable/aweather.svg
 
+noinst_DATA = icons/48x48/aweather.ico
+
 install-data-hook:
        if test -z "$(DESTDIR)"; then \
                gtk-update-icon-cache -f -t $(datadir)/icons/hicolor; \
        fi
-endif
 
 glade:
        GLADE_CATALOG_PATH=. glade-3 main.ui.in

diff --git a/src/Makefile.am b/src/Makefile.am
index d3861ebfe9c8a9bb72ae79476ac5d4101dda6791..b0852f26d93d24f56846bad49572c9fd0dc3db3d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -34,7 +34,7 @@ aweather_dbg_CPPFLAGS = $(aweather_CPPFLAGS)
 aweather_dbg_LDADD    = $(aweather_LDADD)
 endif
 
-.rc.o: ../data/aweather.ico
+.rc.o: ../data/icons/48x48/aweather.ico
        $(RC) -o $@ $<
 
 CLEANFILES = gmon.out valgrind.out

diff --git a/src/resource.rc.in b/src/resource.rc.in
index cf5da02fe74c5f1c7cd22dfa67ad5194f8ec5d7c..15d876e86d9b595fd652c856da527b1fcc93886e 100644 (file)
--- a/src/resource.rc.in
+++ b/src/resource.rc.in
@@ -30,4 +30,4 @@ VS_VERSION_INFO VERSIONINFO
     END\r
   END\r
 \r
-AWEATHER_ICON ICON "../data/aweather.ico"\r
+AWEATHER_ICON ICON "../data/icons/48x48/aweather.ico"\r