Merge branch 'v2-3'

OGRECave · Nov 17, 2023 · 879a86f · 879a86f
2 parents bb07bae + 8d4daea
commit 879a86f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -301,6 +301,10 @@ set(OGRE_Paging_LIBRARIES ${OGRE_NEXT}Paging)
 set(OGRE_Terrain_LIBRARIES ${OGRE_NEXT}Terrain)
 set(OGRE_Volume_LIBRARIES ${OGRE_NEXT}Volume)
 
+if( OGRE_STATIC AND UNIX AND NOT OGRE_CONFIG_UNIX_NO_X11 )
+	set( OGRE_LIBRARIES ${OGRE_LIBRARIES} xcb xcb-randr )
+endif()
+
 # Specify build paths
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${OGRE_BINARY_DIR}/lib")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${OGRE_BINARY_DIR}/lib")

diff --git a/Samples/2.0/CMakeLists.txt b/Samples/2.0/CMakeLists.txt
@@ -212,7 +212,7 @@ if( OGRE_BUILD_SAMPLES2 AND NOT OGRE_BUILD_SAMPLES2_SKIP )
 	add_subdirectory(Tutorials/Tutorial_TextureBaking)
 	add_subdirectory(Tutorials/TutorialUav01_Setup)
 	add_subdirectory(Tutorials/TutorialUav02_Setup)
-	if( OGRE_BUILD_RENDERSYSTEM_VULKAN AND NOT ANDROID )
+	if( OGRE_BUILD_RENDERSYSTEM_VULKAN AND NOT ANDROID AND NOT OGRE_STATIC )
 		add_subdirectory(Tutorials/Tutorial_VulkanExternal)
 	endif()
 endif()