Ticket #4702: mingw.patch

libs/libmythui/libmythui.pro

@@ -76 +76 @@
 cygwin:DEFINES += _WIN32
 
 mingw {
+    # For easier debugging:
+    target.path = $${PREFIX}/bin
+
     using_opengl {
         LIBS += -lopengl32
         DEFINES += USE_OPENGL_PAINTER

libs/libmythupnp/libmythupnp.pro

@@ -43 +43 @@
 LIBS += $$EXTRA_LIBS
 
 mingw {
+    # For easier debugging:
+    target.path = $${PREFIX}/bin
+
     HEADERS += darwin-sendfile.h
     SOURCES += darwin-sendfile.c
 }

programs/mythfrontend/main.cpp

@@ -964 +964 @@
         }
     }
 
+#if defined(_WIN32) && !defined(DEBUG)
+    // pure Win32 GUI app does not have standard IO streams
+    // simply assign the file descriptors to the logfile
+    *stdout = *(_fdopen(new_logfd, "w"));
+    *stderr = *stdout;
+    setvbuf(stdout, NULL, _IOLBF, 256);
+#else
     while (dup2(new_logfd, 1) < 0 && errno == EINTR);
     while (dup2(new_logfd, 2) < 0 && errno == EINTR);
     while (close(new_logfd) < 0   && errno == EINTR);
+#endif
 
     return 0;
 }

programs/mythfrontend/mythfrontend.pro

@@ -36 +36 @@
 SOURCES += custompriority.cpp
 SOURCES += mythappearance.cpp
 
+mingw {
+    !debug: CONFIG -= console
+}
+
 macx {
     mac_bundle {
         CONFIG -= console  # Force behaviour of producing .app bundle

programs/mythtv/mythtv.pro

@@ -13 +13 @@
 # Input
 SOURCES += main.cpp
 
+mingw {
+    !debug: CONFIG -= console
+}
+
 macx {
     mac_bundle {
         QMAKE_POST_LINK = ../../contrib/OSX/makebundle.sh mythtv

programs/mythwelcome/main.cpp

@@ -172 +171 @@
         }
     }
 
+#if defined(_WIN32) && !defined(DEBUG)
+    // pure Win32 GUI app does not have standard IO streams
+    // simply assign the file descriptors to the logfile
+    *stdout = *(_fdopen(new_logfd, "w"));
+    *stderr = *stdout;
+    setvbuf(stdout, NULL, _IOLBF, 256);
+#else
     while (dup2(new_logfd, 1) < 0 && errno == EINTR);
     while (dup2(new_logfd, 2) < 0 && errno == EINTR);
     while (close(new_logfd) < 0   && errno == EINTR);
+#endif
 
     return true;
 }

programs/mythwelcome/mythwelcome.pro

@@ -19 +19 @@
 # Input
 HEADERS += welcomedialog.h welcomesettings.h
 SOURCES += main.cpp welcomedialog.cpp welcomesettings.cpp
+
+mingw {
+    !debug: CONFIG -= console
+}

settings.pro

@@ -9 +9 @@
 
 isEmpty(TARGET_OS) : win32 {
     CONFIG += mingw
-    DEFINES += USING_MINGW USING_WINAUDIO USING_D3D USING_DIRECTX
+    DEFINES += USING_MINGW USING_WINAUDIO USING_D3D
     DEFINES -= UNICODE
     QMAKE_EXTENSION_SHLIB = dll
     VERSION =