From 6861426aa8fa1fcbe704243c7e8d990af1f4c48d Mon Sep 17 00:00:00 2001 From: pouillot Date: Wed, 9 Mar 2011 19:42:57 +0000 Subject: [PATCH] Re #361 (Move the whole menu system to a module) Fixes the Windows side of r3434 git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@3435 30fe4595-0a0c-4342-8851-515496e4dcbd Former-commit-id: 7f63d1c5e28145a1127fbcebe694361c7d5f277e Former-commit-id: 4ad3d4cf642faffee1dd2038ab21098fa3f2fc63 --- src/libs/client/CMakeLists.txt | 11 +++++------ src/libs/confscreens/CMakeLists.txt | 9 ++------- src/libs/racescreens/CMakeLists.txt | 5 +---- src/libs/racescreens/legacymenu.cpp | 14 +++++++------- src/windows/CMakeLists.txt | 6 ++---- 5 files changed, 17 insertions(+), 28 deletions(-) diff --git a/src/libs/client/CMakeLists.txt b/src/libs/client/CMakeLists.txt index 32905e32..2198eae5 100644 --- a/src/libs/client/CMakeLists.txt +++ b/src/libs/client/CMakeLists.txt @@ -7,16 +7,16 @@ SET(CLIENT_SOURCES creditsmenu.cpp entry.cpp exitmenu.cpp mainmenu.cpp client.h creditsmenu.h exitmenu.h mainmenu.h optionsmenu.h splash.h) IF(WIN32) - #errno.cpp should only be included in Windows - #(it fails to compile when added in Linux) + #errno.cpp should only be included under Windows + #(it fails to compile when added under Linux) SET(CLIENT_SOURCES ${CLIENT_SOURCES} errno.cpp) ENDIF(WIN32) ADD_INTERFACE_INCLUDEDIR() ADD_OSSPEC_INCLUDEDIR() ADD_SDLIB_INCLUDEDIR(confscreens racescreens tgf tgfclient math) -#ADD_SDL_INCLUDEDIR() -#ADD_ENET_INCLUDEDIR() +ADD_SDL_INCLUDEDIR() +ADD_PLIB_INCLUDEDIR() # Disable developer warning IF (COMMAND CMAKE_POLICY) @@ -33,9 +33,7 @@ ADD_LIBRARY(client SHARED ${CLIENT_SOURCES}) ADD_SDLIB_LIBRARY(client tgfclient robottools confscreens racescreens) -ADD_OPENGL_LIBRARY(client) ADD_SDL_LIBRARY(client) -ADD_OPENAL_LIBRARY(client) IF(WIN32) #joystick library @@ -47,5 +45,6 @@ IF(WIN32) ELSE(WIN32) SD_INSTALL_FILES(LIB lib TARGETS client) ENDIF(WIN32) + SD_INSTALL_FILES(INCLUDE FILES client.h exitmenu.h) diff --git a/src/libs/confscreens/CMakeLists.txt b/src/libs/confscreens/CMakeLists.txt index 71ea956f..2abc2b33 100644 --- a/src/libs/confscreens/CMakeLists.txt +++ b/src/libs/confscreens/CMakeLists.txt @@ -16,11 +16,8 @@ SET(CONFSCREENS_SOURCES controlconfig.cpp playerconfig.cpp displayconfig.cpp gra ADD_INTERFACE_INCLUDEDIR() ADD_OSSPEC_INCLUDEDIR() ADD_SDLIB_INCLUDEDIR(portability math tgf tgfclient tgfdata networking) -#ADD_SDL_INCLUDEDIR() - -IF(WIN32) - INCLUDE_DIRECTORIES(src/windows/include) -ENDIF(WIN32) +ADD_PLIB_INCLUDEDIR() +ADD_ENET_INCLUDEDIR() IF(WIN32) # DLL export stuff under Windows (to avoid .def file) @@ -40,8 +37,6 @@ ADD_LIBRARY(confscreens SHARED ${CONFSCREENS_SOURCES}) ADD_SDLIB_LIBRARY(confscreens tgf tgfclient tgfdata networking) -#ADD_PLIB_LIBRARY(confscreens ul) - IF(WIN32) SD_INSTALL_FILES(BIN TARGETS confscreens) ELSE(WIN32) diff --git a/src/libs/racescreens/CMakeLists.txt b/src/libs/racescreens/CMakeLists.txt index 91c5d2b4..1bc6efa7 100644 --- a/src/libs/racescreens/CMakeLists.txt +++ b/src/libs/racescreens/CMakeLists.txt @@ -15,8 +15,7 @@ SET(RACESCREENS_SOURCES carselect.cpp driverselect.cpp fileselect.cpp ADD_INTERFACE_INCLUDEDIR() ADD_OSSPEC_INCLUDEDIR() ADD_SDLIB_INCLUDEDIR(portability confscreens networking tgf tgfclient tgfdata math robottools) - -#ADD_SDL_INCLUDEDIR() +ADD_PLIB_INCLUDEDIR() IF(WIN32) # DLL export stuff under Windows (to avoid .def file) @@ -36,8 +35,6 @@ ADD_LIBRARY(racescreens SHARED ${RACESCREENS_SOURCES}) ADD_SDLIB_LIBRARY(racescreens confscreens networking tgf tgfclient tgfdata robottools) -#ADD_PLIB_LIBRARY(racescreens ul) - IF(WIN32) SD_INSTALL_FILES(BIN TARGETS racescreens) ELSE(WIN32) diff --git a/src/libs/racescreens/legacymenu.cpp b/src/libs/racescreens/legacymenu.cpp index 547ca9ce..89e74c5b 100644 --- a/src/libs/racescreens/legacymenu.cpp +++ b/src/libs/racescreens/legacymenu.cpp @@ -42,12 +42,12 @@ LegacyMenu::LegacyMenu() // Implementation of IUserInterface. void *LegacyMenu::createRaceScreen() { - ::ReScreenInit(); + return ::ReScreenInit(); } void *LegacyMenu::createRaceEventLoopHook() { - ::ReHookInit(); + return ::ReHookInit(); } void LegacyMenu::setRaceMessage(const char *msg) @@ -75,11 +75,11 @@ void LegacyMenu::shutdownLoadingScreen() int LegacyMenu::activateRacemanMenu() { - ::ReRacemanMenu(); + return ::ReRacemanMenu(); } int LegacyMenu::activateNextEventMenu() { - ::ReNextEventMenu(); + return ::ReNextEventMenu(); } void LegacyMenu::activateStartRaceMenu(tRmInfo *reInfo, void *startScr, void *abortScr) @@ -94,7 +94,7 @@ void *LegacyMenu::activateStopRaceMenu(const char* title, const char* label4, const char* tip4, void *screen4, const char* label5, const char* tip5, void *screen5) { - ::RmStopRaceScreen(title, + return ::RmStopRaceScreen(title, label1, tip1, screen1, label2, tip2, screen2, label3, tip3, screen3, label4, tip4, screen4, label5, tip5, screen5); @@ -107,7 +107,7 @@ void LegacyMenu::activatePitMenu(tCarElt *car, tfuiCallback callback) void *LegacyMenu::createResultsMenu() { - ::ReResScreenInit(); + return ::ReResScreenInit(); } void LegacyMenu::activateResultsMenu(void *prevHdle, tRmInfo *reInfo) { @@ -139,7 +139,7 @@ void LegacyMenu::showResultsMenuContinueButton() } int LegacyMenu::getResultsMenuLineCount() { - ::ReResGetLines(); + return ::ReResGetLines(); } void LegacyMenu::eraseResultsMenu() { diff --git a/src/windows/CMakeLists.txt b/src/windows/CMakeLists.txt index 29b6fe9d..49474ee9 100644 --- a/src/windows/CMakeLists.txt +++ b/src/windows/CMakeLists.txt @@ -1,13 +1,12 @@ INCLUDE(../../cmake/macros.cmake) PROJECT(speed-dreams) -ADD_PLIB_INCLUDEDIR() - SET(SD_SOURCES main.cpp windowsspec.cpp speed-dreams.rc ../../data/data/icons/icon.ico) ADD_INTERFACE_INCLUDEDIR() ADD_OSSPEC_INCLUDEDIR() -ADD_SDLIB_INCLUDEDIR(client tgf tgfclient portability) +ADD_SDLIB_INCLUDEDIR(client raceengine racescreens tgf tgfclient portability) +ADD_PLIB_INCLUDEDIR() #disable developer warning if (COMMAND cmake_policy) @@ -16,7 +15,6 @@ endif(COMMAND cmake_policy) ADD_EXECUTABLE(speed-dreams-2 ${SD_SOURCES}) -include_directories(../libs) ADD_SDLIB_LIBRARY(speed-dreams-2 client raceengine racescreens tgf) SD_INSTALL_FILES(INCLUDE FILES osspec.h)