From 6c89b8399038e54476d9b65079dbb44352fc9e19 Mon Sep 17 00:00:00 2001 From: Wohlstand Date: Wed, 26 Aug 2020 22:53:17 +0300 Subject: [PATCH] Fixed Windows build on QMake --- src/midiplay.cc | 2 +- src/midiplay.pro | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/midiplay.cc b/src/midiplay.cc index f0c7f98..b7325b5 100644 --- a/src/midiplay.cc +++ b/src/midiplay.cc @@ -3144,7 +3144,7 @@ static int ParseCommandLine(char *cmdline, char **argv) int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw) { extern int main(int,char**); - char* cmdline = GetCommandLine(); + char* cmdline = GetCommandLineA(); int argc = ParseCommandLine(cmdline, NULL); char**argv = new char* [argc+1]; ParseCommandLine(cmdline, argv); diff --git a/src/midiplay.pro b/src/midiplay.pro index 18b280c..1584b51 100644 --- a/src/midiplay.pro +++ b/src/midiplay.pro @@ -1,14 +1,20 @@ TEMPLATE = app CONFIG -= qt CONFIG += console -CONFIG += c++11 +CONFIG += c++17 +!win32:{ CONFIG += link_pkgconfig PKGCONFIG += sdl2 +} -QMAKE_CXXFLAGS += -fopenmp +QMAKE_CXXFLAGS += -fopenmp -std=c++17 LIBS += -fopenmp +win32:{ + LIBS += -lwinmm -static-libgcc -static-libstdc++ -static -lpthread +} + TARGET = adlmidi SOURCES += \