Fix testkeys compile/link on windows. (nw)

scripts/genie.lua

@@ -87,7 +87,7 @@ function addprojectflags()
 		end
 		if version >= 60000 then
 			buildoptions_cpp {
-				"-flifetime-dse=1",
+				--"-flifetime-dse=1",
 			}
 		end
 	end

scripts/src/tools.lua

@@ -796,8 +796,7 @@ end
 -- testkeys
 --------------------------------------------------
 
-if _OPTIONS["targetos"] ~= "windows" then
+if (_OPTIONS["osd"] == "sdl") then
-  if (_OPTIONS["osd"] == "sdl") then
   project("testkeys")
   uuid ("b3f5a5b8-3203-11e9-93e4-670b4f4e359d")
   kind "ConsoleApp"
@@ -810,12 +809,24 @@ if _OPTIONS["targetos"] ~= "windows" then
     targetdir(MAME_DIR)
   end
   
+  if _OPTIONS["targetos"] == "macosx" then
     links {
+      "ocore_" .. _OPTIONS["osd"],
+      ext_lib("utf8proc"),
     }
+  else
+    links {
+      "SDL2",
+      "SDL2main",
+      "ocore_" .. _OPTIONS["osd"],
+      ext_lib("utf8proc"),
+    }
+  end
   
   dofile("osd/sdl_cfg.lua")
 
   includedirs {
+    MAME_DIR .. "src/osd",
   }
  
   files {
@@ -828,5 +839,4 @@ if _OPTIONS["targetos"] ~= "windows" then
   configuration { }
   
   strip()
-  end
 end

src/tools/testkeys.cpp

@@ -16,6 +16,7 @@
 #include <wchar.h>
 
 #include "SDL2/SDL.h"
+#include "osdcore.h"
 
 //#include "unicode.h"
 
@@ -303,11 +304,7 @@ static const char * lookup_key_name(const key_lookup_table *kt, int kc)
 	return NULL;
 }
 
-#ifdef SDLMAME_WIN32
-int utf8_main(int argc, char *argv[])
-#else
 int main(int argc, char *argv[])
-#endif
 {
 	SDL_Event event;
 	int quit = 0;