1
0
forked from 0ad/0ad

Linux/GCC (requires a ## between L and a #expr string)

This was SVN commit r755.
This commit is contained in:
Simon Brenner 2004-07-14 12:26:49 +00:00
parent 114b4242d9
commit 7902369a85

View File

@ -122,7 +122,7 @@ static bool quit = false; // break out of main loop
const wchar_t* HardcodedErrorString(int err)
{
#define E(sym) case sym: return L#sym;
#define E(sym) case sym: return L ## #sym;
switch(err)
{
@ -748,8 +748,9 @@ static void Shutdown()
static void Init(int argc, char* argv[])
{
#ifdef _WIN32
sle(1134);
#endif
// If you ever want to catch a particular allocation:
//_CrtSetBreakAlloc(4128);
@ -821,8 +822,9 @@ PREVTSC=TSC;
write_sys_info();
#ifdef _WIN32
sle(11340106);
#endif
if(set_vmode(g_xres, g_yres, 32, !windowed) < 0)
Die(0, STR_SET_VMODE_FAILED, g_xres, g_yres, SDL_GetError());
@ -960,11 +962,8 @@ static void Frame()
// first call: set last_time and return
assert(TimeSinceLastFrame >= 0.0f);
res_reload_changed_files();
// TODO: limiter in case simulation can't keep up?
const double TICK_TIME = 30e-3; // [s]
#if 0
@ -1007,8 +1006,6 @@ static void Frame()
if (g_FixedFrameTiming && frameCount==100) quit=true;
}
int main(int argc, char* argv[])
{
try