Re #361 (Move the whole menu system to a module) Renamed raceengineclient lib / folder to raceengine (recommended from-scratch rebuild/install)

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@3432 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 2096d25f3b8da06567f451044e8241578e38965c
Former-commit-id: 11c09d9ec6f3a5886d5f6664084c84097a51c448

cmake/macros.cmake

@@ -500,15 +500,15 @@ MACRO(ADD_SDLIB_INCLUDEDIR)
 			FIND_PATH(SDLIB_NETWORKING_INCLUDE_DIR network.h PATHS ${INCLUDE_CANDIDATE} /usr/include /usr/local/include NO_DEFAULT_PATH)
 			FIND_PATH(SDLIB_NETWORKING_INCLUDE_DIR network.h PATHS ${INCLUDE_CANDIDATE} /usr/include /usr/local/include)
 			SET(SDLIB_EXTRA_INCLUDEDIR SDLIB_NETWORKING_INCLUDE_DIR)
-		ELSEIF(SDLIB_LIB STREQUAL "raceengineclient")
+		ELSEIF(SDLIB_LIB STREQUAL "raceengine")
 			IF(IN_SOURCETREE)
-				SET(INCLUDE_CANDIDATE ${SOURCE_DIR}/src/libs/raceengineclient)
+				SET(INCLUDE_CANDIDATE ${SOURCE_DIR}/src/libs/raceengine)
 			ELSE(IN_SOURCETREE)
 				SET(INCLUDE_CANDIDATE ${SD_INCLUDEDIR_ABS})
 			ENDIF(IN_SOURCETREE)
-			FIND_PATH(SDLIB_RACEENGINECLIENT_INCLUDE_DIR raceengine.h PATHS ${INCLUDE_CANDIDATE} /usr/include /usr/local/include NO_DEFAULT_PATH)
-			FIND_PATH(SDLIB_RACEENGINECLIENT_INCLUDE_DIR raceengine.h PATHS ${INCLUDE_CANDIDATE} /usr/include /usr/local/include)
-			SET(SDLIB_EXTRA_INCLUDEDIR SDLIB_RACEENGINECLIENT_INCLUDE_DIR)
+			FIND_PATH(SDLIB_RACEENGINE_INCLUDE_DIR raceengine.h PATHS ${INCLUDE_CANDIDATE} /usr/include /usr/local/include NO_DEFAULT_PATH)
+			FIND_PATH(SDLIB_RACEENGINE_INCLUDE_DIR raceengine.h PATHS ${INCLUDE_CANDIDATE} /usr/include /usr/local/include)
+			SET(SDLIB_EXTRA_INCLUDEDIR SDLIB_RACEENGINE_INCLUDE_DIR)
 		ELSEIF(SDLIB_LIB STREQUAL "racescreens")
 			IF(IN_SOURCETREE)
 				SET(INCLUDE_CANDIDATE ${SOURCE_DIR}/src/libs/racescreens)
@@ -646,14 +646,14 @@ MACRO(ADD_SDLIB_LIBRARY TARGET)
 					ENDIF(IN_SOURCETREE)
 					FIND_LIBRARY(SDLIB_NETWORKING_LIBRARY learning PATHS ${LIBRARY_CANDIDATE} /usr/lib /usr/local/lib PATH_SUFFIXES "" lib)
 					SET(SDLIB_EXTRA_LIBRARY SDLIB_NETWORKING_LIBRARY)
-				ELSEIF(SDLIB_LIB STREQUAL "raceengineclient" OR SDLIB_LIB STREQUAL "raceengine")
+				ELSEIF(SDLIB_LIB STREQUAL "raceengine")
 					IF(IN_SOURCETREE)
-						SET(LIBRARY_CANDIDATE ${SOURCE_DIR}/src/libs/raceengineclient)
+						SET(LIBRARY_CANDIDATE ${SOURCE_DIR}/src/libs/raceengine)
 					ELSE(IN_SOURCETREE)
 						SET(LIBRARY_CANDIDATE ${SD_LIBDIR_ABS})
 					ENDIF(IN_SOURCETREE)
