adlmidi-2: Fixed MSVC build

2 files changed, 24 insertions, 14 deletions

diff --git a/utils/adlmidi-2/CMakeLists.txt b/utils/adlmidi-2/CMakeLists.txt
index 6453142..a197071 100644
--- a/utils/adlmidi-2/CMakeLists.txt
+++ b/utils/adlmidi-2/CMakeLists.txt
@@ -16,14 +16,21 @@ endif()
 try_compile(HAS_TERMIO ${CMAKE_BINARY_DIR}/compile_tests "${CMAKE_CURRENT_SOURCE_DIR}/cmake/check-termio.c")
 try_compile(HAS_TERMIOS ${CMAKE_BINARY_DIR}/compile_tests "${CMAKE_CURRENT_SOURCE_DIR}/cmake/check-termios.c")
 
+include(../midiplay/utf8main.cmake)
+
 set(adlmidi2_src)
 list(APPEND adlmidi2_src
     midiplay.cc
     input.cc
+    input.hpp
+    6x9.hpp
+    8x16.hpp
+    9x15.hpp
+    ${UTF8MAIN_SRCS}
 )
 
 if(ADLMIDI2_HAS_PUZZLE_GAME)
-    list(APPEND adlmidi2_src puzzlegame.cc)
+    list(APPEND adlmidi2_src puzzlegame.cc puzzlegame.hpp)
 endif()
 
 add_executable(adlmidi2 ${adlmidi2_src})
diff --git a/utils/adlmidi-2/midiplay.cc b/utils/adlmidi-2/midiplay.cc
index 8ed4690..f800fcc 100644
--- a/utils/adlmidi-2/midiplay.cc
+++ b/utils/adlmidi-2/midiplay.cc
@@ -19,6 +19,7 @@
 #include <vector> // vector
 #include <deque>  // deque
 #include <cmath>  // exp, log, ceil
+#include "utf8main.h"
 
 #include <assert.h>
 
@@ -1611,19 +1612,21 @@ static int ParseCommandLine(char *cmdline, char **argv)
 
 extern int main(int argc, char **argv);
 
-int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw)
-{
-    (void)hInst;
-    (void)hPrev;
-    (void)szCmdLine;
-    (void)sw;
-    //extern int main(int, char **);
-    char *cmdline = GetCommandLine();
-    int argc = ParseCommandLine(cmdline, NULL);
-    char **argv = new char *[argc + 1];
-    ParseCommandLine(cmdline, argv);
-    return main(argc, argv);
-}
+// Replaced by UTF8Main
+
+//int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw)
+//{
+//    (void)hInst;
+//    (void)hPrev;
+//    (void)szCmdLine;
+//    (void)sw;
+//    //extern int main(int, char **);
+//    char *cmdline = GetCommandLine();
+//    int argc = ParseCommandLine(cmdline, NULL);
+//    char **argv = new char *[argc + 1];
+//    ParseCommandLine(cmdline, argv);
+//    return main(argc, argv);
+//}
 #endif
 
 static void adlEventHook(void *ui, ADL_UInt8 type, ADL_UInt8 subtype, ADL_UInt8 /*channel*/, const ADL_UInt8 *data, size_t len)