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. */ to compile them out. */
#cmakedefine NOTIFY_DEBUG #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. */ /* Define if we are linking PANDAPHYSX in with PANDA. */
#cmakedefine LINK_IN_PHYSX #cmakedefine LINK_IN_PHYSX

View File

@ -18,4 +18,4 @@
#include "dtoolbase.h" #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" #include "dtoolbase.h"
extern EXPCL_DTOOL int @PANDA_VERSION_SYMBOL@; extern EXPCL_DTOOL_DTOOLUTIL int @PANDA_VERSION_SYMBOL@;
#ifndef WIN32 #ifndef WIN32
/* For Windows, exporting the symbol from the DLL is sufficient; the /* For Windows, exporting the symbol from the DLL is sufficient; the

View File

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