From ab38969274d0e294becab5068df9f0ba7c637ded Mon Sep 17 00:00:00 2001 From: =?utf8?q?Cl=C3=A9ment=20de=20l=27Hamaide?= Date: Thu, 31 Oct 2013 14:07:31 +0100 Subject: [PATCH] Add an FGCom icon from fgcomgui (under GPL) --- package/Win-NSIS/flightgear-nightly-vs2010.nsi | 2 +- utils/fgcom/CMakeLists.txt | 4 ++++ utils/fgcom/fgcom.ico | Bin 0 -> 16958 bytes utils/fgcom/fgcom.rc | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 utils/fgcom/fgcom.ico create mode 100644 utils/fgcom/fgcom.rc 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 0000000000000000000000000000000000000000..3db9f2ec0b24aa0356f5d397abff5a96107f820b GIT binary patch literal 16958 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 literal 0 HcmV?d00001 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" -- 2.39.5