CMake: Update for upstream changes

This commit is contained in:
Sam Edwards 2018-03-31 03:41:04 -06:00
parent 25b13ad199
commit dd42371610
4 changed files with 10 additions and 6 deletions

View File

@ -233,10 +233,6 @@
to compile them out. */
#cmakedefine NOTIFY_DEBUG
/* Define if we want to export template classes from the DLL. Only
makes sense to MSVC++. */
#cmakedefine EXPORT_TEMPLATES
/* Define if we are linking PANDAPHYSX in with PANDA. */
#cmakedefine LINK_IN_PHYSX

View File

@ -18,4 +18,4 @@
#include "dtoolbase.h"
EXPCL_DTOOL int @PANDA_VERSION_SYMBOL@ = 0;
EXPCL_DTOOL_DTOOLUTIL int @PANDA_VERSION_SYMBOL@ = 0;

View File

@ -28,7 +28,7 @@
#include "dtoolbase.h"
extern EXPCL_DTOOL int @PANDA_VERSION_SYMBOL@;
extern EXPCL_DTOOL_DTOOLUTIL int @PANDA_VERSION_SYMBOL@;
#ifndef WIN32
/* For Windows, exporting the symbol from the DLL is sufficient; the

View File

@ -12,10 +12,14 @@ set(P3GOBJ_HEADERS
geomPrimitive.h geomPrimitive.I
geomPatches.h
geomTriangles.h
geomTrianglesAdjacency.h
geomTristrips.h
geomTristripsAdjacency.h
geomTrifans.h
geomLines.h
geomLinesAdjacency.h
geomLinestrips.h
geomLinestripsAdjacency.h
geomPoints.h
geomVertexArrayData.h geomVertexArrayData.I
geomVertexArrayFormat.h geomVertexArrayFormat.I
@ -86,10 +90,14 @@ set(P3GOBJ_SOURCES
geomPrimitive.cxx
geomPatches.cxx
geomTriangles.cxx
geomTrianglesAdjacency.cxx
geomTristrips.cxx
geomTristripsAdjacency.cxx
geomTrifans.cxx
geomLines.cxx
geomLinesAdjacency.cxx
geomLinestrips.cxx
geomLinestripsAdjacency.cxx
geomPoints.cxx
geomVertexArrayData.cxx
geomVertexArrayFormat.cxx