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

express: Move all vector_* types to dtoolutil

Browse Source
This commit is contained in:
Sam Edwards 2018-02-04 16:09:30 -07:00
parent fbe373dfdc
commit fb6c92cf08
9 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dtool/src/dtoolutil/p3dtoolutil_composite2.cxx
View File

@ -8,6 +8,9 @@
#include "stringDecoder.cxx" #include "stringDecoder.cxx"
#include "textEncoder.cxx" #include "textEncoder.cxx"
#include "unicodeLatinMap.cxx" #include "unicodeLatinMap.cxx"
#include "vector_double.cxx"
#include "vector_float.cxx"
#include "vector_int.cxx" #include "vector_int.cxx"
#include "vector_string.cxx" #include "vector_string.cxx"
#include "vector_uchar.cxx"
#include "win32ArgParser.cxx" #include "win32ArgParser.cxx"

4
panda/src/express/vector_double.cxx → dtool/src/dtoolutil/vector_double.cxx
View File

@ -13,8 +13,8 @@
#include "vector_double.h" #include "vector_double.h"
#define EXPCL EXPCL_PANDAEXPRESS #define EXPCL EXPCL_DTOOL
#define EXPTP EXPTP_PANDAEXPRESS #define EXPTP EXPTP_DTOOL
#define TYPE double #define TYPE double
#define NAME vector_double #define NAME vector_double

10
panda/src/express/vector_double.h → dtool/src/dtoolutil/vector_double.h
View File

@ -14,19 +14,17 @@
#ifndef VECTOR_DOUBLE_H #ifndef VECTOR_DOUBLE_H
#define VECTOR_DOUBLE_H #define VECTOR_DOUBLE_H
#include "pandabase.h" #include "dtoolbase.h"
#include "pvector.h"
/** /**
* A vector of doubles. This class is defined once here, and exported to * A vector of doubles. This class is defined once here, and exported to
* PANDA.DLL; other packages that want to use a vector of this type (whether * DTOOL.DLL; other packages that want to use a vector of this type (whether
* they need to export it or not) should include this header file, rather than * they need to export it or not) should include this header file, rather than
* defining the vector again. * defining the vector again.
*/ */
#define EXPCL EXPCL_PANDAEXPRESS #define EXPCL EXPCL_DTOOL
#define EXPTP EXPTP_PANDAEXPRESS #define EXPTP EXPTP_DTOOL
#define TYPE double #define TYPE double
#define NAME vector_double #define NAME vector_double

4
panda/src/express/vector_float.cxx → dtool/src/dtoolutil/vector_float.cxx
View File

@ -13,8 +13,8 @@
#include "vector_float.h" #include "vector_float.h"
#define EXPCL EXPCL_PANDAEXPRESS #define EXPCL EXPCL_DTOOL
#define EXPTP EXPTP_PANDAEXPRESS #define EXPTP EXPTP_DTOOL
#define TYPE float #define TYPE float
#define NAME vector_float #define NAME vector_float

10
panda/src/express/vector_float.h → dtool/src/dtoolutil/vector_float.h
View File

@ -14,19 +14,17 @@
#ifndef VECTOR_FLOAT_H #ifndef VECTOR_FLOAT_H
#define VECTOR_FLOAT_H #define VECTOR_FLOAT_H
#include "pandabase.h" #include "dtoolbase.h"
#include "pvector.h"
/** /**
* A vector of floats. This class is defined once here, and exported to * A vector of floats. This class is defined once here, and exported to
* PANDA.DLL; other packages that want to use a vector of this type (whether * DTOOL.DLL; other packages that want to use a vector of this type (whether
* they need to export it or not) should include this header file, rather than * they need to export it or not) should include this header file, rather than
* defining the vector again. * defining the vector again.
*/ */
#define EXPCL EXPCL_PANDAEXPRESS #define EXPCL EXPCL_DTOOL
#define EXPTP EXPTP_PANDAEXPRESS #define EXPTP EXPTP_DTOOL
#define TYPE float #define TYPE float
#define NAME vector_float #define NAME vector_float

2
panda/src/express/vector_stdfloat.h → dtool/src/dtoolutil/vector_stdfloat.h
View File

@ -14,7 +14,7 @@
#ifndef VECTOR_STDFLOAT_H #ifndef VECTOR_STDFLOAT_H
#define VECTOR_STDFLOAT_H #define VECTOR_STDFLOAT_H
#include "pandabase.h" #include "dtoolbase.h"
#include "vector_double.h" #include "vector_double.h"
#include "vector_float.h" #include "vector_float.h"

4
panda/src/express/vector_uchar.cxx → dtool/src/dtoolutil/vector_uchar.cxx
View File

@ -13,8 +13,8 @@
#include "vector_uchar.h" #include "vector_uchar.h"
#define EXPCL EXPCL_PANDAEXPRESS #define EXPCL EXPCL_DTOOL
#define EXPTP EXPTP_PANDAEXPRESS #define EXPTP EXPTP_DTOOL
#define TYPE unsigned char #define TYPE unsigned char
#define NAME vector_uchar #define NAME vector_uchar

10
panda/src/express/vector_uchar.h → dtool/src/dtoolutil/vector_uchar.h
View File

@ -14,19 +14,17 @@
#ifndef VECTOR_UCHAR_H #ifndef VECTOR_UCHAR_H
#define VECTOR_UCHAR_H #define VECTOR_UCHAR_H
#include "pandabase.h" #include "dtoolbase.h"
#include "pvector.h"
/** /**
* A vector of uchars. This class is defined once here, and exported to * A vector of uchars. This class is defined once here, and exported to
* PANDAEXPRESS.DLL; other packages that want to use a vector of this type * DTOOL.DLL; other packages that want to use a vector of this type
* (whether they need to export it or not) should include this header file, * (whether they need to export it or not) should include this header file,
* rather than defining the vector again. * rather than defining the vector again.
*/ */
#define EXPCL EXPCL_PANDAEXPRESS #define EXPCL EXPCL_DTOOL
#define EXPTP EXPTP_PANDAEXPRESS #define EXPTP EXPTP_DTOOL
#define TYPE unsigned char #define TYPE unsigned char
#define NAME vector_uchar #define NAME vector_uchar

3
panda/src/express/p3express_composite2.cxx
View File

@ -12,9 +12,6 @@
#include "threadSafePointerToBase.cxx" #include "threadSafePointerToBase.cxx"
#include "trueClock.cxx" #include "trueClock.cxx"
#include "typedReferenceCount.cxx" #include "typedReferenceCount.cxx"
#include "vector_uchar.cxx"
#include "vector_double.cxx"
#include "vector_float.cxx"
#include "virtualFile.cxx" #include "virtualFile.cxx"
#include "virtualFileComposite.cxx" #include "virtualFileComposite.cxx"
#include "virtualFileList.cxx" #include "virtualFileList.cxx"