From: Clément de l'Hamaide <clemaez@hotmail.fr>
Date: Thu, 31 Oct 2013 13:07:31 +0000 (+0100)
Subject: Add an FGCom icon from fgcomgui (under GPL)
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ab38969274d0e294becab5068df9f0ba7c637ded;p=flightgear.git

Add an FGCom icon from fgcomgui (under GPL)
---

diff --git a/package/Win-NSIS/flightgear-nightly-vs2010.nsi b/package/Win-NSIS/flightgear-nightly-vs2010.nsi
index 24afbc650..30acd0581 100644
--- a/package/Win-NSIS/flightgear-nightly-vs2010.nsi
+++ b/package/Win-NSIS/flightgear-nightly-vs2010.nsi
@@ -127,7 +127,7 @@ Section "" ;No components page, name is not important
   CreateDirectory "$SMPROGRAMS\FlightGear"
   CreateShortCut "$SMPROGRAMS\FlightGear\FlightGear-nightly-2010.lnk" "$INSTDIR\bin\fgrun.exe"
   CreateShortCut "$SMPROGRAMS\FlightGear\FGCom-nightly-2010.lnk" "$INSTDIR\bin\fgcom.exe"
-  CreateShortCut "$SMPROGRAMS\FlightGear\FGCom-testing-nightly-2010.lnk" "$INSTDIR\bin\fgcom.exe -f910"
+  CreateShortCut "$SMPROGRAMS\FlightGear\FGCom-testing-nightly-2010.lnk" "$INSTDIR\bin\fgcom.exe" "-f910"
   
   
   WriteUninstaller "$INSTDIR\bin\FlightGear_Uninstall.exe"
diff --git a/utils/fgcom/CMakeLists.txt b/utils/fgcom/CMakeLists.txt
index f733e2411..090a88c2e 100644
--- a/utils/fgcom/CMakeLists.txt
+++ b/utils/fgcom/CMakeLists.txt
@@ -2,6 +2,10 @@
     # set data installed location
     set(PKGDATAPATH "${CMAKE_INSTALL_PREFIX}/share/flightgear")
 
+    if (MSVC)
+      set( RESOURCE_FILE fgcom.rc )
+    endif (MSVC)
+
     # then to define the files themselves, in their 'installed' 
     # location, not their source location...
     if (NOT DEFAULT_POSITIONS_FILE)
diff --git a/utils/fgcom/fgcom.ico b/utils/fgcom/fgcom.ico
new file mode 100644
index 000000000..3db9f2ec0
Binary files /dev/null and b/utils/fgcom/fgcom.ico differ
diff --git a/utils/fgcom/fgcom.rc b/utils/fgcom/fgcom.rc
new file mode 100644
index 000000000..7b769231d
--- /dev/null
+++ b/utils/fgcom/fgcom.rc
@@ -0,0 +1 @@
+FGCOM              ICON                    "fgcom.ico"