iceflower/speed-dreams-code
1
0
Fork 0
forked from speed-dreams/speed-dreams-code
Code Pull requests Activity

Re #361 (Move the whole menu system to a module) Fixes the Windows side of r3434

Browse source 
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
This commit is contained in:
pouillot 2011-03-09 19:42:57 +00:00
parent dfaa649b3c
commit 6861426aa8
5 changed files with 17 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/libs/client/CMakeLists.txt
View file

@ -7,16 +7,16 @@ SET(CLIENT_SOURCES creditsmenu.cpp entry.cpp exitmenu.cpp mainmenu.cpp
client.h creditsmenu.h exitmenu.h mainmenu.h client.h creditsmenu.h exitmenu.h mainmenu.h
optionsmenu.h splash.h) optionsmenu.h splash.h)
IF(WIN32) IF(WIN32)
#errno.cpp should only be included in Windows #errno.cpp should only be included under Windows
#(it fails to compile when added in Linux) #(it fails to compile when added under Linux)
SET(CLIENT_SOURCES ${CLIENT_SOURCES} errno.cpp) SET(CLIENT_SOURCES ${CLIENT_SOURCES} errno.cpp)
ENDIF(WIN32) ENDIF(WIN32)
ADD_INTERFACE_INCLUDEDIR() ADD_INTERFACE_INCLUDEDIR()
ADD_OSSPEC_INCLUDEDIR() ADD_OSSPEC_INCLUDEDIR()
ADD_SDLIB_INCLUDEDIR(confscreens racescreens tgf tgfclient math) ADD_SDLIB_INCLUDEDIR(confscreens racescreens tgf tgfclient math)
#ADD_SDL_INCLUDEDIR() ADD_SDL_INCLUDEDIR()
#ADD_ENET_INCLUDEDIR() ADD_PLIB_INCLUDEDIR()
# Disable developer warning # Disable developer warning
IF (COMMAND CMAKE_POLICY) IF (COMMAND CMAKE_POLICY)
@ -33,9 +33,7 @@ ADD_LIBRARY(client SHARED ${CLIENT_SOURCES})
ADD_SDLIB_LIBRARY(client ADD_SDLIB_LIBRARY(client
tgfclient robottools confscreens racescreens) tgfclient robottools confscreens racescreens)
ADD_OPENGL_LIBRARY(client)
ADD_SDL_LIBRARY(client) ADD_SDL_LIBRARY(client)
ADD_OPENAL_LIBRARY(client)
IF(WIN32) IF(WIN32)
#joystick library #joystick library
@ -47,5 +45,6 @@ IF(WIN32)
ELSE(WIN32) ELSE(WIN32)
SD_INSTALL_FILES(LIB lib TARGETS client) SD_INSTALL_FILES(LIB lib TARGETS client)
ENDIF(WIN32) ENDIF(WIN32)
SD_INSTALL_FILES(INCLUDE FILES client.h exitmenu.h) SD_INSTALL_FILES(INCLUDE FILES client.h exitmenu.h)

9
src/libs/confscreens/CMakeLists.txt
View file

