浏览代码

icons: separate 64bit icons into separate directory
(merge https://trac.osgeo.org/grass/changeset/67179 from trunk)


git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@67180 15284696-431f-4ddb-bdfa-cd5b030d7da7

Martin Landa 9 年之前
父节点
当前提交
45374bc4cc
共有 3 个文件被更改,包括 4 次插入0 次删除
  1. 4 0
      gui/icons/Makefile
  2. 0 0
      gui/icons/x86_64/grass.ico
  3. 0 0
      gui/icons/x86_64/grass_osgeo.ico

+ 4 - 0
gui/icons/Makefile

@@ -28,6 +28,10 @@ default: $(ETCICONS) $(HTMLICONS)
 	$(INSTALL_DATA) grass.svg $(ARCH_DISTDIR)/share/icons/hicolor/scalable/apps/grass70.svg
 	$(MKDIR) $(ARCH_DISTDIR)/share/appdata
 	$(INSTALL_DATA) grass.appdata.xml $(ARCH_DISTDIR)/share/appdata
+ifeq ($(filter x86_64,$(ARCH)),)
+	$(INSTALL_DATA) x86_64/grass.ico $(GUIDIR)/icons
+	$(INSTALL_DATA) x86_64/grass_osgeo.ico $(GUIDIR)/icons
+endif
 
 $(GUIDIR)/icons/%: % | $(DSTDIRS)
 	$(INSTALL_DATA) $< $@

gui/icons/grass64bit.ico → gui/icons/x86_64/grass.ico


gui/icons/grass64bit_osgeo.ico → gui/icons/x86_64/grass_osgeo.ico