Makefile modifications.

git-svn-id: https://svn.code.sf.net/p/deling/code/trunk@5 d07ef2b7-bbf6-4ce4-b825-8d9644e34689
myst6re · Apr 29, 2012 · c9046ef · c9046ef
1 parent c149a44
commit c9046ef
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 7 deletions.
diff --git a/Deling.desktop b/Deling.desktop
@@ -0,0 +1,16 @@
+[Desktop Entry]
+Type=Application
+Version=0.6b
+Name=Deling
+GenericName=FF8 Field Editor
+GenericName[fr]=Éditeur d'écrans FF8
+Comment=Can edit field from Final Fantasy VIII (PS & PC)
+Comment[fr]=Permet de modifier les écrans de Final Fantasy VIII (PS et PC)
+Icon=deling.png
+Exec=/usr/bin/deling
+Path=
+Terminal=false
+MimeType=application/octet-stream
+Categories=Application;Game;
+Keywords=PlayStation;Final Fantasy;
+StartupNotify=false
diff --git a/Deling.pro b/Deling.pro
@@ -97,15 +97,38 @@ SOURCES += MainWindow.cpp \
 	PlainTextEdit.cpp
 RESOURCES += Deling.qrc
 QT += opengl
-TRANSLATIONS += deling_en.ts
+TRANSLATIONS += deling_en.ts \
+	deling_ja.ts
+# macx:ICON = images/Deling.icns
 win32 {
 	RC_FILE = Deling.rc
-	OTHER_FILES += Deling.rc
 }
+
+OTHER_FILES += Deling.rc \
+	Deling.desktop
+
 # Only for static compilation
 # QTPLUGIN     += qjpcodecs
 
+#only on linux/unix (for package creation and other deploys)
+unix:!macx:!symbian {
+	system(lrelease Deling.pro)
+
+	target.path = /opt/deling
+	INSTALLS += target
 
+	lang.path = /opt/deling
+	lang.files = *.qm
+	INSTALLS += lang
+
+	icon.path = /usr/share/pixmaps/
+	icon.files = images/deling.png
+	INSTALLS += icon
+
+	desktop.path =/usr/share/applications
+	desktop.files = Deling.desktop
+	INSTALLS += desktop
+}
 
 
 

diff --git a/Deling.qrc b/Deling.qrc
@@ -54,7 +54,6 @@
         <file>images/icon-drawpoint.png</file>
         <file>images/icon-unknown.png</file>
         <file>images/ff8.png</file>
-        <file>images/deling.png</file>
         <file>images/icon-char-1.png</file>
         <file>images/icon-char-2.png</file>
         <file>images/icon-char-3.png</file>
@@ -87,8 +86,9 @@
         <file>images/icon-char-30.png</file>
         <file>images/icon-char-31.png</file>
         <file>images/font.png</file>
-        <file>images/ico.png</file>
         <file>images/door.png</file>
         <file>images/background.png</file>
+        <file>images/deling.png</file>
+        <file>images/deling_city.png</file>
     </qresource>
 </RCC>
diff --git a/Deling.rc b/Deling.rc
@@ -1,7 +1,7 @@
 #include <windows.h>
 #include "parameters.h"
 
-IDI_ICON1   ICON   DISCARDABLE   "images/ico.ico"
+IDI_ICON1   ICON   DISCARDABLE   "images/deling.ico"
 
 VS_VERSION_INFO VERSIONINFO
 	FILEVERSION			RC_PRODUCT_VERSION

diff --git a/MainWindow.cpp b/MainWindow.cpp
@@ -707,7 +707,7 @@ void MainWindow::about()
 	font.setPointSize(12);
 
 	QLabel image(&apropos);
-	image.setPixmap(QPixmap(":/images/deling.png"));
+	image.setPixmap(QPixmap(":/images/deling_city.png"));
 	image.move(-5, apropos.height() - 128);
 
 	QLabel desc1(PROG_FULLNAME, &apropos);

diff --git a/images/ico.ico → images/deling.ico b/images/ico.ico → images/deling.ico
diff --git a/images/deling.png b/images/deling.png
diff --git a/images/deling_city.png b/images/deling_city.png
diff --git a/images/ico.png b/images/ico.png
diff --git a/main.cpp b/main.cpp
@@ -31,7 +31,7 @@
 int main(int argc, char *argv[])
 {
 	QApplication app(argc, argv);
-	app.setWindowIcon(QIcon(":/images/ico.png"));
+	app.setWindowIcon(QIcon(":/images/deling.png"));
 
 	Config::set();