TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 00:06:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/1.10.x'

Browse Source
This commit is contained in:
rdb 2022-10-03 18:38:47 +02:00
commit 27e54ffd75
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dtool/src/dtoolbase/dtool_platform.h
View File

@ -79,6 +79,9 @@
#elif defined(__ppc__) #elif defined(__ppc__)
#define DTOOL_PLATFORM "linux_ppc" #define DTOOL_PLATFORM "linux_ppc"
#elif defined(__e2k__)
#define DTOOL_PLATFORM "linux_e2k"
#endif #endif
#if !defined(DTOOL_PLATFORM) && !defined(CPPPARSER) #if !defined(DTOOL_PLATFORM) && !defined(CPPPARSER)

2
panda/src/device/config_device.cxx
View File

@ -23,6 +23,7 @@
#include "dialNode.h" #include "dialNode.h"
#include "evdevInputDevice.h" #include "evdevInputDevice.h"
#include "inputDevice.h" #include "inputDevice.h"
#include "inputDeviceNode.h"
#include "linuxJoystickDevice.h" #include "linuxJoystickDevice.h"
#include "trackerNode.h" #include "trackerNode.h"
#include "virtualMouse.h" #include "virtualMouse.h"
@ -68,6 +69,7 @@ init_libdevice() {
ClientTrackerDevice::init_type(); ClientTrackerDevice::init_type();
DialNode::init_type(); DialNode::init_type();
InputDevice::init_type(); InputDevice::init_type();
InputDeviceNode::init_type();
TrackerNode::init_type(); TrackerNode::init_type();
VirtualMouse::init_type(); VirtualMouse::init_type();

2
panda/src/glstuff/glGraphicsStateGuardian_src.h
View File

@ -55,7 +55,7 @@ typedef double GLdouble;
// mainly because they will not be included from glext.h if the system GL // mainly because they will not be included from glext.h if the system GL
// version matches or exceeds the GL version in which these functions are // version matches or exceeds the GL version in which these functions are
// defined, and the system gl.h sometimes doesn't declare these typedefs. // defined, and the system gl.h sometimes doesn't declare these typedefs.
#if !defined( __EDG__ ) || defined( __INTEL_COMPILER ) // Protect the following from the Tau instrumentor and expose it for the intel compiler. #if !defined( __EDG__ ) || defined( __INTEL_COMPILER ) || defined( __MCST__ ) // Protect the following from the Tau instrumentor and expose it for the intel compiler.
typedef const GLubyte * (APIENTRYP PFNGLGETSTRINGIPROC) (GLenum name, GLuint index); typedef const GLubyte * (APIENTRYP PFNGLGETSTRINGIPROC) (GLenum name, GLuint index);
typedef void (APIENTRY *GLDEBUGPROC_P)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const GLvoid *userParam); typedef void (APIENTRY *GLDEBUGPROC_P)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const GLvoid *userParam);
typedef void (APIENTRYP PFNGLDEBUGMESSAGECALLBACKPROC_P) (GLDEBUGPROC_P callback, const void *userParam); typedef void (APIENTRYP PFNGLDEBUGMESSAGECALLBACKPROC_P) (GLDEBUGPROC_P callback, const void *userParam);