@@ -32,6 +32,7 @@ KEEP=""
32
32
UNITY_BUILD=" "
33
33
VS_VERSION=" "
34
34
NMAKE=" "
35
+ PDBS=" "
35
36
PLATFORM=" "
36
37
CONFIGURATION=" "
37
38
TEST_FRAMEWORK=" "
@@ -76,6 +77,9 @@ while [ $# -gt 0 ]; do
76
77
PLATFORM=$1
77
78
shift ;;
78
79
80
+ P )
81
+ PDBS=true ;;
82
+
79
83
c )
80
84
CONFIGURATION=$1
81
85
shift ;;
@@ -107,6 +111,8 @@ Options:
107
111
Choose the Visual Studio version to use.
108
112
-n
109
113
Produce NMake makefiles instead of a Visual Studio solution.
114
+ -P
115
+ Download debug symbols where available
110
116
-V
111
117
Run verbosely
112
118
EOF
@@ -257,6 +263,7 @@ case $VS_VERSION in
257
263
MSVC_REAL_VER=" 16"
258
264
MSVC_VER=" 14.2"
259
265
MSVC_YEAR=" 2015"
266
+ MSVC_REAL_YEAR=" 2019"
260
267
MSVC_DISPLAY_YEAR=" 2019"
261
268
BOOST_VER=" 1.71.0"
262
269
BOOST_VER_URL=" 1_71_0"
@@ -269,6 +276,7 @@ case $VS_VERSION in
269
276
MSVC_REAL_VER=" 15"
270
277
MSVC_VER=" 14.1"
271
278
MSVC_YEAR=" 2015"
279
+ MSVC_REAL_YEAR=" 2017"
272
280
MSVC_DISPLAY_YEAR=" 2017"
273
281
BOOST_VER=" 1.67.0"
274
282
BOOST_VER_URL=" 1_67_0"
@@ -281,22 +289,16 @@ case $VS_VERSION in
281
289
MSVC_REAL_VER=" 14"
282
290
MSVC_VER=" 14.0"
283
291
MSVC_YEAR=" 2015"
292
+ MSVC_REAL_YEAR=" 2015"
284
293
MSVC_DISPLAY_YEAR=" 2015"
285
294
BOOST_VER=" 1.67.0"
286
295
BOOST_VER_URL=" 1_67_0"
287
296
BOOST_VER_SDK=" 106700"
288
297
;;
289
298
290
299
12|12.0|2013 )
291
- GENERATOR=" Visual Studio 12 2013"
292
- TOOLSET=" vc120"
293
- MSVC_REAL_VER=" 12"
294
- MSVC_VER=" 12.0"
295
- MSVC_YEAR=" 2013"
296
- MSVC_DISPLAY_YEAR=" 2013"
297
- BOOST_VER=" 1.58.0"
298
- BOOST_VER_URL=" 1_58_0"
299
- BOOST_VER_SDK=" 105800"
300
+ echo " Visual Studio 2013 is no longer supported"
301
+ exit 1
300
302
;;
301
303
esac
302
304
@@ -387,7 +389,7 @@ if [ -z $SKIP_DOWNLOAD ]; then
387
389
388
390
# Bullet
389
391
download " Bullet 2.86" \
390
- " https://www.lysator .liu.se/~ace/OpenMW/deps /Bullet-2.86-msvc${MSVC_YEAR} -win${BITS} .7z" \
392
+ " https://rgw.ctrl-c .liu.se/openmw/Deps /Bullet-2.86-msvc${MSVC_YEAR} -win${BITS} .7z" \
391
393
" Bullet-2.86-msvc${MSVC_YEAR} -win${BITS} .7z"
392
394
393
395
# FFmpeg
@@ -399,7 +401,7 @@ if [ -z $SKIP_DOWNLOAD ]; then
399
401
400
402
# MyGUI
401
403
download " MyGUI 3.2.2" \
402
- " https://www.lysator .liu.se/~ace/OpenMW/deps /MyGUI-3.2.2-msvc${MSVC_YEAR} -win${BITS} .7z" \
404
+ " https://rgw.ctrl-c .liu.se/openmw/Deps /MyGUI-3.2.2-msvc${MSVC_YEAR} -win${BITS} .7z" \
403
405
" MyGUI-3.2.2-msvc${MSVC_YEAR} -win${BITS} .7z"
404
406
405
407
# OpenAL
@@ -408,9 +410,15 @@ if [ -z $SKIP_DOWNLOAD ]; then
408
410
" OpenAL-Soft-1.19.1.zip"
409
411
410
412
# OSG
411
- download " OpenSceneGraph 3.4.1-scrawl" \
412
- " https://www.lysator.liu.se/~ace/OpenMW/deps/OSG-3.4.1-scrawl-msvc${MSVC_YEAR} -win${BITS} .7z" \
413
- " OSG-3.4.1-scrawl-msvc${MSVC_YEAR} -win${BITS} .7z"
413
+ download " OpenSceneGraph 3.4.2-experimental" \
414
+ " https://rgw.ctrl-c.liu.se/openmw/Deps/OSG-3.4.2-experimental-msvc${MSVC_REAL_YEAR} -win${BITS} .7z" \
415
+ " OSG-3.4.2-experimental-msvc${MSVC_REAL_YEAR} -win${BITS} .7z"
416
+
417
+ if [ -n " $PDBS " ]; then
418
+ download " OpenSceneGraph symbols" \
419
+ " https://rgw.ctrl-c.liu.se/openmw/Deps/OSG-3.4.2-experimental-msvc${MSVC_REAL_YEAR} -win${BITS} -sym.7z" \
420
+ " OSG-3.4.2-experimental-msvc${MSVC_REAL_YEAR} -win${BITS} -sym.7z"
421
+ fi
414
422
415
423
# Qt
416
424
if [ -z $APPVEYOR ]; then
@@ -608,19 +616,20 @@ printf "OpenAL-Soft 1.19.1... "
608
616
cd $DEPS
609
617
echo
610
618
# OSG
611
- printf " OSG 3.4.1-scrawl ... "
619
+ printf " OSG 3.4.2-experimental ... "
612
620
{
613
621
cd $DEPS_INSTALL
614
622
if [ -d OSG ] && \
615
623
grep " OPENSCENEGRAPH_MAJOR_VERSION 3" OSG/include/osg/Version > /dev/null && \
616
624
grep " OPENSCENEGRAPH_MINOR_VERSION 4" OSG/include/osg/Version > /dev/null && \
617
- grep " OPENSCENEGRAPH_PATCH_VERSION 1 " OSG/include/osg/Version > /dev/null
625
+ grep " OPENSCENEGRAPH_PATCH_VERSION 2 " OSG/include/osg/Version > /dev/null
618
626
then
619
627
printf " Exists. "
620
628
elif [ -z $SKIP_EXTRACT ]; then
621
629
rm -rf OSG
622
- eval 7z x -y " ${DEPS} /OSG-3.4.1-scrawl-msvc${MSVC_YEAR} -win${BITS} .7z" $STRIP
623
- mv " OSG-3.4.1-scrawl-msvc${MSVC_YEAR} -win${BITS} " OSG
630
+ eval 7z x -y " ${DEPS} /OSG-3.4.2-experimental-msvc${MSVC_REAL_YEAR} -win${BITS} .7z" $STRIP
631
+ [ -n " $PDBS " ] && eval 7z x -y " ${DEPS} /OSG-3.4.2-experimental-msvc${MSVC_REAL_YEAR} -win${BITS} -sym.7z" $STRIP
632
+ mv " OSG-3.4.2-experimental-msvc${MSVC_REAL_YEAR} -win${BITS} " OSG
624
633
fi
625
634
OSG_SDK=" $( real_pwd) /OSG"
626
635
add_cmake_opts -DOSG_DIR=" $OSG_SDK "
@@ -629,10 +638,10 @@ printf "OSG 3.4.1-scrawl... "
629
638
else
630
639
SUFFIX=" "
631
640
fi
632
- add_runtime_dlls " $( pwd) /OSG/bin/" {OpenThreads,zlib,libpng* }${SUFFIX} .dll \
641
+ add_runtime_dlls " $( pwd) /OSG/bin/" {OpenThreads,zlib,libpng}${SUFFIX} .dll \
633
642
" $( pwd) /OSG/bin/osg" {,Animation,DB,FX,GA,Particle,Text,Util,Viewer,Shadow}${SUFFIX} .dll
634
- add_osg_dlls " $( pwd) /OSG/bin/osgPlugins-3.4.1 /osgdb_" {bmp,dds,freetype,jpeg,osg,png,tga}${SUFFIX} .dll
635
- add_osg_dlls " $( pwd) /OSG/bin/osgPlugins-3.4.1 /osgdb_serializers_osg" {,animation,fx,ga,particle,text,util,viewer,shadow}${SUFFIX} .dll
643
+ add_osg_dlls " $( pwd) /OSG/bin/osgPlugins-3.4.2 /osgdb_" {bmp,dds,freetype,jpeg,osg,png,tga}${SUFFIX} .dll
644
+ add_osg_dlls " $( pwd) /OSG/bin/osgPlugins-3.4.2 /osgdb_serializers_osg" {,animation,fx,ga,particle,text,util,viewer,shadow}${SUFFIX} .dll
636
645
echo Done.
637
646
}
638
647
cd $DEPS
817
826
done
818
827
echo
819
828
echo " - OSG Plugin DLLs..."
820
- mkdir -p ${DLL_PREFIX} osgPlugins-3.4.1
829
+ mkdir -p ${DLL_PREFIX} osgPlugins-3.4.2
821
830
for DLL in $OSG_PLUGINS ; do
822
831
echo " $( basename $DLL ) ."
823
- cp " $DLL " ${DLL_PREFIX} osgPlugins-3.4.1
832
+ cp " $DLL " ${DLL_PREFIX} osgPlugins-3.4.2
824
833
done
825
834
echo
826
835
echo " - Qt Platform DLLs..."
0 commit comments