Skip to content

Commit 50d3cc1

Browse files
stuartcarniestuartcarnie
committed
CMake: updates
1 parent 5dd69f4 commit 50d3cc1

8 files changed

Lines changed: 26 additions & 129 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
2424
set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0")
2525
elseif (CMAKE_SYSTEM_NAME STREQUAL "iOS")
2626
set(CMAKE_OSX_DEPLOYMENT_TARGET "14.0")
27+
elseif (CMAKE_SYSTEM_NAME STREQUAL "tvOS")
28+
set(CMAKE_OSX_DEPLOYMENT_TARGET "26.0")
2729
elseif (CMAKE_SYSTEM_NAME STREQUAL "visionOS")
2830
set(CMAKE_OSX_DEPLOYMENT_TARGET "26.0")
2931
else ()
@@ -185,7 +187,7 @@ else ()
185187
set(WANT_RETROFX 0)
186188
endif ()
187189

188-
if (ENABLE_SDL AND CMAKE_SYSTEM_NAME MATCHES "^(Linux|Windows|Darwin|iOS|visionOS)$")
190+
if (ENABLE_SDL AND CMAKE_SYSTEM_NAME MATCHES "^(Linux|Windows|Darwin|iOS|tvOS|visionOS)$")
189191
set(WANT_SDL 1)
190192
else ()
191193
set(WANT_SDL 0)
@@ -436,6 +438,8 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
436438
include(MacosPlatform.cmake)
437439
elseif (CMAKE_SYSTEM_NAME STREQUAL "iOS")
438440
include(IosPlatform.cmake)
441+
elseif (CMAKE_SYSTEM_NAME STREQUAL "tvOS")
442+
include(TvosPlatform.cmake)
439443
elseif (CMAKE_SYSTEM_NAME STREQUAL "visionOS")
440444
include(VisionosPlatform.cmake)
441445
else ()
@@ -511,6 +515,8 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
511515
add_subdirectory(platform/macos)
512516
elseif (CMAKE_SYSTEM_NAME STREQUAL "iOS")
513517
add_subdirectory(platform/ios)
518+
elseif (CMAKE_SYSTEM_NAME STREQUAL "tvOS")
519+
add_subdirectory(platform/tvos)
514520
elseif (CMAKE_SYSTEM_NAME STREQUAL "visionOS")
515521
add_subdirectory(platform/visionos)
516522
endif ()
@@ -527,10 +533,12 @@ add_subdirectory(modules)
527533
if (WANT_EDITOR)
528534
add_subdirectory(editor)
529535
add_subdirectory(platform/ios/export)
536+
# add_subdirectory(platform/tvos/export)
530537
add_subdirectory(platform/visionos/export)
531538
add_subdirectory(platform/macos/export)
532539
endif ()
533540
add_subdirectory(platform/ios/api)
541+
# add_subdirectory(platform/tvos/api)
534542
add_subdirectory(platform/visionos/api)
535543
add_subdirectory(platform/android/api)
536544
add_subdirectory(platform/web/api)

‎doc/CMakeLists.txt‎

