From c430cc7b7df040f15d73e790045d27eadd2c0433 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Cl=C3=A9ment=20de=20l=27Hamaide?= Date: Sat, 2 Aug 2014 20:47:08 +0200 Subject: [PATCH] Win-nightly fixes Win64-nightly: add CrashReporter Win32/64-nightly: remove outdated option + set fgdata dir --- package/Win-NSIS/flightgear-nightly-vs2010.nsi | 2 +- package/Win-NSIS/flightgear64-nightly-vs2010.nsi | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/Win-NSIS/flightgear-nightly-vs2010.nsi b/package/Win-NSIS/flightgear-nightly-vs2010.nsi index 8497f0519..1cbfe7f6e 100644 --- a/package/Win-NSIS/flightgear-nightly-vs2010.nsi +++ b/package/Win-NSIS/flightgear-nightly-vs2010.nsi @@ -129,7 +129,7 @@ Section "" ;No components page, name is not important File ${OSGPluginsDir}\osgdb_deprecated_osgparticle.dll - Exec '"$INSTDIR\bin\fgrun.exe" --silent --fg-exe="$INSTDIR\bin\fgfs.exe" ' + Exec '"$INSTDIR\bin\fgrun.exe" --silent --fg-exe="$INSTDIR\bin\fgfs.exe" --fg-root="$INSTDIR\data"' CreateDirectory "$SMPROGRAMS\FlightGear" CreateShortCut "$SMPROGRAMS\FlightGear\FlightGear-nightly-2010.lnk" "$INSTDIR\bin\fgrun.exe" diff --git a/package/Win-NSIS/flightgear64-nightly-vs2010.nsi b/package/Win-NSIS/flightgear64-nightly-vs2010.nsi index a4065edfb..e9d2f193f 100644 --- a/package/Win-NSIS/flightgear64-nightly-vs2010.nsi +++ b/package/Win-NSIS/flightgear64-nightly-vs2010.nsi @@ -91,6 +91,8 @@ Section "" ;No components page, name is not important File ${OSGInstallDir}\bin\ot13-OpenThreads.dll File ${ThirdPartyBinDir}\*.dll + File ${ThirdPartyBinDir}\CrashSender1402.exe + File ${ThirdPartyBinDir}\crashrpt_lang.ini File ${RTIInstallDir}\bin\FedTime.dll File ${RTIInstallDir}\bin\RTI-NG.dll @@ -127,7 +129,7 @@ Section "" ;No components page, name is not important File ${OSGPluginsDir}\osgdb_deprecated_osgparticle.dll - Exec '"$INSTDIR\bin\fgrun.exe" --silent --fg-exe="$INSTDIR\bin\fgfs.exe" --ts-exe="$INSTDIR\bin\terrasync.exe" ' + Exec '"$INSTDIR\bin\fgrun.exe" --silent --fg-exe="$INSTDIR\bin\fgfs.exe" --fg-root="$INSTDIR\data"' CreateDirectory "$SMPROGRAMS\FlightGear" CreateShortCut "$SMPROGRAMS\FlightGear\FlightGear64-nightly-2010.lnk" "$INSTDIR\bin\fgrun.exe" -- 2.39.2