Re #307 Merged version.h and config.h into the only remaining config.h, for simplicity + renamed the speed-dreams project to speed-dreams-2 (should be nearly transparent to anyone)
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@4238 30fe4595-0a0c-4342-8851-515496e4dcbd
This commit is contained in:
pouillot
parent
2ae5767879
commit
10ebd46aec
|
|
@ -1,12 +1,12 @@
|
|||
CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0 FATAL_ERROR)
|
||||
|
||||
# Speed Dreams project
|
||||
PROJECT(speed-dreams)
|
||||
PROJECT(speed-dreams-2)
|
||||
|
||||
INCLUDE(cmake/macros.cmake)
|
||||
INCLUDE(cmake/checks.cmake)
|
||||
|
||||
# 3rd Party Dependency Stuff
|
||||
# Pre-built 3rd Party under Windows.
|
||||
IF(WIN32)
|
||||
INCLUDE(Find3rdPartyDependencies)
|
||||
ENDIF(WIN32)
|
||||
|
|
@ -95,9 +95,6 @@ ENDIF(NEED_SVN_REV)
|
|||
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/config.h.cmake
|
||||
${CMAKE_CURRENT_BINARY_DIR}/config.h)
|
||||
|
||||
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/version.h.cmake
|
||||
${CMAKE_CURRENT_BINARY_DIR}/version.h)
|
||||
|
||||
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/doxygen_config.cmake
|
||||
${CMAKE_CURRENT_BINARY_DIR}/doxygen_config @ONLY)
|
||||
|
||||
|
|
|
|||
|
|
@ -124,11 +124,15 @@
|
|||
/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
|
||||
#cmakedefine TIME_WITH_SYS_TIME 1
|
||||
|
||||
/* Version number of package */
|
||||
/* Version numbers for package */
|
||||
#ifndef VERSION
|
||||
#define VERSION "${VERSION}"
|
||||
#endif //VERSION
|
||||
|
||||
#ifndef VERSION_LONG
|
||||
#define VERSION_LONG "${VERSION_LONG}"
|
||||
#endif //VERSION_LONG
|
||||
|
||||
/* Define to 1 if your processor stores words with the most significant byte
|
||||
first (like Motorola and SPARC, unlike Intel and VAX). */
|
||||
#cmakedefine WORDS_BIGENDIAN 1
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
#ifndef MK_VERSION_H
|
||||
#define MK_VERSION_H
|
||||
|
||||
#ifndef VERSION
|
||||
#define VERSION "${VERSION}"
|
||||
#endif //VERSION
|
||||
|
||||
#ifndef VERSION_LONG
|
||||
#define VERSION_LONG "${VERSION_LONG}"
|
||||
#endif //VERSION_LONG
|
||||
|
||||
#endif //MK_VERSION_H
|
||||
|
||||
|
|
@ -25,7 +25,16 @@
|
|||
#include <cerrno>
|
||||
#include <iostream>
|
||||
|
||||
#ifdef WIN32
|
||||
#ifndef HAVE_CONFIG_H
|
||||
#define HAVE_CONFIG_H
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#include <portability.h>
|
||||
|
||||
#include "tgf.hpp"
|
||||
|
|
|
|||
|
|
@ -31,96 +31,13 @@
|
|||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "version.h"
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include <raceengine.h>
|
||||
#include <iuserinterface.h>
|
||||
|
||||
|
||||
//class NoGUIApplication : public GfApplication
|
||||
//{
|
||||
// public:
|
||||
//
|
||||
// //! Constructor.
|
||||
// NoGUIApplication(int argc, char **argv)
|
||||
// : GfApplication("Speed Dreams", "an Open Motorsport Sim", argc, argv)
|
||||
// {
|
||||
// }
|
||||
//
|
||||
// bool parseOptions()
|
||||
// {
|
||||
// // First the standard ones.
|
||||
// if (!GfApplication::parseOptions())
|
||||
// return false;
|
||||
//
|
||||
// // Then the specific ones.
|
||||
// std::list<std::string> lstNewOptionsLeft;
|
||||
// std::list<std::string>::const_iterator itOpt;
|
||||
// for (itOpt = _lstOptionsLeft.begin(); itOpt != _lstOptionsLeft.end(); itOpt++)
|
||||
// {
|
||||
// // Race to start.
|
||||
// if (*itOpt == "-sr" || *itOpt == "--startrace")
|
||||
// {
|
||||
// itOpt++;
|
||||
// if (itOpt != _lstOptionsLeft.end())
|
||||
// strRaceToStart = *itOpt; ??????????????????
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// // Save this option : it is "left".
|
||||
// lstNewOptionsLeft.push_back(*itOpt);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// // Store the new list of left options after parsing.
|
||||
// _lstOptionsLeft = lstNewOptionsLeft;
|
||||
//
|
||||
// return true;
|
||||
// }
|
||||
//};
|
||||
//
|
||||
//class GUIApplication : public GfuiApplication
|
||||
//{
|
||||
// public:
|
||||
//
|
||||
// //! Constructor.
|
||||
// Application(int argc, char **argv)
|
||||
// : GfuiApplication("Speed Dreams", "an Open Motorsport Sim", argc, argv)
|
||||
// {
|
||||
// }
|
||||
//
|
||||
// bool parseOptions()
|
||||
// {
|
||||
// // // First the standard ones.
|
||||
// // if (!GfApplication::parseOptions())
|
||||
// // return false;
|
||||
//
|
||||
// // // Then the specific ones.
|
||||
// // std::list<std::string> lstNewOptionsLeft;
|
||||
// // std::list<std::string>::const_iterator itOpt;
|
||||
// // for (itOpt = _lstOptionsLeft.begin(); itOpt != _lstOptionsLeft.end(); itOpt++)
|
||||
// // {
|
||||
// // // Text-only
|
||||
// // if (*itOpt == "-to" || *itOpt == "--textonly")
|
||||
// // {
|
||||
// // itOpt++;
|
||||
// // _bTextOnly = true;
|
||||
// // }
|
||||
// // else
|
||||
// // {
|
||||
// // // Save this option : it is "left".
|
||||
// // lstNewOptionsLeft.push_back(*itOpt);
|
||||
// // }
|
||||
// // }
|
||||
//
|
||||
// // // Store the new list of left options after parsing.
|
||||
// // _lstOptionsLeft = lstNewOptionsLeft;
|
||||
//
|
||||
// return true;
|
||||
// }
|
||||
//};
|
||||
|
||||
/*
|
||||
* Function
|
||||
* main
|
||||
|
|
|
|||
|
|
@ -46,7 +46,16 @@
|
|||
#include <plib/ssg.h>
|
||||
#include <SDL/SDL.h>
|
||||
|
||||
#ifdef WIN32
|
||||
#ifndef HAVE_CONFIG_H
|
||||
#define HAVE_CONFIG_H
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#include <tgf.hpp>
|
||||
#include <portability.h>
|
||||
#include <itrackloader.h>
|
||||
|
|
|
|||
Loading…
Reference in New Issue