@ -16,11 +16,8 @@ SET(CONFSCREENS_SOURCES controlconfig.cpp playerconfig.cpp displayconfig.cpp gra
ADD_INTERFACE_INCLUDEDIR() ADD_INTERFACE_INCLUDEDIR()
ADD_OSSPEC_INCLUDEDIR() ADD_OSSPEC_INCLUDEDIR()
ADD_SDLIB_INCLUDEDIR(portability math tgf tgfclient tgfdata networking) ADD_SDLIB_INCLUDEDIR(portability math tgf tgfclient tgfdata networking)
#ADD_SDL_INCLUDEDIR() ADD_PLIB_INCLUDEDIR()
ADD_ENET_INCLUDEDIR()
IF(WIN32)
INCLUDE_DIRECTORIES(src/windows/include)
ENDIF(WIN32)
IF(WIN32) IF(WIN32)
# DLL export stuff under Windows (to avoid .def file) # DLL export stuff under Windows (to avoid .def file)
@ -40,8 +37,6 @@ ADD_LIBRARY(confscreens SHARED ${CONFSCREENS_SOURCES})
ADD_SDLIB_LIBRARY(confscreens ADD_SDLIB_LIBRARY(confscreens
tgf tgfclient tgfdata networking) tgf tgfclient tgfdata networking)
#ADD_PLIB_LIBRARY(confscreens ul)
IF(WIN32) IF(WIN32)
SD_INSTALL_FILES(BIN TARGETS confscreens) SD_INSTALL_FILES(BIN TARGETS confscreens)
ELSE(WIN32) ELSE(WIN32)

5
src/libs/racescreens/CMakeLists.txt
View file

@ -15,8 +15,7 @@ SET(RACESCREENS_SOURCES carselect.cpp driverselect.cpp fileselect.cpp
ADD_INTERFACE_INCLUDEDIR() ADD_INTERFACE_INCLUDEDIR()
ADD_OSSPEC_INCLUDEDIR() ADD_OSSPEC_INCLUDEDIR()
ADD_SDLIB_INCLUDEDIR(portability confscreens networking tgf tgfclient tgfdata math robottools) ADD_SDLIB_INCLUDEDIR(portability confscreens networking tgf tgfclient tgfdata math robottools)
ADD_PLIB_INCLUDEDIR()
#ADD_SDL_INCLUDEDIR()
IF(WIN32) IF(WIN32)
# DLL export stuff under Windows (to avoid .def file) # DLL export stuff under Windows (to avoid .def file)
@ -36,8 +35,6 @@ ADD_LIBRARY(racescreens SHARED ${RACESCREENS_SOURCES})
ADD_SDLIB_LIBRARY(racescreens ADD_SDLIB_LIBRARY(racescreens
confscreens networking tgf tgfclient tgfdata robottools) confscreens networking tgf tgfclient tgfdata robottools)
#ADD_PLIB_LIBRARY(racescreens ul)
IF(WIN32) IF(WIN32)
SD_INSTALL_FILES(BIN TARGETS racescreens) SD_INSTALL_FILES(BIN TARGETS racescreens)
ELSE(WIN32) ELSE(WIN32)

14
src/libs/racescreens/legacymenu.cpp
View file

@ -42,12 +42,12 @@ LegacyMenu::LegacyMenu()
// Implementation of IUserInterface. // Implementation of IUserInterface.
void *LegacyMenu::createRaceScreen() void *LegacyMenu::createRaceScreen()
{ {
::ReScreenInit(); return ::ReScreenInit();
} }
void *LegacyMenu::createRaceEventLoopHook() void *LegacyMenu::createRaceEventLoopHook()
{ {
::ReHookInit(); return ::ReHookInit();
} }
void LegacyMenu::setRaceMessage(const char *msg) void LegacyMenu::setRaceMessage(const char *msg)
@ -75,11 +75,11 @@ void LegacyMenu::shutdownLoadingScreen()
int LegacyMenu::activateRacemanMenu() int LegacyMenu::activateRacemanMenu()
{ {
::ReRacemanMenu(); return ::ReRacemanMenu();
} }
int LegacyMenu::activateNextEventMenu() int LegacyMenu::activateNextEventMenu()
{ {
::ReNextEventMenu(); return ::ReNextEventMenu();
} }
void LegacyMenu::activateStartRaceMenu(tRmInfo *reInfo, void *startScr, void *abortScr) 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* label4, const char* tip4, void *screen4,
const char* label5, const char* tip5, void *screen5) const char* label5, const char* tip5, void *screen5)
{ {
::RmStopRaceScreen(title, return ::RmStopRaceScreen(title,
label1, tip1, screen1, label2, tip2, screen2, label1, tip1, screen1, label2, tip2, screen2,
label3, tip3, screen3, label4, tip4, screen4, label3, tip3, screen3, label4, tip4, screen4,
label5, tip5, screen5); label5, tip5, screen5);
@ -107,7 +107,7 @@ void LegacyMenu::activatePitMenu(tCarElt *car, tfuiCallback callback)
void *LegacyMenu::createResultsMenu() void *LegacyMenu::createResultsMenu()
{ {
::ReResScreenInit(); return ::ReResScreenInit();
} }
void LegacyMenu::activateResultsMenu(void *prevHdle, tRmInfo *reInfo) void LegacyMenu::activateResultsMenu(void *prevHdle, tRmInfo *reInfo)
{ {
@ -139,7 +139,7 @@ void LegacyMenu::showResultsMenuContinueButton()
} }
int LegacyMenu::getResultsMenuLineCount() int LegacyMenu::getResultsMenuLineCount()
{ {
::ReResGetLines(); return ::ReResGetLines();
} }
void LegacyMenu::eraseResultsMenu() void LegacyMenu::eraseResultsMenu()
{ {

6
src/windows/CMakeLists.txt
View file

@ -1,13 +1,12 @@
INCLUDE(../../cmake/macros.cmake) INCLUDE(../../cmake/macros.cmake)
PROJECT(speed-dreams) PROJECT(speed-dreams)
ADD_PLIB_INCLUDEDIR()
SET(SD_SOURCES main.cpp windowsspec.cpp speed-dreams.rc ../../data/data/icons/icon.ico) SET(SD_SOURCES main.cpp windowsspec.cpp speed-dreams.rc ../../data/data/icons/icon.ico)
ADD_INTERFACE_INCLUDEDIR() ADD_INTERFACE_INCLUDEDIR()
ADD_OSSPEC_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 #disable developer warning
if (COMMAND cmake_policy) if (COMMAND cmake_policy)
@ -16,7 +15,6 @@ endif(COMMAND cmake_policy)
ADD_EXECUTABLE(speed-dreams-2 ${SD_SOURCES}) ADD_EXECUTABLE(speed-dreams-2 ${SD_SOURCES})
include_directories(../libs)
ADD_SDLIB_LIBRARY(speed-dreams-2 client raceengine racescreens tgf) ADD_SDLIB_LIBRARY(speed-dreams-2 client raceengine racescreens tgf)
SD_INSTALL_FILES(INCLUDE FILES osspec.h) SD_INSTALL_FILES(INCLUDE FILES osspec.h)