Lines changed: 3 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -693,13 +693,16 @@ set_abs(GODOT_SOURCE_CLASS_DOCUMENTATION_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}
693693
classes/QuadOccluder3D.xml
694694
classes/Quaternion.xml
695695
classes/RDAccelerationStructureGeometry.xml
696+
classes/RDAccelerationStructureInstance.xml
696697
classes/RDAttachmentFormat.xml
697698
classes/RDFramebufferPass.xml
699+
classes/RDHitGroup.xml
698700
classes/RDPipelineColorBlendState.xml
699701
classes/RDPipelineColorBlendStateAttachment.xml
700702
classes/RDPipelineDepthStencilState.xml
701703
classes/RDPipelineMultisampleState.xml
702704
classes/RDPipelineRasterizationState.xml
705+
classes/RDPipelineShader.xml
703706
classes/RDPipelineSpecializationConstant.xml
704707
classes/RDSamplerState.xml
705708
classes/RDShaderFile.xml
@@ -939,118 +942,6 @@ set_abs(GODOT_SOURCE_CLASS_DOCUMENTATION_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}
939942
classes/VisibleOnScreenNotifier2D.xml
940943
classes/VisibleOnScreenNotifier3D.xml
941944
classes/VisualInstance3D.xml
942-
classes/VisualShader.xml
943-
classes/VisualShaderNode.xml
944-
classes/VisualShaderNodeBillboard.xml
945-
classes/VisualShaderNodeBooleanConstant.xml
946-
classes/VisualShaderNodeBooleanParameter.xml
947-
classes/VisualShaderNodeClamp.xml
948-
classes/VisualShaderNodeColorConstant.xml
949-
classes/VisualShaderNodeColorFunc.xml
950-
classes/VisualShaderNodeColorOp.xml
951-
classes/VisualShaderNodeColorParameter.xml
952-
classes/VisualShaderNodeComment.xml
953-
classes/VisualShaderNodeCompare.xml
954-
classes/VisualShaderNodeConstant.xml
955-
classes/VisualShaderNodeCubemap.xml
956-
classes/VisualShaderNodeCubemapParameter.xml
957-
classes/VisualShaderNodeCurveTexture.xml
958-
classes/VisualShaderNodeCurveXYZTexture.xml
959-
classes/VisualShaderNodeCustom.xml
960-
classes/VisualShaderNodeDerivativeFunc.xml
961-
classes/VisualShaderNodeDeterminant.xml
962-
classes/VisualShaderNodeDistanceFade.xml
963-
classes/VisualShaderNodeDotProduct.xml
964-
classes/VisualShaderNodeExpression.xml
965-
classes/VisualShaderNodeFaceForward.xml
966-
classes/VisualShaderNodeFloatConstant.xml
967-
classes/VisualShaderNodeFloatFunc.xml
968-
classes/VisualShaderNodeFloatOp.xml
969-
classes/VisualShaderNodeFloatParameter.xml
970-
classes/VisualShaderNodeFrame.xml
971-
classes/VisualShaderNodeFresnel.xml
972-
classes/VisualShaderNodeGlobalExpression.xml
973-
classes/VisualShaderNodeGroupBase.xml
974-
classes/VisualShaderNodeIf.xml
975-
classes/VisualShaderNodeInput.xml
976-
classes/VisualShaderNodeIntConstant.xml
977-
classes/VisualShaderNodeIntFunc.xml
978-
classes/VisualShaderNodeIntOp.xml
979-
classes/VisualShaderNodeIntParameter.xml
980-
classes/VisualShaderNodeIs.xml
981-
classes/VisualShaderNodeLinearSceneDepth.xml
982-
classes/VisualShaderNodeMix.xml
983-
classes/VisualShaderNodeMultiplyAdd.xml
984-
classes/VisualShaderNodeOuterProduct.xml
985-
classes/VisualShaderNodeOutput.xml
986-
classes/VisualShaderNodeParameter.xml
987-
classes/VisualShaderNodeParameterRef.xml
988-
classes/VisualShaderNodeParticleAccelerator.xml
989-
classes/VisualShaderNodeParticleBoxEmitter.xml
990-
classes/VisualShaderNodeParticleConeVelocity.xml
991-
classes/VisualShaderNodeParticleEmit.xml
992-
classes/VisualShaderNodeParticleEmitter.xml
993-
classes/VisualShaderNodeParticleMeshEmitter.xml
994-
classes/VisualShaderNodeParticleMultiplyByAxisAngle.xml
995-
classes/VisualShaderNodeParticleOutput.xml
996-
classes/VisualShaderNodeParticleRandomness.xml
997-
classes/VisualShaderNodeParticleRingEmitter.xml
998-
classes/VisualShaderNodeParticleSphereEmitter.xml
999-
classes/VisualShaderNodeProximityFade.xml
1000-
classes/VisualShaderNodeRandomRange.xml
1001-
classes/VisualShaderNodeRemap.xml
1002-
classes/VisualShaderNodeReroute.xml
1003-
classes/VisualShaderNodeResizableBase.xml
1004-
classes/VisualShaderNodeRotationByAxis.xml
1005-
classes/VisualShaderNodeSDFRaymarch.xml
1006-
classes/VisualShaderNodeSDFToScreenUV.xml
1007-
classes/VisualShaderNodeSample3D.xml
1008-
classes/VisualShaderNodeScreenNormalWorldSpace.xml
1009-
classes/VisualShaderNodeScreenUVToSDF.xml
1010-
classes/VisualShaderNodeSmoothStep.xml
1011-
classes/VisualShaderNodeStep.xml
1012-
classes/VisualShaderNodeSwitch.xml
1013-
classes/VisualShaderNodeTexture.xml
1014-
classes/VisualShaderNodeTexture2DArray.xml
1015-
classes/VisualShaderNodeTexture2DArrayParameter.xml
1016-
classes/VisualShaderNodeTexture2DParameter.xml
1017-
classes/VisualShaderNodeTexture3D.xml
1018-
classes/VisualShaderNodeTexture3DParameter.xml
1019-
classes/VisualShaderNodeTextureParameter.xml
1020-
classes/VisualShaderNodeTextureParameterTriplanar.xml
1021-
classes/VisualShaderNodeTextureSDF.xml
1022-
classes/VisualShaderNodeTextureSDFNormal.xml
1023-
classes/VisualShaderNodeTransformCompose.xml
1024-
classes/VisualShaderNodeTransformConstant.xml
1025-
classes/VisualShaderNodeTransformDecompose.xml
1026-
classes/VisualShaderNodeTransformFunc.xml
1027-
classes/VisualShaderNodeTransformOp.xml
1028-
classes/VisualShaderNodeTransformParameter.xml
1029-
classes/VisualShaderNodeTransformVecMult.xml
1030-
classes/VisualShaderNodeUIntConstant.xml
1031-
classes/VisualShaderNodeUIntFunc.xml
1032-
classes/VisualShaderNodeUIntOp.xml
1033-
classes/VisualShaderNodeUIntParameter.xml
1034-
classes/VisualShaderNodeUVFunc.xml
1035-
classes/VisualShaderNodeUVPolarCoord.xml
1036-
classes/VisualShaderNodeVarying.xml
1037-
classes/VisualShaderNodeVaryingGetter.xml
1038-
classes/VisualShaderNodeVaryingSetter.xml
1039-
classes/VisualShaderNodeVec2Constant.xml
1040-
classes/VisualShaderNodeVec2Parameter.xml
1041-
classes/VisualShaderNodeVec3Constant.xml
1042-
classes/VisualShaderNodeVec3Parameter.xml
1043-
classes/VisualShaderNodeVec4Constant.xml
1044-
classes/VisualShaderNodeVec4Parameter.xml
1045-
classes/VisualShaderNodeVectorBase.xml
1046-
classes/VisualShaderNodeVectorCompose.xml
1047-
classes/VisualShaderNodeVectorDecompose.xml
1048-
classes/VisualShaderNodeVectorDistance.xml
1049-
classes/VisualShaderNodeVectorFunc.xml
1050-
classes/VisualShaderNodeVectorLen.xml
1051-
classes/VisualShaderNodeVectorOp.xml
1052-
classes/VisualShaderNodeVectorRefract.xml
1053-
classes/VisualShaderNodeWorldPositionFromDepth.xml
1054945
classes/VoxelGI.xml
1055946
classes/VoxelGIData.xml
1056947
classes/WeakRef.xml

