Mercurial > hg > syntilista

changeset 56:ac3daf42f781

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename some files.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 08 Apr 2017 00:20:43 +0300
parents a7961956858c
children 893f69fcf050
files Makefile.cross-mingw-win32 Makefile.gen Syntilista.qrc resource.rc.in resources.qrc winres.rc.in
diffstat 6 files changed, 32 insertions(+), 30 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.cross-mingw-win32	Fri Apr 07 20:40:14 2017 +0300
+++ b/Makefile.cross-mingw-win32	Sat Apr 08 00:20:43 2017 +0300
@@ -33,7 +33,7 @@
 	$(QT5_PREFIX)/lib/libQt5Sql.a \
 	$(QT5_PREFIX)/lib/libQt5Core.a 
 
-APP_DEP_LIBS = $(OBJPATH)resource.o
+APP_DEP_LIBS = $(OBJPATH)winres.o
 APP_DEPS = 
 
 # Qt tools
--- a/Makefile.gen	Fri Apr 07 20:40:14 2017 +0300
+++ b/Makefile.gen	Sat Apr 08 00:20:43 2017 +0300
@@ -18,7 +18,7 @@
 
 # Application stuff
 APP_BIN=$(BINPATH)Syntilista$(EXEEXT)
-APP_OBJS=main.o qrc_Syntilista.o moc_main.o
+APP_OBJS=main.o resources.o moc_main.o
 APP_VERSION := $(shell cat VERSION)
 comma:= ,
 APP_VERSION_COM := $(subst .,$(comma),$(APP_VERSION))
@@ -27,6 +27,8 @@
 LOGO_SVG ?= kampuscafe4.svg
 ICON_PNGS = icon-64.png icon-48.png icon-32.png icon-16.png
 
+APP_RESOURCES += logo.png $(ICON_PNGS)
+
 
 # And target lists
 TARGETS = $(APP_BIN)
@@ -71,7 +73,7 @@
 ###
 ### Windows specific rules
 ###
-resource.rc: resource.rc.in icon.ico VERSION
+%.rc: %.rc.in icon.ico VERSION
 	@sed -e "s/@APP_VERSION@/$(APP_VERSION)/g;s/@APP_VERSION_COM@/$(APP_VERSION_COM)/g;s#@APP_EXE@#$(notdir $(APP_BIN))#g" < $< > $@
 
 $(OBJPATH)%.o: %.rc
@@ -92,7 +94,7 @@
 	@echo " CONVERT $+ -> $@"
 	@convert $+ $@
 
-qrc_Syntilista.cpp: Syntilista.qrc logo.png $(ICON_PNGS)
+%.cpp: %.qrc $(APP_RESOURCES)
 	@echo " Qt:RCC $@ $<"
 	@$(QT_RCC) -name "Syntilista" $< -o $@
 
--- a/Syntilista.qrc	Fri Apr 07 20:40:14 2017 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<RCC>
-  <qresource prefix="img">
-    <file>logo.png</file>
-    <file>icon-64.png</file>
-  </qresource>
-</RCC>
--- a/resource.rc.in	Fri Apr 07 20:40:14 2017 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-MAINICON ICON "icon.ico"
-1 VERSIONINFO
-FILEVERSION     1,0,0,0
-PRODUCTVERSION  @APP_VERSION_COM@,0
-BEGIN
-  BLOCK "StringFileInfo"
-  BEGIN
-    BLOCK "040904E4"
-    BEGIN
-      VALUE "CompanyName", "TNSP"
-      VALUE "FileDescription", "Cafe Kampus Syntilista"
-      VALUE "FileVersion", "1.0"
-      VALUE "InternalName", "Syntilista"
-      VALUE "LegalCopyright", "(C) Copyright 2017 Tecnic Software productions"
-      VALUE "OriginalFilename", "@APP_EXE@"
-      VALUE "ProductName", "Syntilista"
-      VALUE "ProductVersion", "@APP_VERSION@"
-    END
-  END
-END
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/resources.qrc	Sat Apr 08 00:20:43 2017 +0300
@@ -0,0 +1,6 @@
+<RCC>
+  <qresource prefix="img">
+    <file>logo.png</file>
+    <file>icon-64.png</file>
+  </qresource>
+</RCC>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/winres.rc.in	Sat Apr 08 00:20:43 2017 +0300
@@ -0,0 +1,20 @@
+MAINICON ICON "icon.ico"
+1 VERSIONINFO
+FILEVERSION     1,0,0,0
+PRODUCTVERSION  @APP_VERSION_COM@,0
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN
+    BLOCK "040904E4"
+    BEGIN
+      VALUE "CompanyName", "TNSP"
+      VALUE "FileDescription", "Cafe Kampus Syntilista"
+      VALUE "FileVersion", "1.0"
+      VALUE "InternalName", "Syntilista"
+      VALUE "LegalCopyright", "(C) Copyright 2017 Tecnic Software productions"
+      VALUE "OriginalFilename", "@APP_EXE@"
+      VALUE "ProductName", "Syntilista"
+      VALUE "ProductVersion", "@APP_VERSION@"
+    END
+  END
+END