From 9b98df1ef5d2d301490cb9e3e524923c4c5e562e Mon Sep 17 00:00:00 2001 From: Sam Edwards Date: Wed, 11 Feb 2015 10:55:36 -0800 Subject: [PATCH] CMake: Update for recent changes. --- direct/CMakeLists.txt | 1 - direct/src/autorestart/CMakeLists.txt | 7 ------- panda/CMakeLists.txt | 2 +- panda/src/display/CMakeLists.txt | 2 -- panda/src/event/pythonTask.cxx | 5 ----- panda/src/express/CMakeLists.txt | 1 + panda/src/framework/CMakeLists.txt | 5 ----- panda/src/gobj/CMakeLists.txt | 21 ++++++++++++++++----- panda/src/linmath/CMakeLists.txt | 5 +++-- panda/src/pgraph/CMakeLists.txt | 3 --- panda/src/putil/CMakeLists.txt | 5 +++-- panda/src/putil/pythonCallbackObject.cxx | 5 ----- panda/src/tform/CMakeLists.txt | 6 ++++-- panda/src/windisplay/CMakeLists.txt | 2 +- 14 files changed, 29 insertions(+), 41 deletions(-) delete mode 100644 direct/src/autorestart/CMakeLists.txt diff --git a/direct/CMakeLists.txt b/direct/CMakeLists.txt index 5843bacf6d..f3debd7d08 100644 --- a/direct/CMakeLists.txt +++ b/direct/CMakeLists.txt @@ -4,7 +4,6 @@ endif() # Include source directories which have C++ components: add_subdirectory(src/directbase) -add_subdirectory(src/autorestart) add_subdirectory(src/dcparser) add_subdirectory(src/dcparse) add_subdirectory(src/deadrec) diff --git a/direct/src/autorestart/CMakeLists.txt b/direct/src/autorestart/CMakeLists.txt deleted file mode 100644 index 665e9be1c7..0000000000 --- a/direct/src/autorestart/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -if(UNIX) - add_executable(autorestart autorestart.c) - set_target_properties(autorestart PROPERTIES COMPILE_DEFINITIONS WITHIN_PANDA) - target_link_libraries(autorestart p3dtool) - - install(TARGETS autorestart DESTINATION bin) -endif() diff --git a/panda/CMakeLists.txt b/panda/CMakeLists.txt index 96a32262c9..51f821c2c5 100644 --- a/panda/CMakeLists.txt +++ b/panda/CMakeLists.txt @@ -27,9 +27,9 @@ add_subdirectory(src/downloadertools) add_subdirectory(src/pipeline) add_subdirectory(src/nativenet) add_subdirectory(src/net) +add_subdirectory(src/linmath) add_subdirectory(src/putil) add_subdirectory(src/pstatclient) -add_subdirectory(src/linmath) add_subdirectory(src/event) add_subdirectory(src/mathutil) add_subdirectory(src/gsgbase) diff --git a/panda/src/display/CMakeLists.txt b/panda/src/display/CMakeLists.txt index 79f3d935e9..da38641472 100644 --- a/panda/src/display/CMakeLists.txt +++ b/panda/src/display/CMakeLists.txt @@ -27,7 +27,6 @@ set(P3DISPLAY_HEADERS windowHandle.I windowHandle.h windowProperties.I windowProperties.h renderBuffer.h - stencilRenderStates.h stereoDisplayRegion.I stereoDisplayRegion.h displaySearchParameters.h displayInformation.h @@ -62,7 +61,6 @@ set(P3DISPLAY_SOURCES parasiteBuffer.cxx windowHandle.cxx windowProperties.cxx - stencilRenderStates.cxx stereoDisplayRegion.cxx subprocessWindow.cxx touchInfo.cxx diff --git a/panda/src/event/pythonTask.cxx b/panda/src/event/pythonTask.cxx index eb49a6cfed..53be111dfa 100644 --- a/panda/src/event/pythonTask.cxx +++ b/panda/src/event/pythonTask.cxx @@ -19,11 +19,6 @@ #ifdef HAVE_PYTHON #include "py_panda.h" -ConfigureDef(config_pythonTask); -ConfigureFn(config_pythonTask) { - PythonTask::init_type(); -} - TypeHandle PythonTask::_type_handle; Configure(config_pythonTask); diff --git a/panda/src/express/CMakeLists.txt b/panda/src/express/CMakeLists.txt index cfa57d0712..3ff0a29374 100644 --- a/panda/src/express/CMakeLists.txt +++ b/panda/src/express/CMakeLists.txt @@ -125,6 +125,7 @@ set(P3EXPRESS_SOURCES set(P3EXPRESS_IGATEEXT memoryUsagePointers_ext.cxx memoryUsagePointers_ext.h + pointerToArray_ext.h ramfile_ext.cxx ramfile_ext.h streamReader_ext.cxx diff --git a/panda/src/framework/CMakeLists.txt b/panda/src/framework/CMakeLists.txt index 75ececfec9..cf74d523d9 100644 --- a/panda/src/framework/CMakeLists.txt +++ b/panda/src/framework/CMakeLists.txt @@ -30,11 +30,6 @@ if(NOT BUILD_SHARED_LIBS) ${P3FRAMEWORK_LINK_TARGETS} pandadx9 ) - elseif(HAVE_DX8) - set(P3FRAMEWORK_LINK_TARGETS - ${P3FRAMEWORK_LINK_TARGETS} - pandadx8 - ) elseif(HAVE_TINYDISPLAY) set(P3FRAMEWORK_LINK_TARGETS ${P3FRAMEWORK_LINK_TARGETS} diff --git a/panda/src/gobj/CMakeLists.txt b/panda/src/gobj/CMakeLists.txt index ec5619ef3d..3ee081e828 100644 --- a/panda/src/gobj/CMakeLists.txt +++ b/panda/src/gobj/CMakeLists.txt @@ -18,7 +18,6 @@ set(P3GOBJ_HEADERS geomLinestrips.h geomPoints.h geomVertexArrayData.h geomVertexArrayData.I - geomVertexArrayData_ext.h geomVertexArrayData_ext.cxx geomVertexArrayFormat.h geomVertexArrayFormat.I geomCacheEntry.h geomCacheEntry.I geomCacheManager.h geomCacheManager.I @@ -31,13 +30,13 @@ set(P3GOBJ_HEADERS geomVertexWriter.h geomVertexWriter.I indexBufferContext.I indexBufferContext.h internalName.I internalName.h - internalName_ext.h internalName_ext.cxx lens.h lens.I material.I material.h materialPool.I materialPool.h matrixLens.I matrixLens.h occlusionQueryContext.I occlusionQueryContext.h - orthographicLens.I orthographicLens.h perspectiveLens.I - perspectiveLens.h + orthographicLens.I orthographicLens.h + paramTexture.I paramTexture.h + perspectiveLens.I perspectiveLens.h preparedGraphicsObjects.I preparedGraphicsObjects.h queryContext.I queryContext.h savedContext.I savedContext.h @@ -109,9 +108,12 @@ set(P3GOBJ_SOURCES materialPool.cxx matrixLens.cxx occlusionQueryContext.cxx orthographicLens.cxx + paramTexture.cxx perspectiveLens.cxx preparedGraphicsObjects.cxx queryContext.cxx + samplerContext.cxx + samplerState.cxx savedContext.cxx shader.cxx shaderContext.cxx @@ -144,11 +146,20 @@ set(P3GOBJ_SOURCES videoTexture.cxx ) +set(P3GOBJ_IGATEEXT + internalName_ext.cxx + internalName_ext.h + geomVertexArrayData_ext.cxx + geomVertexArrayData_ext.h + textureCollection_ext.cxx + textureCollection_ext.h +) + composite_sources(p3gobj P3GOBJ_SOURCES) add_library(p3gobj ${P3GOBJ_HEADERS} ${P3GOBJ_SOURCES}) target_link_libraries(p3gobj p3gsgbase p3pnmimage ${_ZLIB_LIBRARIES} ${_SQUISH_LIBRARY} ${_CG_LIBRARIES}) -target_interrogate(p3gobj ALL) +target_interrogate(p3gobj ALL EXTENSIONS ${P3GOBJ_IGATEEXT}) install(TARGETS p3gobj DESTINATION lib) diff --git a/panda/src/linmath/CMakeLists.txt b/panda/src/linmath/CMakeLists.txt index 267ea360d3..f1716de7f8 100644 --- a/panda/src/linmath/CMakeLists.txt +++ b/panda/src/linmath/CMakeLists.txt @@ -2,6 +2,7 @@ set(P3LINMATH_HEADERS aa_luse.h compose_matrix.h compose_matrix_src.I compose_matrix_src.h config_linmath.h + configVariableColor.h configVariableColor.I coordinateSystem.h dbl2fltnames.h dblnames.h deg_2_rad.h deg_2_rad.I flt2dblnames.h fltnames.h lcast_to.h lcast_to_src.h @@ -34,8 +35,8 @@ set(P3LINMATH_HEADERS ) set(P3LINMATH_SOURCES - compose_matrix.cxx config_linmath.cxx coordinateSystem.cxx - lmatrix.cxx + compose_matrix.cxx config_linmath.cxx configVariableColor.cxx + coordinateSystem.cxx lmatrix.cxx lorientation.cxx lpoint2.cxx lpoint3.cxx lpoint4.cxx lquaternion.cxx lrotation.cxx luse.cxx lvecBase2.cxx lvecBase3.cxx lvecBase4.cxx diff --git a/panda/src/pgraph/CMakeLists.txt b/panda/src/pgraph/CMakeLists.txt index a067ffbb25..d6e5756012 100644 --- a/panda/src/pgraph/CMakeLists.txt +++ b/panda/src/pgraph/CMakeLists.txt @@ -32,7 +32,6 @@ set(P3PGRAPH_HEADERS depthOffsetAttrib.I depthOffsetAttrib.h depthTestAttrib.I depthTestAttrib.h depthWriteAttrib.I depthWriteAttrib.h - eventStorePandaNode.I eventStorePandaNode.h findApproxLevelEntry.I findApproxLevelEntry.h findApproxPath.I findApproxPath.h fog.I fog.h @@ -131,7 +130,6 @@ set(P3PGRAPH_SOURCES depthOffsetAttrib.cxx depthTestAttrib.cxx depthWriteAttrib.cxx - eventStorePandaNode.cxx findApproxLevelEntry.cxx findApproxPath.cxx fog.cxx @@ -199,7 +197,6 @@ set(P3PGRAPH_SOURCES set(P3PGRAPH_IGATEEXT nodePathCollection_ext.cxx nodePathCollection_ext.h - nodePathCollection_ext.I nodePath_ext.cxx nodePath_ext.h nodePath_ext.I diff --git a/panda/src/putil/CMakeLists.txt b/panda/src/putil/CMakeLists.txt index c2701ba7ef..d7143ccd18 100644 --- a/panda/src/putil/CMakeLists.txt +++ b/panda/src/putil/CMakeLists.txt @@ -47,6 +47,7 @@ set(P3PUTIL_HEADERS modifierButtons.I modifierButtons.h mouseButton.h mouseData.I mouseData.h nameUniquifier.I nameUniquifier.h nodeCachedReferenceCount.h nodeCachedReferenceCount.I + paramValue.I paramValue.h pbitops.I pbitops.h portalMask.h pta_ushort.h @@ -96,6 +97,7 @@ set(P3PUTIL_SOURCES modifierButtons.cxx mouseButton.cxx mouseData.cxx nameUniquifier.cxx nodeCachedReferenceCount.cxx + paramValue.cxx pbitops.cxx pta_ushort.cxx simpleHashMap.cxx @@ -113,12 +115,11 @@ set(P3PUTIL_IGATEEXT typedWritable_ext.h pythonCallbackObject.cxx pythonCallbackObject.h - pythonCallbackObject.I ) composite_sources(p3putil P3PUTIL_SOURCES) add_library(p3putil ${P3PUTIL_HEADERS} ${P3PUTIL_SOURCES}) -target_link_libraries(p3putil p3pipeline) +target_link_libraries(p3putil p3linmath p3pipeline) target_interrogate(p3putil ALL EXTENSIONS ${P3PUTIL_IGATEEXT}) install(TARGETS p3putil DESTINATION lib) diff --git a/panda/src/putil/pythonCallbackObject.cxx b/panda/src/putil/pythonCallbackObject.cxx index 32a24d3f1f..48b0bbbbe3 100644 --- a/panda/src/putil/pythonCallbackObject.cxx +++ b/panda/src/putil/pythonCallbackObject.cxx @@ -21,11 +21,6 @@ #include "callbackData.h" #include "config_util.h" -ConfigureDef(config_pythonCallbackObject); -ConfigureFn(config_pythonCallbackObject) { - PythonCallbackObject::init_type(); -} - TypeHandle PythonCallbackObject::_type_handle; Configure(config_pythonCallbackObject); diff --git a/panda/src/tform/CMakeLists.txt b/panda/src/tform/CMakeLists.txt index a814cb415c..bc83ac1088 100644 --- a/panda/src/tform/CMakeLists.txt +++ b/panda/src/tform/CMakeLists.txt @@ -5,7 +5,7 @@ set(P3TFORM_HEADERS mouseInterfaceNode.I mouseInterfaceNode.h mouseSubregion.I mouseSubregion.h mouseWatcher.I mouseWatcher.h - mouseWatcherGroup.h + mouseWatcherBase.h mouseWatcherGroup.h mouseWatcherParameter.I mouseWatcherParameter.h mouseWatcherRegion.I mouseWatcherRegion.h trackball.h @@ -18,8 +18,10 @@ set(P3TFORM_SOURCES mouseInterfaceNode.cxx mouseSubregion.cxx mouseWatcher.cxx + mouseWatcherBase.cxx mouseWatcherGroup.cxx - mouseWatcherParameter.cxx mouseWatcherRegion.cxx + mouseWatcherParameter.cxx + mouseWatcherRegion.cxx trackball.cxx transform2sg.cxx ) diff --git a/panda/src/windisplay/CMakeLists.txt b/panda/src/windisplay/CMakeLists.txt index 3d07b6f9a9..b7290c8bc6 100644 --- a/panda/src/windisplay/CMakeLists.txt +++ b/panda/src/windisplay/CMakeLists.txt @@ -8,7 +8,7 @@ if(WIN32) set(P3WINDISPLAY_SOURCES config_windisplay.cxx winGraphicsPipe.cxx winGraphicsWindow.cxx - winDetectDx9.cxx winDetectDx8.cxx) + winDetectDx9.cxx) composite_sources(p3windisplay P3WINDISPLAY_SOURCES) add_library(p3windisplay ${P3WINDISPLAY_HEADERS} ${P3WINDISPLAY_SOURCES})