exe / shortcut icon, NSIS branding header

Author: cjcliffe

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)

cubicsdr.rc

@@ -0,0 +1 @@
+id ICON "icon/CubicSDR.ico"