Merge branch 'release/1.10.x'

.travis.yml

@@ -54,3 +54,8 @@ notifications:
     on_failure: always
     use_notice: true
     skip_join: false
+  webhooks:
+    urls:
+      - https://www.panda3d.org/webhooks/travis-ci.php
+    on_success: change
+    on_failure: always

README.md

@@ -22,7 +22,7 @@ Installing Panda3D
 ==================
 
 The latest Panda3D SDK can be downloaded from
-(this page)[https://www.panda3d.org/download/sdk-1-10-0/].
+[this page](https://www.panda3d.org/download/sdk-1-10-0/).
 If you are familiar with installing Python packages, you can use
 the following comand:
 
@@ -40,7 +40,7 @@ pip install --pre --extra-index-url https://archive.panda3d.org/ panda3d
 If this command fails, please make sure your version of pip is up-to-date.
 
 If you prefer to install the full SDK with all tools, the latest development
-builds can be obtained from (this page)[https://www.panda3d.org/download/].
+builds can be obtained from [this page](https://www.panda3d.org/download.php?version=devel&sdk).
 
 These are automatically kept up-to-date with the latest GitHub version of Panda.
 

makepanda/makepanda.py

@@ -5750,7 +5750,7 @@ if not PkgSkip("PANDATOOL") and not PkgSkip("ASSIMP"):
   TargetAdd('p3assimp_composite1.obj', opts=OPTS, input='p3assimp_composite1.cxx')
   TargetAdd('libp3assimp.dll', input='p3assimp_composite1.obj')
   TargetAdd('libp3assimp.dll', input=COMMON_PANDA_LIBS)
-  TargetAdd('libp3assimp.dll', opts=OPTS+['ZLIB'])
+  TargetAdd('libp3assimp.dll', opts=OPTS+['ZLIB', 'ADVAPI'])
 
 #
 # DIRECTORY: pandatool/src/daeprogs/

panda/src/movies/opusAudioCursor.cxx

@@ -12,6 +12,10 @@
  */
 
 #include "opusAudioCursor.h"
+
+#include "config_movies.h"
+
+#include "opusAudio.h"
 #include "virtualFileSystem.h"
 
 #ifdef HAVE_OPUS

panda/src/movies/vorbisAudioCursor.cxx

@@ -12,6 +12,10 @@
  */
 
 #include "vorbisAudioCursor.h"
+
+#include "config_movies.h"
+
+#include "vorbisAudio.h"
 #include "virtualFileSystem.h"
 
 #ifdef HAVE_VORBIS