From b8fd786c47c7e7ed6fd6aa53c424c6c33e18dd18 Mon Sep 17 00:00:00 2001
From: "Charles J. Cliffe" <cj@cubicproductions.com>
Date: Thu, 5 Mar 2015 21:02:38 -0500
Subject: [PATCH] exe / shortcut icon, NSIS branding header

---
 CMakeLists.txt       |  18 ++++++++++++++++--
 cubicsdr.rc          |   1 +
 icon/NSIS_Header.bmp | Bin 0 -> 9742 bytes
 3 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 cubicsdr.rc
 create mode 100644 icon/NSIS_Header.bmp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c69049..24a8364 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -324,11 +324,24 @@ ELSE (MSVC)
 	)
 ENDIF(MSVC)
 
+set(RES_FILES "")
+if(MINGW)
+ set(RES_FILES ${PROJECT_SOURCE_DIR}/cubicsdr.rc)
+ set(CMAKE_RC_COMPILER_INIT windres)
+ ENABLE_LANGUAGE(RC)
+ IF(EX_PLATFORM EQUAL 64)
+	SET(RC_TARGET "pe-x86-64")
+ ELSE(EX_PLATFORM EQUAL 64)
+	SET(RC_TARGET "pe-i386")
+ ENDIF(EX_PLATFORM EQUAL 64)
+	
+ SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff <DEFINES> -i <SOURCE> -o <OBJECT>")
+endif(MINGW)
 
 IF (NOT BUNDLE_APP)
     configure_files(${PROJECT_SOURCE_DIR}/font ${CMAKE_BINARY_DIR}/${EX_PLATFORM_NAME} "*.fnt")
     configure_files(${PROJECT_SOURCE_DIR}/font ${CMAKE_BINARY_DIR}/${EX_PLATFORM_NAME} "*.png")
-    add_executable(CubicSDR ${cubicsdr_sources} ${cubicsdr_headers})
+    add_executable(CubicSDR ${cubicsdr_sources} ${cubicsdr_headers} ${RES_FILES})
     target_link_libraries(CubicSDR rtlsdr ${LIQUID_LIB} ${FFTW_LIB} ${wxWidgets_LIBRARIES} ${OPENGL_LIBRARIES} ${OTHER_LIBRARIES})
 ENDIF (NOT BUNDLE_APP)
 
@@ -432,7 +445,7 @@ IF (WIN32 AND BUILD_INSTALLER)
 	set(CPACK_PACKAGE_INSTALL_DIRECTORY "CubicSDR")
 	SET(CPACK_NSIS_INSTALLED_ICON_NAME "CubicSDR.ico")
 	SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE") 
-	 
+	set(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/icon\\\\NSIS_Header.bmp")
 	IF(EX_PLATFORM EQUAL 64)
 		SET(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES64")
 		SET(CPACK_NSIS_PACKAGE_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY}")
@@ -484,5 +497,6 @@ IF (WIN32 AND BUILD_INSTALLER)
 		set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "ExecWait '\\\"$INSTDIR\\\\vc_redist\\\\vcredist_${EX_PLATFORM_NAME}.exe\\\" /q:a'")
 	ENDIF (MSVC)
 		  
+		  
 	INCLUDE(CPack)	
 ENDIF (WIN32 AND BUILD_INSTALLER)
\ No newline at end of file
diff --git a/cubicsdr.rc b/cubicsdr.rc
new file mode 100644
index 0000000..b395d8f
--- /dev/null
+++ b/cubicsdr.rc
@@ -0,0 +1 @@
+id ICON "icon/CubicSDR.ico"
\ No newline at end of file
diff --git a/icon/NSIS_Header.bmp b/icon/NSIS_Header.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..2ee3e0513531ff301d376ed89927731615482abd
GIT binary patch
literal 9742
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
F>i?C`0yO{t

literal 0
HcmV?d00001