tau on windows
This commit is contained in:
David Rose
parent
c3303c70b2
commit
1eb1b26006
|
|
@ -235,7 +235,7 @@ $[TAB] rm -f $[patsubst %.yxx,%.cxx %.h,$[yxx_st_sources]] $[patsubst %.lxx,%.cx
|
|||
$[TAB] rm -f *.pyc *.pyo // Also scrub out old generated Python code.
|
||||
#endif
|
||||
#if $[USE_TAU]
|
||||
$[TAB] rm -f *.il *.pdb *.inst.* // scrub out tau-generated files.
|
||||
$[TAB] rm -f $[ODIR]/*.il $[ODIR]/*.pdb *.inst.* // scrub out tau-generated files.
|
||||
#endif
|
||||
|
||||
// 'cleanall' is intended to undo all the effects of running ppremake
|
||||
|
|
@ -878,7 +878,7 @@ $[pdb_source] : $[il_source]
|
|||
$[TAB] $[TAU_MAKE_PDB]
|
||||
|
||||
$[inst_source] : $[pdb_source]
|
||||
$[TAB] $[TAU_MAKE_INST] -c++
|
||||
$[TAB] $[TAU_MAKE_INST] -c
|
||||
|
||||
$[target] : $[inst_source] $[get_depends $[source]]
|
||||
#define source $[inst_source]
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
#include "graphicsStateGuardian.h"
|
||||
#include "dcast.h"
|
||||
#include "config_gobj.h"
|
||||
#include "displayRegion.h"
|
||||
|
||||
TypeHandle StandardMunger::_type_handle;
|
||||
|
||||
|
|
|
|||
|
|
@ -23,6 +23,11 @@
|
|||
|
||||
#ifdef HAVE_OPENSSL
|
||||
|
||||
#ifdef WIN32_VC
|
||||
#include <windows.h> // for WSAGetLastError()
|
||||
#undef X509_NAME
|
||||
#endif // WIN32_VC
|
||||
|
||||
#ifndef HAVE_STREAMSIZE
|
||||
// Some compilers (notably SGI) don't define this for us
|
||||
typedef int streamsize;
|
||||
|
|
|
|||
|
|
@ -213,7 +213,7 @@ read_stream(StreamReader &source) {
|
|||
////////////////////////////////////////////////////////////////////
|
||||
INLINE void HashVal::
|
||||
hash_ramfile(const Ramfile &ramfile) {
|
||||
return hash_buffer(ramfile._data.data(), ramfile._data.length());
|
||||
hash_buffer(ramfile._data.data(), ramfile._data.length());
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -226,7 +226,7 @@ hash_ramfile(const Ramfile &ramfile) {
|
|||
////////////////////////////////////////////////////////////////////
|
||||
INLINE void HashVal::
|
||||
hash_string(const string &data) {
|
||||
return hash_buffer(data.data(), data.length());
|
||||
hash_buffer(data.data(), data.length());
|
||||
}
|
||||
#endif // HAVE_OPENSSL
|
||||
|
||||
|
|
|
|||
|
|
@ -527,7 +527,7 @@ RefCountObj(const Base ©) : Base(copy) {
|
|||
template<class Base>
|
||||
void RefCountObj<Base>::
|
||||
init_type() {
|
||||
#ifdef HAVE_RTTI
|
||||
#if defined(HAVE_RTTI) && !defined(__EDG__)
|
||||
// If we have RTTI, we can determine the name of the base type.
|
||||
string base_name = typeid(Base).name();
|
||||
#else
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@
|
|||
|
||||
#include "windowsRegistry.h"
|
||||
#include "config_express.h"
|
||||
#include "textEncoder.h"
|
||||
|
||||
#ifdef WIN32_VC
|
||||
|
||||
|
|
|
|||
|
|
@ -281,9 +281,9 @@ calc_tight_bounds(LPoint3f &min_point, LPoint3f &max_point,
|
|||
const GeomVertexData *vertex_data,
|
||||
bool got_mat, const LMatrix4f &mat) const {
|
||||
int pipeline_stage = Thread::get_current_pipeline_stage();
|
||||
return do_calc_tight_bounds(min_point, max_point, found_any,
|
||||
vertex_data, got_mat, mat,
|
||||
pipeline_stage);
|
||||
do_calc_tight_bounds(min_point, max_point, found_any,
|
||||
vertex_data, got_mat, mat,
|
||||
pipeline_stage);
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////
|
||||
|
|
|
|||
|
|
@ -437,7 +437,7 @@ adjust_comp_flags(int clear_flags, int set_flags) {
|
|||
_comp_flags = (_comp_flags & ~clear_flags) | set_flags;
|
||||
}
|
||||
|
||||
EXPCL_PANDA INLINE ostream &
|
||||
INLINE ostream &
|
||||
operator << (ostream &out, const Lens &lens) {
|
||||
lens.output(out);
|
||||
return out;
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@
|
|||
#include "cmath.h"
|
||||
#include "mathNumbers.h"
|
||||
#include "graphicsStateGuardian.h"
|
||||
#include "displayRegion.h"
|
||||
|
||||
////////////////////////////////////////////////////////////////////
|
||||
// Function: FisheyeMaker::reset
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@
|
|||
#include "clockObject.h"
|
||||
#include "config_gobj.h"
|
||||
#include "config_grutil.h"
|
||||
#include "bamReader.h"
|
||||
|
||||
TypeHandle OpenCVTexture::_type_handle;
|
||||
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@
|
|||
////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "reMutexDirect.h"
|
||||
#include "thread.h"
|
||||
|
||||
#ifndef HAVE_REMUTEXIMPL
|
||||
MutexImpl ReMutexDirect::_global_lock;
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
|
||||
#ifdef THREAD_WIN32_IMPL
|
||||
|
||||
#include "thread.h"
|
||||
#include "pointerTo.h"
|
||||
#include "config_pipeline.h"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue