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

Re #307 Removed useless dependencies

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

Former-commit-id: 8914542fec76fd6cc6c9927311ba8120c04106df
Former-commit-id: 6097cc65f3c4764e6e42370e9b64d737c62e8b84
This commit is contained in:
pouillot 2011-03-08 10:10:27 +00:00
parent 6035d75524
commit 8bda999c4b
5 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/tools/menuview/CMakeLists.txt
View file

@ -3,7 +3,7 @@ PROJECT(menuview)
SET(MENUVIEW_SOURCES main.cpp previewmenu.cpp) SET(MENUVIEW_SOURCES main.cpp previewmenu.cpp)
ADD_SDLIB_INCLUDEDIR(client robottools tgf tgfclient math portability) ADD_SDLIB_INCLUDEDIR(robottools tgf tgfclient math portability)
ADD_OSSPEC_INCLUDEDIR() ADD_OSSPEC_INCLUDEDIR()
ADD_SDL_INCLUDEDIR() ADD_SDL_INCLUDEDIR()
ADD_INTERFACE_INCLUDEDIR() ADD_INTERFACE_INCLUDEDIR()
@ -22,7 +22,7 @@ IF (WIN32)
ENDIF(WIN32) ENDIF(WIN32)
ADD_SDLIB_LIBRARY(${SD_TOOLS_EXECPREFIX}menuview robottools tgf tgfclient client) ADD_SDLIB_LIBRARY(${SD_TOOLS_EXECPREFIX}menuview robottools tgf tgfclient)
IF(OPENGL_FOUND) IF(OPENGL_FOUND)

18
src/tools/menuview/main.cpp
View file

@ -17,26 +17,28 @@
* * * *
***************************************************************************/ ***************************************************************************/
#include <config.h> #include <string>
#ifdef WIN32 #ifdef _MSC_VER
#include <windows.h> #include <windows.h>
#include <direct.h>
#include <shlobj.h> #include <shlobj.h>
#endif #endif
#include <portability.h> #include <portability.h>
#include <tgf.h>
#include <tgfclient.h>
#ifdef WIN32 #ifdef WIN32
#include "windowsspec.h" #include <windowsspec.h>
#else #else
#include "linuxspec.h" #include <linuxspec.h>
#endif #endif
#include <client.h> //#include <client.h>
#include "mainmenu.h" //#include "mainmenu.h"
#include "splash.h" //#include "splash.h"
#include "previewmenu.h" #include "previewmenu.h"

12
src/tools/menuview/previewmenu.cpp
View file

@ -25,7 +25,10 @@
void *menuHandle = NULL; void *menuHandle = NULL;
tModList *RacemanModLoaded = (tModList*)NULL;
// What's this ? RacemanModLoaded never set anywhere but initialized to 0 !
//tModList *RacemanModLoaded = (tModList*)NULL;
std::string g_strFile; std::string g_strFile;
void LoadMenuScreen(); void LoadMenuScreen();
@ -40,9 +43,10 @@ endofprog(void * /* dummy */)
static void static void
PreviewMenuActivate(void * /* dummy */) PreviewMenuActivate(void * /* dummy */)
{ {
if (RacemanModLoaded) { // What's this ? RacemanModLoaded never set anywhere but initialized to 0 !
GfModUnloadList(&RacemanModLoaded); // if (RacemanModLoaded) {
} // GfModUnloadList(&RacemanModLoaded);
// }
} }
int ReadControl(void *param,std::string strType,const char *pControlName) int ReadControl(void *param,std::string strType,const char *pControlName)

4
src/tools/menuview/previewmenu.h
View file

@ -25,7 +25,9 @@
#endif #endif
extern void *menuHandle; extern void *menuHandle;
extern tModList *RacemanModLoaded;
// What's this ? RacemanModLoaded never set anywhere but initialized to 0 !
//extern tModList *RacemanModLoaded;
extern int PreviewMenuInit(const char *pFile); extern int PreviewMenuInit(const char *pFile);
extern int PreviewMenuRun(void); extern int PreviewMenuRun(void);

2
src/tools/trackgen/CMakeLists.txt
View file

@ -30,7 +30,7 @@ IF (WIN32)
ADD_EXECUTABLE(${SD_TOOLS_EXECPREFIX}trackgen ${TRACKGEN_SOURCES} ../../windows/windowsspec.cpp) ADD_EXECUTABLE(${SD_TOOLS_EXECPREFIX}trackgen ${TRACKGEN_SOURCES} ../../windows/windowsspec.cpp)
ENDIF(WIN32) ENDIF(WIN32)
ADD_SDLIB_LIBRARY(${SD_TOOLS_EXECPREFIX}trackgen robottools tgf tgfclient client) ADD_SDLIB_LIBRARY(${SD_TOOLS_EXECPREFIX}trackgen robottools tgf tgfclient)
IF(OPENGL_FOUND) IF(OPENGL_FOUND)
TARGET_LINK_LIBRARIES(${SD_TOOLS_EXECPREFIX}trackgen ${OPENGL_LIBRARY}) TARGET_LINK_LIBRARIES(${SD_TOOLS_EXECPREFIX}trackgen ${OPENGL_LIBRARY})