From 8d3ca718b51e682056b63176d851611e6864c15e Mon Sep 17 00:00:00 2001 From: Xavier Del Campo Romero Date: Sun, 19 Jan 2025 06:39:13 +0100 Subject: [PATCH] legacymenu: Make networkingmenu.cpp optional networkingmenu.cpp was always being built, but the CLIENT_SERVER macro was used to comment out the implementation. A more orthodox way to achieve the same effect without relying on macros is to let the build system decide whether this source file should be built. --- src/modules/userinterface/legacymenu/CMakeLists.txt | 4 +++- .../userinterface/legacymenu/racescreens/networkingmenu.cpp | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/userinterface/legacymenu/CMakeLists.txt b/src/modules/userinterface/legacymenu/CMakeLists.txt index 2a5198f92..16db8c8e5 100644 --- a/src/modules/userinterface/legacymenu/CMakeLists.txt +++ b/src/modules/userinterface/legacymenu/CMakeLists.txt @@ -55,7 +55,7 @@ SET(CONFSCREENS_HEADERS ${CS}/confscreens.h ${CS}/advancedgraphconfig.h SET(RS racescreens) SET(RACESCREENS_SOURCES ${RS}/raceselectmenu.cpp #${RS}/raceweekendmenu.cpp - ${RS}/racemanmenu.cpp ${RS}/fileselect.cpp ${RS}/networkingmenu.cpp + ${RS}/racemanmenu.cpp ${RS}/fileselect.cpp ${RS}/raceconfigstate.cpp ${RS}/trackselect.cpp ${RS}/driverselect.cpp ${RS}/garagemenu.cpp ${RS}/raceparamsmenu.cpp ${RS}/carsetupmenu.cpp @@ -67,6 +67,8 @@ IF(OPTION_CLIENT_SERVER) SET(RACESCREENS_SOURCES ${RACESCREENS_SOURCES} ${RS}/csnetworkingmenu.cpp ${RS}/csnetclientsettings.cpp ${RS}/csnetserversettings.cpp) +ELSE() + SET(RACESCREENS_SOURCES ${RACESCREENS_SOURCES} ${RS}/networkingmenu.cpp) ENDIF(OPTION_CLIENT_SERVER) SET(RACESCREENS_HEADERS ${RS}/racescreens.h ${RS}/garagemenu.h ${RS}/carsetupmenu.h) #${RS}/raceweekendscreens.h) diff --git a/src/modules/userinterface/legacymenu/racescreens/networkingmenu.cpp b/src/modules/userinterface/legacymenu/racescreens/networkingmenu.cpp index 71694519e..e9079bf16 100644 --- a/src/modules/userinterface/legacymenu/racescreens/networkingmenu.cpp +++ b/src/modules/userinterface/legacymenu/racescreens/networkingmenu.cpp @@ -22,7 +22,6 @@ Should also allow choosing IP address, track, etc ... */ -#ifndef CLIENT_SERVER #include #include #include @@ -1110,4 +1109,3 @@ GetHumanDriver(NetDriver &driver,int index) return 1; } -#endif // #ifndef CLIENT_SERVER