mirror of
https://github.com/panda3d/panda3d.git
synced 2025-09-28 15:53:55 -04:00
opencv: Use correct headers for videoio C interface
This commit is contained in:
parent
5e26aae1ff
commit
d2444132b2
16
.github/workflows/ci.yml
vendored
16
.github/workflows/ci.yml
vendored
@ -92,10 +92,10 @@ jobs:
|
||||
- name: Install dependencies (macOS)
|
||||
if: runner.os == 'macOS'
|
||||
run: |
|
||||
curl -O https://www.panda3d.org/download/panda3d-1.10.13/panda3d-1.10.13-tools-mac.tar.gz
|
||||
tar -xf panda3d-1.10.13-tools-mac.tar.gz
|
||||
mv panda3d-1.10.13/thirdparty thirdparty
|
||||
rmdir panda3d-1.10.13
|
||||
curl -O https://www.panda3d.org/download/panda3d-1.10.14/panda3d-1.10.14-tools-mac.tar.gz
|
||||
tar -xf panda3d-1.10.14-tools-mac.tar.gz
|
||||
mv panda3d-1.10.14/thirdparty thirdparty
|
||||
rmdir panda3d-1.10.14
|
||||
|
||||
# Temporary hack so that pzip can run, since we are about to remove Cg anyway.
|
||||
install_name_tool -id "$(pwd)/thirdparty/darwin-libs-a/nvidiacg/lib/libCg.dylib" thirdparty/darwin-libs-a/nvidiacg/lib/libCg.dylib
|
||||
@ -381,10 +381,10 @@ jobs:
|
||||
- name: Get thirdparty packages (macOS)
|
||||
if: runner.os == 'macOS'
|
||||
run: |
|
||||
curl -O https://www.panda3d.org/download/panda3d-1.10.13/panda3d-1.10.13-tools-mac.tar.gz
|
||||
tar -xf panda3d-1.10.13-tools-mac.tar.gz
|
||||
mv panda3d-1.10.13/thirdparty thirdparty
|
||||
rmdir panda3d-1.10.13
|
||||
curl -O https://www.panda3d.org/download/panda3d-1.10.14/panda3d-1.10.14-tools-mac.tar.gz
|
||||
tar -xf panda3d-1.10.14-tools-mac.tar.gz
|
||||
mv panda3d-1.10.14/thirdparty thirdparty
|
||||
rmdir panda3d-1.10.14
|
||||
(cd thirdparty/darwin-libs-a && rm -rf rocket)
|
||||
|
||||
- name: Set up Python 3.11
|
||||
|
@ -136,7 +136,7 @@ macOS
|
||||
-----
|
||||
|
||||
On macOS, you will need to download a set of precompiled thirdparty packages in order to
|
||||
compile Panda3D, which can be acquired from [here](https://www.panda3d.org/download/panda3d-1.10.13/panda3d-1.10.13-tools-mac.tar.gz).
|
||||
compile Panda3D, which can be acquired from [here](https://www.panda3d.org/download/panda3d-1.10.14/panda3d-1.10.14-tools-mac.tar.gz).
|
||||
|
||||
After placing the thirdparty directory inside the panda3d source directory,
|
||||
you may build Panda3D using a command like the following:
|
||||
|
@ -20,7 +20,7 @@
|
||||
|
||||
#include "pStatTimer.h"
|
||||
|
||||
#include <opencv2/highgui/highgui.hpp>
|
||||
#include <opencv2/videoio/videoio_c.h>
|
||||
|
||||
TypeHandle WebcamVideoCursorOpenCV::_type_handle;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user