RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CMake: Update for recent upstream changes.

This commit is contained in:
Sam Edwards 2015-03-06 17:34:05 -08:00
parent 25e2e0221d
commit edb51f3e17
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
panda/src/pgraph/CMakeLists.txt
View File

@ -64,6 +64,7 @@ set(P3PGRAPH_HEADERS
pandaNode.I pandaNode.h
pandaNodeChain.I pandaNodeChain.h
planeNode.I planeNode.h
paramNodePath.I paramNodePath.h
polylightEffect.I polylightEffect.h
polylightNode.I polylightNode.h
portalNode.I portalNode.h
@ -161,6 +162,7 @@ set(P3PGRAPH_SOURCES
pandaNode.cxx
pandaNodeChain.cxx
planeNode.cxx
paramNodePath.cxx
polylightEffect.cxx
polylightNode.cxx
portalNode.cxx

5
panda/src/pnmimage/CMakeLists.txt
View File

@ -13,6 +13,7 @@ set(P3PNMIMAGE_HEADERS
set(P3PNMIMAGE_SOURCES
config_pnmimage.cxx
convert_srgb.cxx
pfmFile.cxx
pnm-image-filter.cxx
pnmbitio.cxx
@ -29,8 +30,10 @@ set(P3PNMIMAGE_IGATEEXT
pfmFile_ext.h
)
set_source_files_properties(convert_srgb_sse2.cxx PROPERTIES COMPILE_FLAGS -msse2)
composite_sources(p3pnmimage P3PNMIMAGE_SOURCES)
add_library(p3pnmimage ${P3PNMIMAGE_HEADERS} ${P3PNMIMAGE_SOURCES})
add_library(p3pnmimage ${P3PNMIMAGE_HEADERS} ${P3PNMIMAGE_SOURCES} convert_srgb_sse2.cxx)
target_link_libraries(p3pnmimage p3mathutil)
target_interrogate(p3pnmimage ALL EXTENSIONS ${P3PNMIMAGE_IGATEEXT})

5
panda/src/putil/CMakeLists.txt
View File

@ -111,10 +111,11 @@ set(P3PUTIL_SOURCES
)
set(P3PUTIL_IGATEEXT
typedWritable_ext.cxx
typedWritable_ext.h
callbackObject_ext.h
pythonCallbackObject.cxx
pythonCallbackObject.h
typedWritable_ext.cxx
typedWritable_ext.h
)
composite_sources(p3putil P3PUTIL_SOURCES)

1
panda/src/putil/callbackObject_ext.h
View File

@ -16,6 +16,7 @@
#define CALLBACKOBJECT_EXT_H
#include "dtoolbase.h"
#include "pointerTo.h"
#ifdef HAVE_PYTHON