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

CMake: Adjust for upstream Panda3D changes.

Browse Source
This commit is contained in:
Sam Edwards 2015-07-12 19:28:08 -07:00
parent 5ee04074c2
commit a92a972af0
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dtool/Config.cmake
View File

@ -327,6 +327,11 @@ overhead to have this option available even if it is unused, it is
by default enabled only in a development build. This has no effect by default enabled only in a development build. This has no effect
on DirectX rendering." ${IS_DEBUG_BUILD}) on DirectX rendering." ${IS_DEBUG_BUILD})
option(SUPPORT_FIXED_FUNCTION
"This option compiles in support for the fixed-function OpenGL
pipeline. It is only really useful to turn this off if you are targeting
an OpenGL ES 2 system." ON)
option(USE_MEMORY_DLMALLOC option(USE_MEMORY_DLMALLOC
"This is an optional alternative memory-allocation scheme "This is an optional alternative memory-allocation scheme
available within Panda. You can experiment with it to see available within Panda. You can experiment with it to see

3
dtool/dtool_config.h.in
View File

@ -239,6 +239,9 @@
/* Define if we want to allow immediate mode OpenGL rendering. */ /* Define if we want to allow immediate mode OpenGL rendering. */
#cmakedefine SUPPORT_IMMEDIATE_MODE #cmakedefine SUPPORT_IMMEDIATE_MODE
/* Define if we want to support fixed-function OpenGL rendering. */
#cmakedefine SUPPORT_FIXED_FUNCTION
/* Define for either of the alternative malloc schemes. */ /* Define for either of the alternative malloc schemes. */
#cmakedefine USE_MEMORY_DLMALLOC #cmakedefine USE_MEMORY_DLMALLOC
#cmakedefine USE_MEMORY_PTMALLOC2 #cmakedefine USE_MEMORY_PTMALLOC2

6
dtool/src/interrogatedb/CMakeLists.txt
View File

@ -10,8 +10,7 @@ set(P3INTERROGATEDB_HEADERS
interrogateType.I interrogateType.h interrogateType.I interrogateType.h
interrogate_datafile.I interrogate_datafile.h interrogate_datafile.I interrogate_datafile.h
interrogate_interface.h interrogate_request.h interrogate_interface.h interrogate_request.h
extension.h py_panda.h extension.h py_panda.h)
vector_int.h )
set(P3INTERROGATEDB_SOURCES set(P3INTERROGATEDB_SOURCES
config_interrogatedb.cxx config_interrogatedb.cxx
@ -24,8 +23,7 @@ set(P3INTERROGATEDB_SOURCES
interrogateManifest.cxx interrogateManifest.cxx
interrogateType.cxx interrogate_datafile.cxx interrogateType.cxx interrogate_datafile.cxx
interrogate_interface.cxx interrogate_request.cxx interrogate_interface.cxx interrogate_request.cxx
py_panda.cxx py_panda.cxx)
vector_int.cxx)
composite_sources(p3interrogatedb P3INTERROGATEDB_SOURCES) composite_sources(p3interrogatedb P3INTERROGATEDB_SOURCES)