Ticket #9645: win32-lean.diff

File win32-lean.diff, 2.9 KB (added by Lawrence Rust <lvr@…>, 15 years ago)

  • mythplugins/settings.pro 

    diff --git a/mythplugins/settings.pro b/mythplugins/settings.pro
index 4ddc739..e6e70b2 100644
    a b LIBS *= -L$${SYSROOT}$${PREFIX}/$${LIBDIRNAME}  
    1010
    1111isEmpty(TARGET_OS) : win32 {
    1212    CONFIG += mingw
    13     DEFINES += USING_MINGW
     13    DEFINES += USING_MINGW WIN32_LEAN_AND_MEAN NOMINMAX
    1414    # Qt4 creates separate compile directories by default. This disables:
    1515    CONFIG -= debug_and_release debug_and_release_target
    1616    # Some shared libs we depend on are installed here:

  • mythtv/libs/libmyth/audio/audiooutputwin.cpp 

    diff --git a/mythtv/libs/libmyth/audio/audiooutputwin.cpp b/mythtv/libs/libmyth/audio/audiooutputwin.cpp
index 1a55170..7787dc3 100644
    a b using namespace std;  
    77
    88#include <windows.h>
    99#include <mmsystem.h>
     10#include <objbase.h> // For DEFINE_GUID
    1011
    1112#define LOC QString("AOWin: ")
    1213#define LOC_ERR QString("AOWin, error: ")

  • mythtv/libs/libmythbase/compat.h 

    diff --git a/mythtv/libs/libmythbase/compat.h b/mythtv/libs/libmythbase/compat.h
index 193add5..08edccf 100644
    a b  
    4646
    4747#ifdef USING_MINGW
    4848#include <unistd.h>       // for usleep()
     49#include <stdlib.h>       // for rand()
    4950#include <sys/time.h>
    5051#endif
    5152

  • mythtv/libs/libmythlivemedia/BasicUsageEnvironment/BasicTaskScheduler.cpp 

    diff --git a/mythtv/libs/libmythlivemedia/BasicUsageEnvironment/BasicTaskScheduler.cpp b/mythtv/libs/libmythlivemedia/BasicUsageEnvironment/BasicTaskScheduler.cpp
index 80b05e3..b41bc56 100644
    a b along with this library; if not, write to the Free Software Foundation, Inc.,  
    2121#ifndef IMN_PIM
    2222#include "BasicUsageEnvironment.hh"
    2323#include "HandlerSet.hh"
     24#include <stdlib.h> // for exit()
    2425#include <stdio.h>
    2526#if defined(_QNX4)
    2627#include <sys/select.h>

  • mythtv/libs/libmythlivemedia/BasicUsageEnvironment/BasicUsageEnvironment.cpp 

    diff --git a/mythtv/libs/libmythlivemedia/BasicUsageEnvironment/BasicUsageEnvironment.cpp b/mythtv/libs/libmythlivemedia/BasicUsageEnvironment/BasicUsageEnvironment.cpp
index 6def744..8b74558 100644
    a b along with this library; if not, write to the Free Software Foundation, Inc.,  
    1919
    2020#ifndef IMN_PIM
    2121#include "BasicUsageEnvironment.hh"
     22#include <stdlib.h> // for exit()
    2223#include <stdio.h>
    2324
    2425////////// BasicUsageEnvironment //////////

  • mythtv/settings.pro 

    diff --git a/mythtv/settings.pro b/mythtv/settings.pro
index 6355447..30c1a15 100644
    a b VERSION = 0.24.0  
    4343
    4444isEmpty(TARGET_OS) : win32 {
    4545    CONFIG += mingw
    46     DEFINES += WIN32 USING_MINGW
     46    DEFINES += WIN32 USING_MINGW WIN32_LEAN_AND_MEAN NOMINMAX
    4747    DEFINES -= UNICODE
    4848    QMAKE_EXTENSION_SHLIB = dll
    4949    VERSION =