diff --git a/FlightGear.iss b/FlightGear.iss index 3fa6290..a799261 100755 --- a/FlightGear.iss +++ b/FlightGear.iss @@ -75,6 +75,7 @@ Source: "X:\install\msvc100\FGRun\share\locale\*"; DestDir: "{app}\bin\locale"; Source: "X:\3rdParty\bin\zlib.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode Source: "X:\3rdParty\bin\OpenAL32.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode Source: "X:\3rdParty\bin\libpng16.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode +Source: "X:\3rdParty\bin\libcurl.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode Source: "X:\3rdParty\bin\libintl-8.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode Source: "X:\3rdParty\bin\CrashRpt1402.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode Source: "X:\3rdParty\bin\crashrpt_lang.ini"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode @@ -90,6 +91,7 @@ Source: "X:\3rdParty.x64\bin\zlib.dll"; DestDir: "{app}\bin"; Check: Is64BitInst Source: "X:\3rdParty.x64\bin\OpenAL32.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode Source: "X:\3rdParty.x64\bin\vcredist_x64.exe"; DestDir: "{app}\bin"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode Source: "X:\3rdParty.x64\bin\libpng16.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode +Source: "X:\3rdParty.x64\bin\libcurl.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode Source: "X:\3rdParty.x64\bin\libintl-8.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode Source: "X:\3rdParty.x64\bin\CrashRpt1402.dll"; DestDir: "{app}\bin"; Check: Is64BitInstallMode Source: "X:\3rdParty.x64\bin\crashrpt_lang.ini"; DestDir: "{app}\bin"; Check: Is64BitInstallMode diff --git a/build_release_linux.sh b/build_release_linux.sh index 07c384e..f7b7d96 100755 --- a/build_release_linux.sh +++ b/build_release_linux.sh @@ -19,7 +19,7 @@ rm -rf dist/* ##################################################################################### echo "Starting on SimGear" cd sgBuild -cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DSIMGEAR_SHARED:BOOL="ON" ../simgear +cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DENABLE_CURL:BOOL="ON" -DSIMGEAR_SHARED:BOOL="ON" ../simgear # compile make diff --git a/build_release_windows.bat b/build_release_windows.bat index 53d3685..13344e8 100755 --- a/build_release_windows.bat +++ b/build_release_windows.bat @@ -8,6 +8,7 @@ md build-fgrun32 cd build-sg32 cmake ..\simgear -G "Visual Studio 10" ^ -DMSVC_3RDPARTY_ROOT=%WORKSPACE% ^ + -DENABLE_CURL:BOOL="ON" ^ -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc100/SimGear ^ -DBOOST_ROOT=%WORKSPACE%/Boost cmake --build . --config Release --target INSTALL @@ -42,6 +43,7 @@ cd build-sg64 cmake ..\SimGear -G "Visual Studio 10 Win64" ^ -DMSVC_3RDPARTY_ROOT=%WORKSPACE% ^ -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc100-64/SimGear ^ + -DENABLE_CURL:BOOL="ON" ^ -DBOOST_ROOT=%WORKSPACE%/Boost cmake --build . --config Release --target INSTALL diff --git a/hudson_mac_build_release.sh b/hudson_mac_build_release.sh index 834c468..4470eec 100755 --- a/hudson_mac_build_release.sh +++ b/hudson_mac_build_release.sh @@ -21,7 +21,7 @@ echo "Build path is: $PATH" ############################################################################### echo "Starting on SimGear" pushd sgBuild -cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DCMAKE_BUILD_TYPE=RelWithDebInfo ../simgear +cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DENABLE_CURL:BOOL="ON" -DCMAKE_BUILD_TYPE=RelWithDebInfo ../simgear # compile make