Compilation tweaks

Sat, 06 Jun 2015 23:06:14 +0300

author
Teemu Piippo <crimsondusk64@gmail.com>
date
Sat, 06 Jun 2015 23:06:14 +0300
changeset 45
f5b526a3423a
parent 44
d0bf58f3560f
child 46
07578e081ae8

Compilation tweaks

icons/zcinema.ico file | annotate | diff | comparison | revisions
mkqrc.sh file | annotate | diff | comparison | revisions
src/demo.cpp file | annotate | diff | comparison | revisions
src/main.cpp file | annotate | diff | comparison | revisions
src/prompts.cpp file | annotate | diff | comparison | revisions
src/prompts.h file | annotate | diff | comparison | revisions
zcinema.ico file | annotate | diff | comparison | revisions
zcinema.qrc file | annotate | diff | comparison | revisions
Binary file icons/zcinema.ico has changed
--- a/mkqrc.sh	Sat Jun 06 23:02:51 2015 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-QRCFILE=zcinema.qrc
-FILES=$(echo ./icons/*.* LICENSE)
-
-printf "" > $QRCFILE
-
-printf "<!DOCTYPE RCC>\n<RCC version=\"1.0\">\n<qresource>\n" >> $QRCFILE
-
-for f in $FILES; do
-	printf "\t<file>$f</file>\n" >> $QRCFILE
-done
-
-printf "</qresource>\n</RCC>\n" >> $QRCFILE
--- a/src/demo.cpp	Sat Jun 06 23:02:51 2015 +0300
+++ b/src/demo.cpp	Sat Jun 06 23:06:14 2015 +0300
@@ -24,6 +24,8 @@
 #include "misc.h"
 #include "ui_demoprompt.h"
 #include "prompts.h"
+#include "config.h"
+#include "version.h"
 
 //
 // -------------------------------------------------------------------------------------------------
--- a/src/main.cpp	Sat Jun 06 23:02:51 2015 +0300
+++ b/src/main.cpp	Sat Jun 06 23:06:14 2015 +0300
@@ -20,6 +20,7 @@
 #include "demo.h"
 #include "prompts.h"
 #include "misc.h"
+#include "version.h"
 
 //
 // -------------------------------------------------------------------------------------------------
--- a/src/prompts.cpp	Sat Jun 06 23:02:51 2015 +0300
+++ b/src/prompts.cpp	Sat Jun 06 23:06:14 2015 +0300
@@ -21,6 +21,8 @@
 #include "misc.h"
 #include "ui_unknownversion.h"
 #include "ui_findfile.h"
+#include "version.h"
+#include "config.h"
 
 //
 // -------------------------------------------------------------------------------------------------
--- a/src/prompts.h	Sat Jun 06 23:02:51 2015 +0300
+++ b/src/prompts.h	Sat Jun 06 23:06:14 2015 +0300
@@ -18,7 +18,6 @@
 
 #pragma once
 #include <QDialog>
-#include "main.h"
 #include "types.h"
 
 //
Binary file zcinema.ico has changed
--- a/zcinema.qrc	Sat Jun 06 23:02:51 2015 +0300
+++ b/zcinema.qrc	Sat Jun 06 23:06:14 2015 +0300
@@ -1,7 +1,7 @@
 <!DOCTYPE RCC>
 <RCC version="1.0">
 <qresource>
-	<file>./icons/zcinema.ico</file>
+	<file>./zcinema.ico</file>
 	<file>LICENSE</file>
 </qresource>
 </RCC>

mercurial