Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-20 03:06:39 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #781 from h0tw1r3/master

Browse Source 
cross compile fixes
This commit is contained in:
Miodrag Milanović 2016-04-03 13:44:55 +02:00
commit 5b0b34b30a
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/osd/modules/font/font_dwrite.cpp
View File

@ -31,7 +31,7 @@
DEFINE_GUID(CLSID_WICImagingFactory, 0xcacaf262, 0x9370, 0x4615, 0xa1, 0x3b, 0x9f, 0x55, 0x39, 0xda, 0x4c, 0xa); DEFINE_GUID(CLSID_WICImagingFactory, 0xcacaf262, 0x9370, 0x4615, 0xa1, 0x3b, 0x9f, 0x55, 0x39, 0xda, 0x4c, 0xa);
DEFINE_GUID(GUID_WICPixelFormat8bppAlpha, 0xe6cd0116, 0xeeba, 0x4161, 0xaa, 0x85, 0x27, 0xdd, 0x9f, 0xb3, 0xa8, 0x95); DEFINE_GUID(GUID_WICPixelFormat8bppAlpha, 0xe6cd0116, 0xeeba, 0x4161, 0xaa, 0x85, 0x27, 0xdd, 0x9f, 0xb3, 0xa8, 0x95);
#include <wrl\client.h> #include <wrl/client.h>
#undef interface #undef interface
#include "strconv.h" #include "strconv.h"

13
src/osd/sdl/output.cpp
View File

@ -11,6 +11,7 @@
#include <stdio.h> #include <stdio.h>
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include <inttypes.h>
// MAME headers // MAME headers
#include "emu.h" #include "emu.h"
@ -32,12 +33,6 @@
*/ */
#ifdef PTR64
#define PID_FMT "%ld"
#else
#define PID_FMT "%d"
#endif
//============================================================ //============================================================
// TYPEDEFS // TYPEDEFS
//============================================================ //============================================================
@ -83,7 +78,7 @@ bool sdl_osd_interface::output_init()
output = fdopen(fildes, "w"); output = fdopen(fildes, "w");
osd_printf_verbose("output: opened output notifier file %s\n", SDLMAME_OUTPUT); osd_printf_verbose("output: opened output notifier file %s\n", SDLMAME_OUTPUT);
fprintf(output, "MAME " PID_FMT " START %s\n", osd_getpid(), this->machine().system().name); fprintf(output, "MAME %" PRIxPTR " START %s\n", osd_getpid(), this->machine().system().name);
fflush(output); fflush(output);
} }
@ -100,7 +95,7 @@ void sdl_osd_interface::output_exit()
{ {
if (output != NULL) if (output != NULL)
{ {
fprintf(output, "MAME " PID_FMT " STOP %s\n", osd_getpid(), machine().system().name); fprintf(output, "MAME %" PRIxPTR " STOP %s\n", osd_getpid(), machine().system().name);
fflush(output); fflush(output);
fclose(output); fclose(output);
output = NULL; output = NULL;
@ -116,7 +111,7 @@ static void notifier_callback(const char *outname, INT32 value, void *param)
{ {
if (output != NULL) if (output != NULL)
{ {
fprintf(output, "OUT " PID_FMT " %s %d\n", osd_getpid(), outname, value); fprintf(output, "OUT %" PRIxPTR " %s %d\n", osd_getpid(), outname, value);
fflush(output); fflush(output);
} }
} }