Move the platform-dependent stuff in renderingengine.cpp to irrlicht (#…

…13348)
minetest · Jun 11, 2023 · c91182e · c91182e
1 parent 553dc02
commit c91182e
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 320 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -285,10 +285,6 @@ if(WIN32)
 	endif()
 else()
 	# Unix probably
-	if(BUILD_CLIENT AND NOT (HAIKU OR APPLE OR ANDROID))
-		find_package(X11 REQUIRED)
-	endif()
-
 	set(PLATFORM_LIBS ${PLATFORM_LIBS} ${CMAKE_DL_LIBS})
 	if(APPLE)
 		set(PLATFORM_LIBS "-framework CoreFoundation" ${PLATFORM_LIBS})
@@ -518,7 +514,6 @@ if(BUILD_CLIENT)
 	include_directories(SYSTEM
 		${FREETYPE_INCLUDE_DIRS}
 		${SOUND_INCLUDE_DIRS}
-		${X11_INCLUDE_DIR}
 	)
 endif()
 
@@ -545,7 +540,6 @@ if(BUILD_CLIENT)
 		${ZLIB_LIBRARIES}
 		IrrlichtMt::IrrlichtMt
 		${ZSTD_LIBRARY}
-		${X11_LIBRARIES}
 		${SOUND_LIBRARIES}
 		${SQLITE3_LIBRARY}
 		${LUA_LIBRARY}

diff --git a/src/client/clientlauncher.cpp b/src/client/clientlauncher.cpp
@@ -118,7 +118,7 @@ bool ClientLauncher::run(GameStartData &start_data, const Settings &cmd_args)
 		return false;
 	}
 
-	m_rendering_engine->setupTopLevelWindow(PROJECT_NAME_C);
+	m_rendering_engine->setupTopLevelWindow();
 
 	/*
 		This changes the minimum allowed number of vertices in a VBO.