diff --git a/FlightGear.iss b/FlightGear.iss index 9f12dec..4f3ef90 100755 --- a/FlightGear.iss +++ b/FlightGear.iss @@ -75,6 +75,7 @@ Source: "{#InstallDir64}\bin\*.*"; DestDir: "{app}\bin"; Excludes: "{#ExcludedBi ;Source: "{#InstallDir64}\share\locale\*"; DestDir: "{app}\bin\locale"; Flags: ignoreversion recursesubdirs; Check: Is64BitInstallMode Source: "{#ThirdPartyDir}\3rdParty.x64\bin\zlib.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode +Source: "{#ThirdPartyDir}\3rdParty.x64\bin\liblzma.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode Source: "{#ThirdPartyDir}\3rdParty.x64\bin\OpenAL32.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode Source: "{#ThirdPartyDir}\3rdParty.x64\bin\libpng.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode Source: "{#ThirdPartyDir}\3rdParty.x64\bin\libcurl.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode diff --git a/build_appimage.sh b/build_appimage.sh index 82b4f9f..db6a560 100755 --- a/build_appimage.sh +++ b/build_appimage.sh @@ -49,6 +49,7 @@ cp -a /usr/lib64/qt5/qml/QtQuick* appdir/usr/qml cp /usr/lib64/libsoftokn3.* appdir/usr/lib cp /usr/lib64/libnsspem.so appdir/usr/lib cp /usr/lib64/libfreebl* appdir/usr/lib +cp -a /usr/lib64/liblzma* appdir/usr/lib cp /etc/pki/tls/certs/ca-bundle.crt appdir/usr/ssl/cacert.pem #modify the desktop file so that linuxdeployqt doesn't barf (version to 1.0, add semicolon to end of certain line types) diff --git a/hudson_mac_package_release.rb b/hudson_mac_package_release.rb index 965d5da..ac97987 100755 --- a/hudson_mac_package_release.rb +++ b/hudson_mac_package_release.rb @@ -117,6 +117,9 @@ otherLibs.each do |l| `cp #{$prefixDir}/lib/lib#{l}.dylib #{$frameworksDir}` end +# copy LibLZMA from Homebrew XZ +`cp /usr/local/liblzma.dylib #{$frameworksDir}` + $osgPlugins.each do |p| pluginFile = "osgdb_#{p}.dylib" `cp #{$prefixDir}/lib/osgPlugins/#{pluginFile} #{osgPluginsDir}`