Including missing OSG plugins, use LZMA compression

diff --git a/package/Win-NSIS/flightgear-nightly.nsi b/package/Win-NSIS/flightgear-nightly.nsi
index 77a5f975309b2e60170ff99fcc80c1ecd47d18b5..55e5c151ff85444165f743666b05bfd08fdf3261 100644 (file)
--- a/package/Win-NSIS/flightgear-nightly.nsi
+++ b/package/Win-NSIS/flightgear-nightly.nsi
@@ -11,6 +11,10 @@
 Name "FlightGear Nightly"
 OutFile fgfs_win32_nightly.exe
 
+; use LZMA for best compression
+SetCompressor /FINAL /SOLID lzma
+SetCompressorDictSize 64
+
 InstallDir $PROGRAMFILES\FlightGear-nightly
 
 ; Request admin privileges for Windows Vista
@@ -88,6 +92,9 @@ Section "" ;No components page, name is not important
   
   SetOutPath $INSTDIR\osgPlugins-${OSGVersion}
   File ${OSGPluginsDir}\osgdb_ac.dll
+  File ${OSGPluginsDir}\osgdb_osg.dll
+  File ${OSGPluginsDir}\osgdb_3ds.dll
+  File ${OSGPluginsDir}\osgdb_mdl.dll
   File ${OSGPluginsDir}\osgdb_jpeg.dll
   File ${OSGPluginsDir}\osgdb_rgb.dll  
   File ${OSGPluginsDir}\osgdb_png.dll
@@ -96,7 +103,8 @@ Section "" ;No components page, name is not important
   
   Exec '"$INSTDIR\fgrun.exe"  --silent --fg-exe="$INSTDIR\fgfs.exe" --ts-exe="$INSTDIR\terrasync.exe" '
   
-  CreateShortCut "$SMPROGRAMS\FlightGear-nightly.lnk" "$INSTDIR\fgrun.exe" 
+  CreateDirectory "$SMPROGRAMS\FlightGear"
+  CreateShortCut "$SMPROGRAMS\FlightGear\FlightGear-nightly.lnk" "$INSTDIR\fgrun.exe" 
   WriteUninstaller "$INSTDIR\FlightGear_Uninstall.exe"
   
   WriteRegStr HKLM ${UninstallKey} "DisplayName" "FlightGear Nightly"
@@ -116,7 +124,9 @@ Section "Uninstall"
   SetShellVarContext all
   
   
-  Delete "$SMPROGRAMS\FlightGear-nightly.lnk"
+  Delete "$SMPROGRAMS\FlightGear\FlightGear-nightly.lnk"
+  ; only delete the FlightGear group if it's empty
+  RMDir "$SMPROGRAMS\FlightGear"
   
   RMDir /r "$INSTDIR"