-					FIND_LIBRARY(SDLIB_RACEENGINECLIENT_LIBRARY raceengineclient PATHS ${LIBRARY_CANDIDATE} /usr/lib /usr/local/lib PATH_SUFFIXES "" lib)
-					SET(SDLIB_EXTRA_LIBRARY SDLIB_RACEENGINECLIENT_LIBRARY)
+					FIND_LIBRARY(SDLIB_RACEENGINE_LIBRARY raceengine PATHS ${LIBRARY_CANDIDATE} /usr/lib /usr/local/lib PATH_SUFFIXES "" lib)
+					SET(SDLIB_EXTRA_LIBRARY SDLIB_RACEENGINE_LIBRARY)
 				ELSEIF(SDLIB_LIB STREQUAL "racescreens")
 					IF(IN_SOURCETREE)
 						SET(LIBRARY_CANDIDATE ${SOURCE_DIR}/src/libs/racescreens)

src/libs/CMakeLists.txt

@@ -7,7 +7,7 @@ ADD_SUBDIRECTORY(tgfdata)
 ADD_SUBDIRECTORY(robottools)
 ADD_SUBDIRECTORY(racescreens)
 ADD_SUBDIRECTORY(confscreens)
-ADD_SUBDIRECTORY(raceengineclient)
+ADD_SUBDIRECTORY(raceengine)
 ADD_SUBDIRECTORY(client)
 ADD_SUBDIRECTORY(learning)
 ADD_SUBDIRECTORY(math)

src/libs/client/CMakeLists.txt

@@ -14,7 +14,7 @@ ENDIF(WIN32)
 
 ADD_INTERFACE_INCLUDEDIR()
 ADD_OSSPEC_INCLUDEDIR()
-ADD_SDLIB_INCLUDEDIR(confscreens tgf tgfclient raceengineclient racescreens math)
+ADD_SDLIB_INCLUDEDIR(confscreens tgf tgfclient raceengine racescreens math)
 ADD_SDL_INCLUDEDIR()
 ADD_ENET_INCLUDEDIR()
 
@@ -31,7 +31,7 @@ ENDIF(WIN32)
 ADD_LIBRARY(client SHARED ${CLIENT_SOURCES})
 
 ADD_SDLIB_LIBRARY(client 
-                  tgfclient robottools confscreens raceengineclient racescreens)
+                  tgfclient robottools confscreens raceengine racescreens)
 
 ADD_OPENGL_LIBRARY(client)
 ADD_SDL_LIBRARY(client)

src/libs/raceengine/CMakeLists.txt

@@ -38,16 +38,16 @@ IF (COMMAND CMAKE_POLICY)
     CMAKE_POLICY(SET CMP0003 NEW)
 ENDIF(COMMAND CMAKE_POLICY)
 
-ADD_LIBRARY(raceengineclient SHARED ${RACEENGINE_SOURCES})
+ADD_LIBRARY(raceengine SHARED ${RACEENGINE_SOURCES})
 
-ADD_SDLIB_LIBRARY(raceengineclient
+ADD_SDLIB_LIBRARY(raceengine
                   tgf tgfclient tgfdata robottools
                   racescreens networking)
 
 IF(WIN32)
-    SD_INSTALL_FILES(BIN TARGETS raceengineclient)
+    SD_INSTALL_FILES(BIN TARGETS raceengine)
 ELSE(WIN32)
-    SD_INSTALL_FILES(LIB lib TARGETS raceengineclient)
+    SD_INSTALL_FILES(LIB lib TARGETS raceengine)
 ENDIF(WIN32)
 
 SD_INSTALL_FILES(DATA config FILES raceresults.xsl)

src/linux/CMakeLists.txt

@@ -14,7 +14,7 @@ ENDIF(COMMAND cmake_policy)
 
 ADD_EXECUTABLE(speed-dreams-2 ${SD_SOURCES})
 
-ADD_SDLIB_LIBRARY(speed-dreams-2 client confscreens learning raceengineclient racescreens tgf tgfclient)
+ADD_SDLIB_LIBRARY(speed-dreams-2 client confscreens learning raceengine racescreens tgf tgfclient)
 
 ADD_PLIB_LIBRARY(speed-dreams-2 sg ul)
 ADD_DL_LIBRARY(speed-dreams-2)