TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 10:54:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

general: Break apart BUILDING_PANDAGL

Browse Source
This commit is contained in:
Sam Edwards 2018-06-10 20:27:23 -06:00
parent 768f78306a
commit a971bc1dfc
18 changed files with 88 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/cocoadisplay/config_cocoadisplay.h
View File

@ -18,8 +18,8 @@
#include "notifyCategoryProxy.h" #include "notifyCategoryProxy.h"
#include "configVariableBool.h" #include "configVariableBool.h"
NotifyCategoryDecl(cocoadisplay, EXPCL_PANDAGL, EXPTP_PANDAGL); NotifyCategoryDecl(cocoadisplay, EXPCL_PANDA_COCOADISPLAY, EXPTP_PANDA_COCOADISPLAY);
extern EXPCL_PANDAGL void init_libcocoadisplay(); extern EXPCL_PANDA_COCOADISPLAY void init_libcocoadisplay();
#endif #endif

4
panda/src/cocoadisplay/config_cocoadisplay.mm
View File

@ -20,8 +20,8 @@
#include "dconfig.h" #include "dconfig.h"
#include "pandaSystem.h" #include "pandaSystem.h"
#if !defined(CPPPARSER) && !defined(BUILDING_PANDAGL) #if !defined(CPPPARSER) && !defined(BUILDING_PANDA_COCOADISPLAY)
#error Buildsystem error: BUILDING_PANDAGL not defined #error Buildsystem error: BUILDING_PANDA_COCOADISPLAY not defined
#endif #endif
Configure(config_cocoadisplay); Configure(config_cocoadisplay);

2
panda/src/framework/pandaFramework.cxx
View File

