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 24afbc65031a64dae8de2dbb77293cfebbc2efcf..30acd05810471f2ed664ab9b0bb03815fd17847a 100644 (file)
--- 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 f733e241193cc8594e34d27f2839fe80f2bb848f..090a88c2e3d43f6168fcbcd80c8009560da438d8 100644 (file)
--- 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 (file)
index 0000000..3db9f2e
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 (file)
index 0000000..7b76923
--- /dev/null
+++ b/utils/fgcom/fgcom.rc
@@ -0,0 +1 @@
+FGCOM              ICON                    "fgcom.ico"