mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-02 18:03:56 -04:00
osx compilation issues
This commit is contained in:
parent
4738f31efd
commit
3e8eca5528
@ -14,6 +14,11 @@
|
|||||||
|
|
||||||
#include "p3dConditionVar.h"
|
#include "p3dConditionVar.h"
|
||||||
|
|
||||||
|
#ifndef _WIN32
|
||||||
|
#include <sys/time.h>
|
||||||
|
#include <math.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////
|
||||||
// Function: P3DConditionVar::Constructor
|
// Function: P3DConditionVar::Constructor
|
||||||
// Access: Public
|
// Access: Public
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
bool initialized_lock = false;
|
bool initialized_lock = false;
|
||||||
LOCK _api_lock;
|
LOCK _api_lock;
|
||||||
|
|
||||||
ofstream log;
|
ofstream logfile;
|
||||||
string plugin_output_filename;
|
string plugin_output_filename;
|
||||||
ostream *nout_stream;
|
ostream *nout_stream;
|
||||||
|
|
||||||
@ -54,9 +54,9 @@ P3D_initialize(int api_version, const char *output_filename) {
|
|||||||
}
|
}
|
||||||
nout_stream = &cerr;
|
nout_stream = &cerr;
|
||||||
if (!plugin_output_filename.empty()) {
|
if (!plugin_output_filename.empty()) {
|
||||||
log.open(plugin_output_filename.c_str(), ios::out | ios::trunc);
|
logfile.open(plugin_output_filename.c_str(), ios::out | ios::trunc);
|
||||||
if (log) {
|
if (logfile) {
|
||||||
nout_stream = &log;
|
nout_stream = &logfile;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -34,7 +34,6 @@
|
|||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
// Appears in p3d_plugin.cxx.
|
// Appears in p3d_plugin.cxx.
|
||||||
extern ofstream log;
|
|
||||||
extern string plugin_output_filename;
|
extern string plugin_output_filename;
|
||||||
extern ostream *nout_stream;
|
extern ostream *nout_stream;
|
||||||
#define nout (*nout_stream)
|
#define nout (*nout_stream)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user