ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some build fixes for Linux (but still doesn't build)

This commit is contained in:
jsteffens 2016-04-03 23:16:56 +00:00
parent 549079cb95
commit 0ce1df58c5
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
desmume/compile
View File

@ -3,7 +3,7 @@
scriptversion=2012-10-14.11; # UTC scriptversion=2012-10-14.11; # UTC
# Copyright (C) 1999-2013 Free Software Foundation, Inc. # Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>. # Written by Tom Tromey <tromey@cygnus.com>.
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify

7
desmume/src/GPU_osd.cpp
View File

@ -36,6 +36,8 @@
#ifdef _MSC_VER #ifdef _MSC_VER
#include <Windows.h> #include <Windows.h>
#else
#include <sys/time.h>
#endif #endif
bool HudEditorMode = false; bool HudEditorMode = false;
@ -531,10 +533,9 @@ void DrawHUD()
time_t tv_usec = time64 % 1000000; time_t tv_usec = time64 % 1000000;
hudTimer = ((s64)tv_sec * 1000) + ((s64)tv_usec/1000); hudTimer = ((s64)tv_sec * 1000) + ((s64)tv_usec/1000);
#else #else
time_t t; struct timeval t;
gettimeofday (&t, NULL); gettimeofday (&t, NULL);
result->tv_sec = r.tv_sec; hudTimer = ((s64)t.tv_sec * 1000) + ((s64)t.tv_usec/1000);
result->tv_usec = r.tv_usec;
#endif #endif
if (HudEditorMode) if (HudEditorMode)

6
desmume/src/commandline.cpp
View File

@ -198,9 +198,9 @@ bool CommandLine::parse(int argc,char **argv)
{ "spu-synch", no_argument, &_spu_sync_mode, 1 }, { "spu-synch", no_argument, &_spu_sync_mode, 1 },
{ "spu-method", required_argument, nullptr, OPT_SPU_METHOD }, { "spu-method", required_argument, nullptr, OPT_SPU_METHOD },
#ifndef HOST_WINDOWS #ifndef HOST_WINDOWS
{ "disable-sound", no_argument, &disable_sound, 1} { "disable-sound", no_argument, &disable_sound, 1},
{ "disable-limiter", no_argument, &disable_limiter, 1} { "disable-limiter", no_argument, &disable_limiter, 1},
{ "nojoy", no_argument, &_commandline_linux_nojoy, 1} { "nojoy", no_argument, &_commandline_linux_nojoy, 1},
#endif #endif
//sync settings //sync settings

4
desmume/src/wifi.cpp
View File

@ -320,9 +320,9 @@ WifiComInterface* wifiCom;
#if (WIFI_LOGGING_LEVEL >= 1) #if (WIFI_LOGGING_LEVEL >= 1)
#if WIFI_LOG_USE_LOGC #if WIFI_LOG_USE_LOGC
#define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) LOGC(8, "WIFI: "__VA_ARGS__); #define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) LOGC(8, "WIFI: " __VA_ARGS__);
#else #else
#define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) printf("WIFI: "__VA_ARGS__); #define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) printf("WIFI: " __VA_ARGS__);
#endif #endif
#else #else
#define WIFI_LOG(level, ...) {} #define WIFI_LOG(level, ...) {}