mirror of
https://github.com/holub/mame
synced 2025-10-06 00:54:22 +03:00
Fix testkeys compile/link on windows. (nw)
This commit is contained in:
parent
7967b9e3d5
commit
c1ea281761
@ -87,7 +87,7 @@ function addprojectflags()
|
|||||||
end
|
end
|
||||||
if version >= 60000 then
|
if version >= 60000 then
|
||||||
buildoptions_cpp {
|
buildoptions_cpp {
|
||||||
"-flifetime-dse=1",
|
--"-flifetime-dse=1",
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -796,7 +796,6 @@ end
|
|||||||
-- testkeys
|
-- testkeys
|
||||||
--------------------------------------------------
|
--------------------------------------------------
|
||||||
|
|
||||||
if _OPTIONS["targetos"] ~= "windows" then
|
|
||||||
if (_OPTIONS["osd"] == "sdl") then
|
if (_OPTIONS["osd"] == "sdl") then
|
||||||
project("testkeys")
|
project("testkeys")
|
||||||
uuid ("b3f5a5b8-3203-11e9-93e4-670b4f4e359d")
|
uuid ("b3f5a5b8-3203-11e9-93e4-670b4f4e359d")
|
||||||
@ -810,12 +809,24 @@ if _OPTIONS["targetos"] ~= "windows" then
|
|||||||
targetdir(MAME_DIR)
|
targetdir(MAME_DIR)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
if _OPTIONS["targetos"] == "macosx" then
|
||||||
links {
|
links {
|
||||||
|
"ocore_" .. _OPTIONS["osd"],
|
||||||
|
ext_lib("utf8proc"),
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
links {
|
||||||
|
"SDL2",
|
||||||
|
"SDL2main",
|
||||||
|
"ocore_" .. _OPTIONS["osd"],
|
||||||
|
ext_lib("utf8proc"),
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
dofile("osd/sdl_cfg.lua")
|
dofile("osd/sdl_cfg.lua")
|
||||||
|
|
||||||
includedirs {
|
includedirs {
|
||||||
|
MAME_DIR .. "src/osd",
|
||||||
}
|
}
|
||||||
|
|
||||||
files {
|
files {
|
||||||
@ -829,4 +840,3 @@ if _OPTIONS["targetos"] ~= "windows" then
|
|||||||
|
|
||||||
strip()
|
strip()
|
||||||
end
|
end
|
||||||
end
|
|
@ -16,6 +16,7 @@
|
|||||||
#include <wchar.h>
|
#include <wchar.h>
|
||||||
|
|
||||||
#include "SDL2/SDL.h"
|
#include "SDL2/SDL.h"
|
||||||
|
#include "osdcore.h"
|
||||||
|
|
||||||
//#include "unicode.h"
|
//#include "unicode.h"
|
||||||
|
|
||||||
@ -303,11 +304,7 @@ static const char * lookup_key_name(const key_lookup_table *kt, int kc)
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef SDLMAME_WIN32
|
|
||||||
int utf8_main(int argc, char *argv[])
|
|
||||||
#else
|
|
||||||
int main(int argc, char *argv[])
|
int main(int argc, char *argv[])
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
SDL_Event event;
|
SDL_Event event;
|
||||||
int quit = 0;
|
int quit = 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user