fly/fgmeta
1
0
Fork 0
Code Activity

fg-from-scratch: plib moved to vcpkg

Browse source
This commit is contained in:
Scott Giese 2018-08-06 21:55:23 -05:00
parent a20cdef996
commit 7e8a679eb4
1 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
fg-from-scratch/fg-from-scratch.cmd
View file

@ -31,7 +31,7 @@ IF NOT EXIST vcpkg-git/NUL (
call ./bootstrap-vcpkg
echo Compiling external libraries . . .
vcpkg install --triplet x64-windows boost cgal curl freeglut freetype gdal glew jasper libxml2 openal-soft openjpeg openssl sdl2 tiff zlib
vcpkg install --triplet x64-windows boost cgal curl freeglut freetype gdal glew jasper libxml2 openal-soft openjpeg openssl plib sdl2 tiff zlib
) ELSE (
echo Updating vcpkg . . .
cd vcpkg-git
@ -42,7 +42,7 @@ IF NOT EXIST vcpkg-git/NUL (
vcpkg upgrade --triplet x64-windows --no-dry-run
REM Okay to comment out this line once all the packages have been confirmed to have been installed
vcpkg install --triplet x64-windows boost cgal curl freeglut freetype gdal glew jasper libxml2 openal-soft openjpeg openssl sdl2 tiff zlib
vcpkg install --triplet x64-windows boost cgal curl freeglut freetype gdal glew jasper libxml2 openal-soft openjpeg openssl plib sdl2 tiff zlib
)
cd %ROOT_DIR%
@ -68,17 +68,6 @@ IF NOT EXIST simgear-git/NUL (
)
cd %ROOT_DIR%
IF NOT EXIST plib-git/NUL (
mkdir plib-build
echo Downloading PLib . . .
git clone https://github.com/congocongo/plib.git plib-git
) ELSE (
echo Updating PLib . . .
cd plib-git
git pull
)
cd %ROOT_DIR%
IF NOT EXIST flightgear-git/NUL (
mkdir flightgear-build
echo Downloading FlightGear . . .
@ -181,7 +170,7 @@ cmake ..\flightgear-git -G %CMAKE_TOOLCHAIN% ^
-DGDAL_LIBRARY=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/gdal.lib ^
-DOPENAL_INCLUDE_DIR=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
-DOPENAL_LIBRARY=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/OpenAL32.lib ^
-DPLIB_INCLUDE_DIR=%ROOT_DIR%/Stage/include ^
-DPLIB_INCLUDE_DIR=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
-DPNG_PNG_INCLUDE_DIR=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^
-DPNG_LIBRARY=%ROOT_DIR%/vcpkg-git/installed/x64-windows/lib/libpng16.lib ^
-DZLIB_INCLUDE_DIR=%ROOT_DIR%/vcpkg-git/installed/x64-windows/include ^