mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-04 02:42:49 -04:00
linux issues
This commit is contained in:
parent
02dbdb91b1
commit
4bac1d3314
@ -23,14 +23,14 @@
|
|||||||
#define BUILDING_P3D_PLUGIN
|
#define BUILDING_P3D_PLUGIN
|
||||||
#define TIXML_USE_STL
|
#define TIXML_USE_STL
|
||||||
|
|
||||||
#include "p3d_plugin.h"
|
|
||||||
#include "p3d_lock.h"
|
|
||||||
|
|
||||||
// It's a good idea to pick up this header file, even though we don't
|
// It's a good idea to pick up this header file, even though we don't
|
||||||
// actually link with dtool. This header file defines useful
|
// actually link with dtool. This header file defines useful
|
||||||
// system-wide config settings.
|
// system-wide config settings.
|
||||||
#include "dtool_config.h"
|
#include "dtool_config.h"
|
||||||
|
|
||||||
|
#include "p3d_plugin.h"
|
||||||
|
#include "p3d_lock.h"
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
@ -12,12 +12,6 @@
|
|||||||
|
|
||||||
#define LOCAL_LIBS plugin_common
|
#define LOCAL_LIBS plugin_common
|
||||||
|
|
||||||
// We need this because we don't
|
|
||||||
// include dtool_config.h.
|
|
||||||
#if $[HAVE_X11]
|
|
||||||
#define EXTRA_CDEFS HAVE_X11
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define COMBINED_SOURCES \
|
#define COMBINED_SOURCES \
|
||||||
$[TARGET]_composite1.cxx
|
$[TARGET]_composite1.cxx
|
||||||
|
|
||||||
|
@ -17,6 +17,11 @@
|
|||||||
|
|
||||||
// This header file is included by all C++ files in this directory
|
// This header file is included by all C++ files in this directory
|
||||||
|
|
||||||
|
// It's a good idea to pick up this header file, even though we don't
|
||||||
|
// actually link with dtool. This header file defines useful
|
||||||
|
// system-wide config settings.
|
||||||
|
#include "dtool_config.h"
|
||||||
|
|
||||||
// We include this header file directly out of its source directory,
|
// We include this header file directly out of its source directory,
|
||||||
// so we don't have to link with the library that builds it.
|
// so we don't have to link with the library that builds it.
|
||||||
#include "../plugin/p3d_plugin.h"
|
#include "../plugin/p3d_plugin.h"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user