@ -91,7 +91,7 @@ open_framework(int &argc, char **&argv) {
// If we're statically linking, we need to explicitly link with at least one // If we're statically linking, we need to explicitly link with at least one
// of the available renderers. // of the available renderers.
#if defined(HAVE_GL) #if defined(HAVE_GL)
extern EXPCL_PANDAGL void init_libpandagl(); extern void init_libpandagl();
init_libpandagl(); init_libpandagl();
#elif defined(HAVE_DX9) #elif defined(HAVE_DX9)
extern EXPCL_PANDADX void init_libpandadx9(); extern EXPCL_PANDADX void init_libpandadx9();

4
panda/src/glgsg/config_glgsg.cxx
View File

@ -16,8 +16,8 @@
#include "dconfig.h" #include "dconfig.h"
#if !defined(CPPPARSER) && !defined(BUILDING_PANDAGL) #if !defined(CPPPARSER) && !defined(BUILDING_PANDA_GLGSG)
#error Buildsystem error: BUILDING_PANDAGL not defined #error Buildsystem error: BUILDING_PANDA_GLGSG not defined
#endif #endif
ConfigureDef(config_glgsg); ConfigureDef(config_glgsg);

6
panda/src/glgsg/config_glgsg.h
View File

@ -18,9 +18,9 @@
#include "notifyCategoryProxy.h" #include "notifyCategoryProxy.h"
#include "dconfig.h" #include "dconfig.h"
ConfigureDecl(config_glgsg, EXPCL_PANDAGL, EXPTP_PANDAGL); ConfigureDecl(config_glgsg, EXPCL_PANDA_GLGSG, EXPTP_PANDA_GLGSG);
NotifyCategoryDecl(glgsg, EXPCL_PANDAGL, EXPTP_PANDAGL); NotifyCategoryDecl(glgsg, EXPCL_PANDA_GLGSG, EXPTP_PANDA_GLGSG);
extern EXPCL_PANDAGL void init_libglgsg(); extern EXPCL_PANDA_GLGSG void init_libglgsg();
#endif #endif

4
panda/src/glgsg/glgsg.h
View File

@ -37,8 +37,8 @@
#define GLSYSTEM_NAME "OpenGL" #define GLSYSTEM_NAME "OpenGL"
#define CONFIGOBJ config_glgsg #define CONFIGOBJ config_glgsg
#define GLCAT glgsg_cat #define GLCAT glgsg_cat
#define EXPCL_GL EXPCL_PANDAGL #define EXPCL_GL EXPCL_PANDA_GLGSG
#define EXPTP_GL EXPTP_PANDAGL #define EXPTP_GL EXPTP_PANDA_GLGSG
#if MIN_GL_VERSION_MAJOR > 1 || (MIN_GL_VERSION_MAJOR == 1 && MIN_GL_VERSION_MINOR >= 2) #if MIN_GL_VERSION_MAJOR > 1 || (MIN_GL_VERSION_MAJOR == 1 && MIN_GL_VERSION_MINOR >= 2)
#define EXPECT_GL_VERSION_1_2 #define EXPECT_GL_VERSION_1_2

6
panda/src/glstuff/glmisc_src.h
View File

@ -40,8 +40,8 @@
// #define GSG_VERBOSE 1 // #define GSG_VERBOSE 1
extern ConfigVariableInt gl_version; extern EXPCL_GL ConfigVariableInt gl_version;
extern EXPCL_PANDAGL ConfigVariableBool gl_support_fbo; extern EXPCL_GL ConfigVariableBool gl_support_fbo;
extern ConfigVariableBool gl_cheap_textures; extern ConfigVariableBool gl_cheap_textures;
extern ConfigVariableBool gl_ignore_clamp; extern ConfigVariableBool gl_ignore_clamp;
extern ConfigVariableBool gl_support_clamp_to_border; extern ConfigVariableBool gl_support_clamp_to_border;
@ -58,7 +58,7 @@ extern ConfigVariableBool gl_interleaved_arrays;
extern ConfigVariableBool gl_parallel_arrays; extern ConfigVariableBool gl_parallel_arrays;
extern ConfigVariableInt gl_max_errors; extern ConfigVariableInt gl_max_errors;
extern ConfigVariableEnum<GeomEnums::UsageHint> gl_min_buffer_usage_hint; extern ConfigVariableEnum<GeomEnums::UsageHint> gl_min_buffer_usage_hint;
extern ConfigVariableBool gl_debug; extern EXPCL_GL ConfigVariableBool gl_debug;
extern ConfigVariableBool gl_debug_synchronous; extern ConfigVariableBool gl_debug_synchronous;
extern ConfigVariableEnum<NotifySeverity> gl_debug_abort_level; extern ConfigVariableEnum<NotifySeverity> gl_debug_abort_level;
extern ConfigVariableBool gl_debug_object_labels; extern ConfigVariableBool gl_debug_object_labels;

4
panda/src/glxdisplay/config_glxdisplay.cxx
View File

@ -23,8 +23,8 @@
#include "dconfig.h" #include "dconfig.h"
#include "pandaSystem.h" #include "pandaSystem.h"
#if !defined(CPPPARSER) && !defined(BUILDING_PANDAGL) #if !defined(CPPPARSER) && !defined(BUILDING_PANDA_GLXDISPLAY)
#error Buildsystem error: BUILDING_PANDAGL not defined #error Buildsystem error: BUILDING_PANDA_GLXDISPLAY not defined
#endif #endif
Configure(config_glxdisplay); Configure(config_glxdisplay);

4
panda/src/glxdisplay/config_glxdisplay.h
View File

@ -20,9 +20,9 @@
#include "configVariableBool.h" #include "configVariableBool.h"
#include "configVariableInt.h" #include "configVariableInt.h"
NotifyCategoryDecl(glxdisplay, EXPCL_PANDAGL, EXPTP_PANDAGL); NotifyCategoryDecl(glxdisplay, EXPCL_PANDA_GLXDISPLAY, EXPTP_PANDA_GLXDISPLAY);
extern EXPCL_PANDAGL void init_libglxdisplay(); extern EXPCL_PANDA_GLXDISPLAY void init_libglxdisplay();
extern ConfigVariableBool glx_get_proc_address; extern ConfigVariableBool glx_get_proc_address;
extern ConfigVariableBool glx_get_os_address; extern ConfigVariableBool glx_get_os_address;

4
panda/src/osxdisplay/config_osxdisplay.cxx
View File

@ -20,8 +20,8 @@
#include "pandaSystem.h" #include "pandaSystem.h"
#if !defined(CPPPARSER) && !defined(BUILDING_PANDAGL) #if !defined(CPPPARSER) && !defined(BUILDING_PANDA_OSXDISPLAY)
#error Buildsystem error: BUILDING_PANDAGL not defined #error Buildsystem error: BUILDING_PANDA_OSXDISPLAY not defined
#endif #endif
Configure(config_osxdisplay); Configure(config_osxdisplay);

4
panda/src/osxdisplay/config_osxdisplay.h
View File

@ -17,9 +17,9 @@
#include "configVariableBool.h" #include "configVariableBool.h"
#include "configVariableInt.h" #include "configVariableInt.h"
NotifyCategoryDecl( osxdisplay , EXPCL_PANDAGL, EXPTP_PANDAGL); NotifyCategoryDecl( osxdisplay , EXPCL_PANDA_OSXDISPLAY, EXPTP_PANDA_OSXDISPLAY);
extern EXPCL_PANDAGL void init_libosxdisplay(); extern EXPCL_PANDA_OSXDISPLAY void init_libosxdisplay();
extern ConfigVariableBool show_resize_box; extern ConfigVariableBool show_resize_box;
extern ConfigVariableBool osx_support_gl_buffer; extern ConfigVariableBool osx_support_gl_buffer;

2
panda/src/osxdisplay/osxGraphicsPipe.h
View File

@ -24,7 +24,7 @@ class PNMImage;
* This graphics pipe represents the interface for creating OpenGL graphics * This graphics pipe represents the interface for creating OpenGL graphics
* windows on the various OSX's. * windows on the various OSX's.
*/ */
class EXPCL_PANDAGL osxGraphicsPipe : public GraphicsPipe { class EXPCL_PANDA_OSXDISPLAY osxGraphicsPipe : public GraphicsPipe {
public: public:
osxGraphicsPipe(); osxGraphicsPipe();
virtual ~osxGraphicsPipe(); virtual ~osxGraphicsPipe();

65
panda/src/pandabase/pandasymbols.h
View File

@ -117,6 +117,15 @@
#define BUILDING_PANDA_EXPRESS #define BUILDING_PANDA_EXPRESS
#endif #endif
/* BUILDING_PANDAGL for these: */
#ifdef BUILDING_PANDAGL
#define BUILDING_PANDA_COCOADISPLAY
#define BUILDING_PANDA_GLGSG
#define BUILDING_PANDA_GLXDISPLAY
#define BUILDING_PANDA_OSXDISPLAY
#define BUILDING_PANDA_WGLDISPLAY
#endif
/* BUILDING_PANDAPHYSICS for these: */ /* BUILDING_PANDAPHYSICS for these: */
#ifdef BUILDING_PANDAPHYSICS #ifdef BUILDING_PANDAPHYSICS
#define BUILDING_PANDA_PARTICLESYSTEM #define BUILDING_PANDA_PARTICLESYSTEM
@ -155,6 +164,14 @@
#define EXPTP_PANDA_CHAR IMPORT_TEMPL #define EXPTP_PANDA_CHAR IMPORT_TEMPL
#endif #endif
#ifdef BUILDING_PANDA_COCOADISPLAY
#define EXPCL_PANDA_COCOADISPLAY EXPORT_CLASS
#define EXPTP_PANDA_COCOADISPLAY EXPORT_TEMPL
#else
#define EXPCL_PANDA_COCOADISPLAY IMPORT_CLASS
#define EXPTP_PANDA_COCOADISPLAY IMPORT_TEMPL
#endif
#ifdef BUILDING_PANDA_COLLIDE #ifdef BUILDING_PANDA_COLLIDE
#define EXPCL_PANDA_COLLIDE EXPORT_CLASS #define EXPCL_PANDA_COLLIDE EXPORT_CLASS
#define EXPTP_PANDA_COLLIDE EXPORT_TEMPL #define EXPTP_PANDA_COLLIDE EXPORT_TEMPL
@ -243,6 +260,22 @@
#define EXPTP_PANDA_EXPRESS IMPORT_TEMPL #define EXPTP_PANDA_EXPRESS IMPORT_TEMPL
#endif #endif
#ifdef BUILDING_PANDA_GLGSG
#define EXPCL_PANDA_GLGSG EXPORT_CLASS
#define EXPTP_PANDA_GLGSG EXPORT_TEMPL
#else
#define EXPCL_PANDA_GLGSG IMPORT_CLASS
#define EXPTP_PANDA_GLGSG IMPORT_TEMPL
#endif
#ifdef BUILDING_PANDA_GLXDISPLAY
#define EXPCL_PANDA_GLXDISPLAY EXPORT_CLASS
#define EXPTP_PANDA_GLXDISPLAY EXPORT_TEMPL
#else
#define EXPCL_PANDA_GLXDISPLAY IMPORT_CLASS
#define EXPTP_PANDA_GLXDISPLAY IMPORT_TEMPL
#endif
#ifdef BUILDING_PANDA_GOBJ #ifdef BUILDING_PANDA_GOBJ
#define EXPCL_PANDA_GOBJ EXPORT_CLASS #define EXPCL_PANDA_GOBJ EXPORT_CLASS
#define EXPTP_PANDA_GOBJ EXPORT_TEMPL #define EXPTP_PANDA_GOBJ EXPORT_TEMPL
@ -307,6 +340,14 @@
#define EXPTP_PANDA_NET IMPORT_TEMPL #define EXPTP_PANDA_NET IMPORT_TEMPL
#endif #endif
#ifdef BUILDING_PANDA_OSXDISPLAY
#define EXPCL_PANDA_OSXDISPLAY EXPORT_CLASS
#define EXPTP_PANDA_OSXDISPLAY EXPORT_TEMPL
#else
#define EXPCL_PANDA_OSXDISPLAY IMPORT_CLASS
#define EXPTP_PANDA_OSXDISPLAY IMPORT_TEMPL
#endif
#ifdef BUILDING_PANDA_PARAMETRICS #ifdef BUILDING_PANDA_PARAMETRICS
#define EXPCL_PANDA_PARAMETRICS EXPORT_CLASS #define EXPCL_PANDA_PARAMETRICS EXPORT_CLASS
#define EXPTP_PANDA_PARAMETRICS EXPORT_TEMPL #define EXPTP_PANDA_PARAMETRICS EXPORT_TEMPL
@ -427,6 +468,14 @@
#define EXPTP_PANDA_TFORM IMPORT_TEMPL #define EXPTP_PANDA_TFORM IMPORT_TEMPL
#endif #endif
#ifdef BUILDING_PANDA_WGLDISPLAY
#define EXPCL_PANDA_WGLDISPLAY EXPORT_CLASS
#define EXPTP_PANDA_WGLDISPLAY EXPORT_TEMPL
#else
#define EXPCL_PANDA_WGLDISPLAY IMPORT_CLASS
#define EXPTP_PANDA_WGLDISPLAY IMPORT_TEMPL
#endif
#ifdef BUILDING_PANDAAWESOMIUM #ifdef BUILDING_PANDAAWESOMIUM
#define EXPCL_PANDAAWESOMIUM EXPORT_CLASS #define EXPCL_PANDAAWESOMIUM EXPORT_CLASS
#define EXPTP_PANDAAWESOMIUM EXPORT_TEMPL #define EXPTP_PANDAAWESOMIUM EXPORT_TEMPL
@ -435,6 +484,14 @@
#define EXPTP_PANDAAWESOMIUM IMPORT_TEMPL #define EXPTP_PANDAAWESOMIUM IMPORT_TEMPL
#endif #endif
#ifdef BUILDING_PANDAGL
#define EXPCL_PANDAGL EXPORT_CLASS
#define EXPTP_PANDAGL EXPORT_TEMPL
#else
#define EXPCL_PANDAGL IMPORT_CLASS
#define EXPTP_PANDAGL IMPORT_TEMPL
#endif
#ifdef BUILDING_PANDABULLET #ifdef BUILDING_PANDABULLET
#define EXPCL_PANDABULLET EXPORT_CLASS #define EXPCL_PANDABULLET EXPORT_CLASS
#define EXPTP_PANDABULLET EXPORT_TEMPL #define EXPTP_PANDABULLET EXPORT_TEMPL
@ -467,14 +524,6 @@
#define EXPTP_PANDAFX IMPORT_TEMPL #define EXPTP_PANDAFX IMPORT_TEMPL
#endif #endif
#ifdef BUILDING_PANDAGL
#define EXPCL_PANDAGL EXPORT_CLASS
#define EXPTP_PANDAGL EXPORT_TEMPL
#else
#define EXPCL_PANDAGL IMPORT_CLASS
#define EXPTP_PANDAGL IMPORT_TEMPL
#endif
#ifdef BUILDING_PANDAGLES #ifdef BUILDING_PANDAGLES
#define EXPCL_PANDAGLES EXPORT_CLASS #define EXPCL_PANDAGLES EXPORT_CLASS
#define EXPTP_PANDAGLES EXPORT_TEMPL #define EXPTP_PANDAGLES EXPORT_TEMPL

4
panda/src/wgldisplay/config_wgldisplay.cxx
View File

@ -20,8 +20,8 @@
#include "dconfig.h" #include "dconfig.h"
#include "pandaSystem.h" #include "pandaSystem.h"
#if !defined(CPPPARSER) && !defined(BUILDING_PANDAGL) #if !defined(CPPPARSER) && !defined(BUILDING_PANDA_WGLDISPLAY)
#error Buildsystem error: BUILDING_PANDAGL not defined #error Buildsystem error: BUILDING_PANDA_WGLDISPLAY not defined
#endif #endif
Configure(config_wgldisplay); Configure(config_wgldisplay);

4
panda/src/wgldisplay/config_wgldisplay.h
View File

@ -19,12 +19,12 @@
#include "configVariableInt.h" #include "configVariableInt.h"
#include "configVariableBool.h" #include "configVariableBool.h"
NotifyCategoryDecl(wgldisplay, EXPCL_PANDAGL, EXPTP_PANDAGL); NotifyCategoryDecl(wgldisplay, EXPCL_PANDA_WGLDISPLAY, EXPTP_PANDA_WGLDISPLAY);
extern ConfigVariableInt gl_force_pixfmt; extern ConfigVariableInt gl_force_pixfmt;
extern ConfigVariableBool gl_force_invalid; extern ConfigVariableBool gl_force_invalid;
extern ConfigVariableBool gl_do_vidmemsize_check; extern ConfigVariableBool gl_do_vidmemsize_check;
extern EXPCL_PANDAGL void init_libwgldisplay(); extern EXPCL_PANDA_WGLDISPLAY void init_libwgldisplay();
#endif #endif

2
panda/src/wgldisplay/wglGraphicsBuffer.h
View File

@ -32,7 +32,7 @@
* we can use, and thus makes it difficult to support one GSG rendering into * we can use, and thus makes it difficult to support one GSG rendering into
* an offscreen buffer and also into a window. * an offscreen buffer and also into a window.
*/ */
class EXPCL_PANDAGL wglGraphicsBuffer : public GraphicsBuffer { class EXPCL_PANDA_WGLDISPLAY wglGraphicsBuffer : public GraphicsBuffer {
public: public:
wglGraphicsBuffer(GraphicsEngine *engine, GraphicsPipe *pipe, wglGraphicsBuffer(GraphicsEngine *engine, GraphicsPipe *pipe,
const std::string &name, const std::string &name,

2
panda/src/wgldisplay/wglGraphicsPipe.h
View File

@ -23,7 +23,7 @@ class wglGraphicsStateGuardian;
* This graphics pipe represents the interface for creating OpenGL graphics * This graphics pipe represents the interface for creating OpenGL graphics
* windows on the various Windows OSes. * windows on the various Windows OSes.
*/ */
class EXPCL_PANDAGL wglGraphicsPipe : public WinGraphicsPipe { class EXPCL_PANDA_WGLDISPLAY wglGraphicsPipe : public WinGraphicsPipe {
public: public:
wglGraphicsPipe(); wglGraphicsPipe();
virtual ~wglGraphicsPipe(); virtual ~wglGraphicsPipe();

2
panda/src/wgldisplay/wglGraphicsWindow.h
View File

@ -20,7 +20,7 @@
/** /**
* A single graphics window for rendering OpenGL under Microsoft Windows. * A single graphics window for rendering OpenGL under Microsoft Windows.
*/ */
class EXPCL_PANDAGL wglGraphicsWindow : public WinGraphicsWindow { class EXPCL_PANDA_WGLDISPLAY wglGraphicsWindow : public WinGraphicsWindow {
public: public:
wglGraphicsWindow(GraphicsEngine *engine, GraphicsPipe *pipe, wglGraphicsWindow(GraphicsEngine *engine, GraphicsPipe *pipe,
const std::string &name, const std::string &name,