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

dcparser: fix ability to compile outside of Panda

Browse Source 
Fixes #759
This commit is contained in:
rdb 2019-12-29 14:27:05 +01:00
parent 0926a3cde5
commit 0972dfa457
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
direct/src/dcparser/dcPackerInterface.h
View File

@ -16,7 +16,6 @@
#include "dcbase.h" #include "dcbase.h"
#include "dcSubatomicType.h" #include "dcSubatomicType.h"
#include "vector_uchar.h"
class DCFile; class DCFile;
class DCField; class DCField;

1
direct/src/dcparser/dcParserDefs.h
View File

@ -16,7 +16,6 @@
#include "dcbase.h" #include "dcbase.h"
#include "dcSubatomicType.h" #include "dcSubatomicType.h"
#include "vector_uchar.h"
class DCFile; class DCFile;
class DCClass; class DCClass;

4
direct/src/dcparser/dcbase.h
View File

@ -32,6 +32,7 @@
#include "pvector.h" #include "pvector.h"
#include "pmap.h" #include "pmap.h"
#include "pset.h" #include "pset.h"
#include "vector_uchar.h"
#else // WITHIN_PANDA #else // WITHIN_PANDA
@ -81,6 +82,7 @@
#define nassertr_always(condition, return_value) assert(condition) #define nassertr_always(condition, return_value) assert(condition)
#define nassertv(condition) assert(condition) #define nassertv(condition) assert(condition)
#define nassertv_always(condition) assert(condition) #define nassertv_always(condition) assert(condition)
#define nassert_raise(message) {std::cerr << message << std::endl; abort();}
// Panda defines a special Filename class. We'll use an ordinary string // Panda defines a special Filename class. We'll use an ordinary string
// instead. // instead.
@ -97,8 +99,10 @@ typedef std::string Filename;
#define pvector std::vector #define pvector std::vector
#define pmap std::map #define pmap std::map
#define pset std::set #define pset std::set
#define vector_uchar std::vector<unsigned char>
#include <stdint.h> #include <stdint.h>
#include <string.h>
typedef std::ifstream pifstream; typedef std::ifstream pifstream;
typedef std::ofstream pofstream; typedef std::ofstream pofstream;

1
direct/src/dcparser/hashGenerator.h
View File

@ -16,7 +16,6 @@
#include "dcbase.h" #include "dcbase.h"
#include "primeNumberGenerator.h" #include "primeNumberGenerator.h"
#include "vector_uchar.h"
/** /**
* This class generates an arbitrary hash number from a sequence of ints. * This class generates an arbitrary hash number from a sequence of ints.