‎editor/icons/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -521,6 +521,7 @@ set_abs(GODOT_EDITOR_ICONS_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}
521521
KeyboardError.svg
522522
KeyboardLabel.svg
523523
KeyboardPhysical.svg
524+
Keyword.svg
524525
KinematicCollision2D.svg
525526
KinematicCollision3D.svg
526527
Label.svg

‎editor/shader/CMakeLists.txt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,5 @@ target_sources(editor PRIVATE
2626
text_shader_editor.h
2727
text_shader_language_plugin.cpp
2828
text_shader_language_plugin.h
29-
visual_shader_editor_plugin.cpp
30-
visual_shader_editor_plugin.h
31-
visual_shader_language_plugin.cpp
32-
visual_shader_language_plugin.h
3329
)
3430
# [[[end]]]

‎platform/macos/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ target_sources(macos PRIVATE
5858
os_macos.h
5959
os_macos.mm
6060
platform_config.h
61+
platform_egl.h
6162
platform_gl.h
6263
platform_thread.h
6364
rendering_context_driver_vulkan_macos.h

‎scene/resources/CMakeLists.txt‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -130,14 +130,6 @@ target_sources(scene PRIVATE
130130
theme.h
131131
video_stream.cpp
132132
video_stream.h
133-
visual_shader.cpp
134-
visual_shader.h
135-
visual_shader_nodes.cpp
136-
visual_shader_nodes.h
137-
visual_shader_particle_nodes.cpp
138-
visual_shader_particle_nodes.h
139-
visual_shader_sdf_nodes.cpp
140-
visual_shader_sdf_nodes.h
141133
world_2d.cpp
142134
world_2d.h
143135
)

‎tests/CMakeLists.txt‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,14 @@ target_sources(tests PRIVATE
104104
scene/test_animation_blend_tree.cpp
105105
scene/test_animation_player.cpp
106106
scene/test_arraymesh.cpp
107+
scene/test_aspect_ratio_container.cpp
107108
scene/test_audio_stream_wav.cpp
108109
scene/test_bit_map.cpp
110+
scene/test_box_container.cpp
109111
scene/test_button.cpp
110112
scene/test_camera_2d.cpp
111113
scene/test_camera_3d.cpp
114+
scene/test_center_container.cpp
112115
scene/test_code_edit.cpp
113116
scene/test_color_picker.cpp
114117
scene/test_control.cpp
@@ -118,15 +121,20 @@ target_sources(tests PRIVATE
118121
scene/test_curve_2d.cpp
119122
scene/test_curve_3d.cpp
120123
scene/test_decal.cpp
124+
scene/test_flow_container.cpp
125+
scene/test_foldable_container.cpp
121126
scene/test_fontfile.cpp
122127
scene/test_gltf_document.cpp
123128
scene/test_gradient.cpp
124129
scene/test_gradient_texture.cpp
125130
scene/test_graph_node.cpp
131+
scene/test_grid_container.cpp
126132
scene/test_height_map_shape_3d.cpp
127133
scene/test_image_texture.cpp
128134
scene/test_image_texture_3d.cpp
129135
scene/test_instance_placeholder.cpp
136+
scene/test_label.cpp
137+
scene/test_margin_container.cpp
130138
scene/test_navigation_agent_2d.cpp
131139
scene/test_navigation_agent_3d.cpp
132140
scene/test_navigation_obstacle_2d.cpp
@@ -137,13 +145,16 @@ target_sources(tests PRIVATE
137145
scene/test_node_2d.cpp
138146
scene/test_option_button.cpp
139147
scene/test_packed_scene.cpp
148+
scene/test_panel_container.cpp
140149
scene/test_parallax_2d.cpp
141150
scene/test_path_2d.cpp
142151
scene/test_path_3d.cpp
143152
scene/test_path_follow_2d.cpp
144153
scene/test_path_follow_3d.cpp
145154
scene/test_physics_material.cpp
146155
scene/test_primitives.cpp
156+
scene/test_rich_text_label.cpp
157+
scene/test_scroll_container.cpp
147158
scene/test_skeleton_3d.cpp
148159
scene/test_sky.cpp
149160
scene/test_split_container.cpp
@@ -160,7 +171,6 @@ target_sources(tests PRIVATE
160171
scene/test_timer.cpp
161172
scene/test_tree.cpp
162173
scene/test_viewport.cpp
163-
scene/test_visual_shader.cpp
164174
scene/test_window.cpp
165175
servers/rendering/test_shader_preprocessor.cpp
166176
servers/test_nav_heap.cpp

‎thirdparty/thorvg/CMakeLists.txt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
godot_add_library(thorvg FOLDER thirdparty STATIC)
22
target_sources(thorvg PRIVATE
33
# common
4+
src/common/tvgColor.cpp
45
src/common/tvgCompressor.cpp
56
src/common/tvgMath.cpp
67
src/common/tvgStr.cpp
@@ -19,7 +20,6 @@ target_sources(thorvg PRIVATE
1920
# "src/renderer/tvgAnimation.cpp",
2021
src/renderer/tvgCanvas.cpp
2122
src/renderer/tvgFill.cpp
22-
# "src/renderer/tvgGlCanvas.cpp",
2323
src/renderer/tvgInitializer.cpp
2424
src/renderer/tvgLoader.cpp
2525
src/renderer/tvgPaint.cpp
@@ -28,10 +28,8 @@ target_sources(thorvg PRIVATE
2828
# "src/renderer/tvgSaver.cpp",
2929
src/renderer/tvgScene.cpp
3030
src/renderer/tvgShape.cpp
31-
src/renderer/tvgSwCanvas.cpp
3231
src/renderer/tvgTaskScheduler.cpp
3332
src/renderer/tvgText.cpp
34-
# "src/renderer/tvgWgCanvas.cpp",
3533
# renderer sw_engine
3634
src/renderer/sw_engine/tvgSwFill.cpp
3735
src/renderer/sw_engine/tvgSwImage.cpp

0 commit comments

Comments
 (0)