From: Uwe Hermann <redacted>
Date: Fri, 3 Jan 2014 15:28:02 +0000 (+0100)
Subject: mingw: Add the sigrok icon for pulseview.exe.
X-Git-Tag: pulseview-0.2.0~164
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=fe15e0bc0503b8eecd503c1685031be3e4ef12cf;p=pulseview.git

mingw: Add the sigrok icon for pulseview.exe.

Add an .rc file (needed for the Windows executable icon), and hook up
building/adding the respective object in CMakeLists.txt.

This closes bug #110.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5ec003fc..8302b482 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -213,6 +213,13 @@ if(ENABLE_DECODE)
 	)
 endif()
 
+if(WIN32)
+	# Use the sigrok icon for the pulseview.exe executable.
+	set(CMAKE_RC_COMPILE_OBJECT "${CMAKE_RC_COMPILER} -O coff -I${CMAKE_CURRENT_SOURCE_DIR} <SOURCE> <OBJECT>")
+	enable_language(RC)
+ 	list(APPEND pulseview_SOURCES pulseviewico.rc)
+endif()
+
 qt4_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS})
 qt4_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS})
 qt4_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES})
diff --git a/pulseviewico.rc b/pulseviewico.rc
new file mode 100644
index 00000000..4ba6fd0d
--- /dev/null
+++ b/pulseviewico.rc
@@ -0,0 +1 @@
+IDI_ICON1	ICON	DISCARDABLE	"icons/sigrok-logo-notext.ico"