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

*** empty log message ***

Browse Source
This commit is contained in:
Mike Goslin 2000-10-06 02:10:55 +00:00
parent d2817eb2f3
commit 7eec589a0b
5 changed files with 22 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
panda/metalibs/pandagl/Sources.pp
View File

@ -10,7 +10,7 @@
#define BUILDING_DLL BUILDING_PANDAGL #define BUILDING_DLL BUILDING_PANDAGL
#define COMPONENT_LIBS \ #define COMPONENT_LIBS \
glgsg glxdisplay // sgiglxdisplay glgsg glxdisplay wgldisplay // sgiglxdisplay
#define LOCAL_LIBS gsgbase display express #define LOCAL_LIBS gsgbase display express
#define OTHER_LIBS dtool #define OTHER_LIBS dtool

6
panda/src/framework/config_framework.h
View File

@ -10,10 +10,10 @@
#include <notifyCategoryProxy.h> #include <notifyCategoryProxy.h>
#include <collideMask.h> #include <collideMask.h>
NotifyCategoryDecl(framework, EXPCL_FRAMEWORK, EXPTP_FRAMEWORK); NotifyCategoryDecl(framework, EXPCL_EMPTY, EXPCL_EMPTY);
// Configure variables for framework package. // Configure variables for framework package.
extern const double EXPCL_FRAMEWORK drive_height; extern const double drive_height;
extern const CollideMask EXPCL_FRAMEWORK drive_mask; extern const CollideMask drive_mask;
#endif #endif

37
panda/src/framework/framework.h
View File

@ -20,25 +20,24 @@
#include <mouseWatcher.h> #include <mouseWatcher.h>
#include <chancfg.h> #include <chancfg.h>
EXPCL_FRAMEWORK extern EventHandler event_handler; extern EventHandler event_handler;
EXPCL_FRAMEWORK extern PT_NamedNode lights; extern PT_NamedNode lights;
EXPCL_FRAMEWORK extern PT_NamedNode root; extern PT_NamedNode root;
EXPCL_FRAMEWORK extern PT_NamedNode data_root; extern PT_NamedNode data_root;
EXPCL_FRAMEWORK extern PT_NamedNode render; extern PT_NamedNode render;
EXPCL_FRAMEWORK extern PT_NamedNode cameras; extern PT_NamedNode cameras;
EXPCL_FRAMEWORK extern PT(MouseAndKeyboard) mak; extern PT(MouseAndKeyboard) mak;
EXPCL_FRAMEWORK extern PT(MouseWatcher) mouse_watcher; extern PT(MouseWatcher) mouse_watcher;
EXPCL_FRAMEWORK extern PT(Trackball) trackball; extern PT(Trackball) trackball;
EXPCL_FRAMEWORK extern PT(GraphicsWindow) main_win; extern PT(GraphicsWindow) main_win;
EXPCL_FRAMEWORK extern PT(DirectionalLight) dlight; extern PT(DirectionalLight) dlight;
EXPCL_FRAMEWORK extern bool have_dlight; extern bool have_dlight;
EXPCL_FRAMEWORK extern Loader loader; extern Loader loader;
EXPCL_FRAMEWORK extern void set_alt_trackball(Node*); extern void set_alt_trackball(Node*);
EXPCL_FRAMEWORK extern int framework_main(int argc, char *argv[]); extern int framework_main(int argc, char *argv[]);
EXPCL_FRAMEWORK extern void (*define_keys)(EventHandler&); extern void (*define_keys)(EventHandler&);
EXPCL_FRAMEWORK extern void (*additional_idle)(); extern void (*additional_idle)();
EXPCL_FRAMEWORK extern void (*extra_overrides_func)(ChanCfgOverrides&, extern void (*extra_overrides_func)(ChanCfgOverrides&, std::string&);
std::string&);
#endif #endif

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

@ -84,14 +84,6 @@
#define EXPTP_SHADER extern #define EXPTP_SHADER extern
#endif #endif
#ifdef BUILDING_FRAMEWORK
#define EXPCL_FRAMEWORK __declspec(dllexport)
#define EXPTP_FRAMEWORK
#else
#define EXPCL_FRAMEWORK __declspec(dllimport)
#define EXPTP_FRAMEWORK extern
#endif
/* These are temporarily here until we move them to their proper homes. */ /* These are temporarily here until we move them to their proper homes. */
#ifdef BUILDING_DIRECT #ifdef BUILDING_DIRECT
#define EXPCL_DIRECT __declspec(dllexport) #define EXPCL_DIRECT __declspec(dllexport)

2
panda/src/testbed/Configrc
View File

@ -1,2 +0,0 @@
load-display glgsg
load-display glxdisplay