Ticket #1590: mythtv-win.patch

File mythtv-win.patch, 23.6 KB (added by jerrymr at gmail dot com, 13 years ago)

Ignore previous patches. This patch allows everything in libs + mythfrontend to build under cygwin

  • configure

     
    27342734  echo "Mac acceleration $dvdv"
    27352735  echo "OpenGL vsync     $opengl_vsync"
    27362736  echo "DirectFB         $direct_fb"
    2737   if test x"$mingw32" = x"yes" -o x"$cygwin" = x"yes" ; then
     2737  if test x"$mingw32" = x"yes" -o x"$targetos" = x"CYGWIN" ; then
    27382738  echo "DirectX          $direct_x"
    27392739fi
    27402740echo
     
    31813181  echo "CONFIG_X264=yes" >> $MYTH_CONFIG_MAK
    31823182fi
    31833183
     3184if test x"$targetos" = x"CYGWIN" ; then
     3185  echo "#define CONFIG_CYGWIN 1" >> $TMPH
     3186  echo "#ifndef llrint" >> $TMPH
     3187  echo "#define llrint llrint  // make sure not to define twice" >> $TMPH
     3188  echo "static inline long long int llrint (double x)" >> $TMPH
     3189  echo "{" >> $TMPH
     3190  echo "    long long int llrintres;" >> $TMPH
     3191  echo "    asm" >> $TMPH
     3192  echo "    (\"fistpll %0\"" >> $TMPH
     3193  echo "    : \"=m\" (llrintres) : \"t\" (x) : \"st\");" >> $TMPH
     3194  echo "    return llrintres;" >> $TMPH
     3195  echo "}" >> $TMPH
     3196  echo "#endif" >> $TMPH
     3197fi
     3198
    31843199if test "$mingw32" = "yes" ; then
    31853200  echo "#define CONFIG_MINGW 1" >> $TMPH
    31863201  echo "CONFIG_MINGW=yes" >> $MYTH_CONFIG_MAK
  • libs/libavcodec/libavcodec.pro

     
    1717    QMAKE_CFLAGS_SHLIB =
    1818}
    1919
     20cygwin {
     21    LIBS += -lz
     22}
     23
    2024QMAKE_CFLAGS_DEBUG += -O
    2125
    2226QMAKE_CLEAN += $(TARGET) $(TARGETA) $(TARGETD) $(TARGET0) $(TARGET1) $(TARGET2)
  • libs/libavformat/libavformat.pro

     
    1313
    1414LIBS += $$LOCAL_LIBDIR_X11
    1515
     16cygwin {
     17    LIBS += -lz
     18}
     19
    1620QMAKE_CLEAN += $(TARGET) $(TARGETA) $(TARGETD) $(TARGET0) $(TARGET1) $(TARGET2)
    1721
    1822# Input
  • libs/libmyth/libmyth.pro

     
    6161inc.files += mythevent.h mythobservable.h mythsocket.h
    6262inc.files += mythexp.h mythpluginapi.h
    6363
     64cygwin {
     65    QMAKE_LFLAGS_SHLIB += -Wl,--noinhibit-exec
     66}
     67
    6468using_oss {
    6569    DEFINES += USING_OSS
    6670    SOURCES += audiooutputoss.cpp
    6771    HEADERS += audiooutputoss.h
    6872}
    6973
    70 unix {
     74unix:!cygwin {
    7175    SOURCES += mythhdd.cpp mythcdrom.cpp mythmediamonitor.cpp
    7276    HEADERS += mythhdd.h mythcdrom.h   mythmediamonitor.h
    7377    inc.files += mythhdd.h mythcdrom.h mythmediamonitor.h
  • libs/libmyth/mythmediamonitor.h

     
    11#ifndef MYTH_MEDIA_MONITOR_H
    22#define MYTH_MEDIA_MONITOR_H
    33
     4#ifndef CONFIG_CYGWIN
    45#include <fstab.h>
     6#endif
    57
    68#include <qvaluelist.h>
    79#include <qguardedptr.h>
  • libs/libmyth/util.cpp

     
    1818#include <sys/sysinfo.h>
    1919#else
    2020#include <sys/param.h>
     21#ifdef CONFIG_CYGWIN
     22#include <sys/statfs.h>
     23#else
    2124#include <sys/sysctl.h>
     25#endif
    2226#include <sys/mount.h>
    2327#endif
    2428
  • libs/libmythsoundtouch/STTypes.h

     
    109109        #endif // FLOAT_SAMPLES
    110110
    111111        #ifdef ALLOW_OPTIMIZATIONS
    112             #if _WIN32 || __MMX__ || MMX
     112            #if CONFIG_CYGWIN || __MMX__ || MMX
    113113                // Allow MMX optimizations
    114114                #define ALLOW_MMX   1
    115115            #endif
  • libs/libmythtv/libmythtv.pro

     
    4040isEmpty(QMAKE_EXTENSION_LIB) {
    4141  QMAKE_EXTENSION_LIB=a
    4242}
    43 TARGETDEPS += ../libmyth/libmyth-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}
    44 TARGETDEPS += ../libavutil/libmythavutil-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}
    45 TARGETDEPS += ../libavcodec/libmythavcodec-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}
    46 TARGETDEPS += ../libavformat/libmythavformat-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}
     43
     44TARGETDEPS += ../libmyth/libmyth-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}$${QMAKE_EXTENSION_CYGWIN}
     45TARGETDEPS += ../libavutil/libmythavutil-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}$${QMAKE_EXTENSION_CYGWIN}
     46TARGETDEPS += ../libavcodec/libmythavcodec-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}$${QMAKE_EXTENSION_CYGWIN}
     47TARGETDEPS += ../libavformat/libmythavformat-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}$${QMAKE_EXTENSION_CYGWIN}
    4748TARGETDEPS += ../libmythmpeg2/libmythmpeg2-$${LIBVERSION}.$${QMAKE_EXTENSION_LIB}
    4849TARGETDEPS += ../libmythdvdnav/libmythdvdnav-$${LIBVERSION}.$${QMAKE_EXTENSION_LIB}
    4950
     
    8990    QMAKE_LFLAGS_SHLIB += -seg1addr 0xC9000000
    9091}
    9192
     93cygwin {
     94    QMAKE_LFLAGS_SHLIB += -Wl,--noinhibit-exec
     95}
     96
    9297# Enable Linux Open Sound System support
    9398using_oss:DEFINES += USING_OSS
    9499# Enable Valgrind, i.e. disable some timeouts
  • libs/libmythtv/NuppelVideoPlayer.cpp

     
    7171#include "videoout_dx.h"
    7272#undef GetFreeSpace
    7373#undef GetFileSize
     74#ifdef CONFIG_CYGWIN
     75#undef DialogBox
    7476#endif
     77#endif
    7578
    7679#ifndef HAVE_ROUND
    7780#define round(x) ((int) ((x) + 0.5))
     
    54975500    if (ringBuffer->isDVD())
    54985501    {
    54995502        if (!ringBuffer->DVD()->IsInMenu())
    5500             secsplayed = ringBuffer->DVD()->GetCurrentTime();
     5503#ifndef CONFIG_CYGWIN
     5504            secplayed = ringBuffer->DVD()->GetCurrentTime();
     5505#else
     5506            // DVD playing non-functional under windows for now
     5507            secsplayed = 0;
     5508#endif
    55015509    }
    55025510    else
    55035511        secsplayed = ((float)framesPlayed / video_frame_rate);
  • libs/libmythtv/vbitext/vbi.c

     
    566566
    567567    memset(&v4l2_format, 0, sizeof(v4l2_format));
    568568    v4l2_format->type = V4L2_BUF_TYPE_VBI_CAPTURE;
     569#ifndef CONFIG_CYGWIN
    569570    if (ioctl(vbi->fd, VIDIOC_G_FMT, v4l2_format) == -1)
     571#else
     572    if (0)
     573#endif
    570574    {
    571575       // not a v4l2 device.  assume bttv and create a standard fmt-struct.
    572576       int size;
     
    576580       vbifmt->sampling_rate = 35468950;
    577581       vbifmt->samples_per_line = 2048;
    578582       vbifmt->offset = 244;
     583#ifndef CONFIG_CYGWIN
    579584       if ((size = ioctl(vbi->fd, BTTV_VBISIZE, 0)) == -1)
     585#else
     586       if (0)
     587#endif
    580588       {
     589
    581590           // BSD or older bttv driver.
    582591           vbifmt->count[0] = 16;
    583592           vbifmt->count[1] = 16;
  • libs/libmythtv/videoout_dx.cpp

     
    33#include <algorithm>
    44using namespace std;
    55
     6#define _WIN32_WINNT    0x500
    67#include "mythcontext.h"
    78#include "videoout_dx.h"
    89#include "filtermanager.h"
    910
    1011#include "mmsystem.h"
     12#ifdef CONFIG_CYGWIN
     13#include "tv.h"
     14#endif
    1115
    1216extern "C" {
    1317#include "../libavcodec/avcodec.h"
     
    3943
    4044    XJ_started = 0;
    4145
     46    XJ_width = 0;
     47    XJ_height = 0;
     48
    4249    pauseFrame.buf = NULL;
    4350   
    4451    ddobject = NULL;
     
    101108{
    102109    VideoOutput::InputChanged(width, height, aspect, av_codec_id);
    103110
     111    XJ_width = width;
     112    XJ_height = height;
     113
    104114    vbuffers.DeleteBuffers();
    105115   
    106116    DirectXCloseSurface();
     
    155165
    156166    wnd = winid;
    157167
     168    XJ_width = width;
     169    XJ_height = height;
     170
    158171    vbuffers.CreateBuffers(XJ_width, XJ_height);
    159172    MoveResize();
    160173
     
    182195    InitPictureAttributes();
    183196
    184197    MoveResize();
    185    
     198
     199#ifndef CONFIG_CYGWIN   
    186200    if (!CreateVideoBuffers())
    187201        return false;
    188    
     202#endif
     203
    189204    pauseFrame.height = vbuffers.GetScratchFrame()->height;
    190205    pauseFrame.width  = vbuffers.GetScratchFrame()->width;
    191206    pauseFrame.bpp    = vbuffers.GetScratchFrame()->bpp;
     
    335350        RECT rect_src;
    336351        RECT rect_dest;
    337352       
    338         rect_src.left = imgx;
     353        rect_src.left = video_rect.left();
    339354        rect_src.right = XJ_width;
    340         rect_src.top = imgy;
     355        rect_src.top = video_rect.top();
    341356        rect_src.bottom = XJ_height;
    342357
    343         if (dispxoff < dispx || dispxoff + dispwoff > dispx + dispw)
     358        if (display_video_rect.left() < display_visible_rect.left() || display_video_rect.left() + display_video_rect.width() > display_visible_rect.left() + display_visible_rect.width())
    344359        {
    345             rect_dest.left = dispx;
    346             rect_dest.right = dispx + dispw;
     360            rect_dest.left = display_visible_rect.left();
     361            rect_dest.right = display_visible_rect.left() + display_visible_rect.width();
    347362
    348             rect_src.left += XJ_width * (dispx - dispxoff) / dispwoff;
    349             rect_src.right -= XJ_width * (dispwoff + dispxoff - (dispw + dispx)) / dispwoff;
     363            rect_src.left += XJ_width * (display_visible_rect.left() - display_video_rect.left()) / display_video_rect.width();
     364            rect_src.right -= XJ_width * (display_video_rect.width() + display_video_rect.left() - (display_visible_rect.width() + display_visible_rect.left())) / display_video_rect.width();
    350365        } else {
    351             rect_dest.left = dispxoff;
    352             rect_dest.right = dispxoff + dispwoff;
     366            rect_dest.left = display_video_rect.left();
     367            rect_dest.right = display_video_rect.left() + display_video_rect.width();
    353368        }
    354369
    355         if (dispyoff < dispy || dispyoff + disphoff > dispy + disph)
     370        if (display_video_rect.top() < display_visible_rect.top() || display_video_rect.top() + display_video_rect.height() > display_visible_rect.top() + display_visible_rect.height())
    356371        {
    357             rect_dest.top = dispy;
    358             rect_dest.bottom = dispy + disph;
     372            rect_dest.top = display_visible_rect.top();
     373            rect_dest.bottom = display_visible_rect.top() + display_visible_rect.height();
    359374
    360             rect_src.top += XJ_height * (dispy - dispyoff) / disphoff;
    361             rect_src.bottom -= XJ_height * (disphoff + dispyoff - (disph + dispy)) / disphoff;
     375            rect_src.top += XJ_height * (display_visible_rect.top() - display_video_rect.top()) / display_video_rect.height();
     376            rect_src.bottom -= XJ_height * (display_video_rect.height() + display_video_rect.top() - (display_visible_rect.height() + display_visible_rect.top())) / display_video_rect.height();
    362377        } else {
    363             rect_dest.top = dispyoff;
    364             rect_dest.bottom = dispyoff + disphoff;
     378            rect_dest.top = display_video_rect.top();
     379            rect_dest.bottom = display_video_rect.top() + display_video_rect.height();
    365380        }
    366381
    367382
     
    13121327    /* The new window dimensions should already have been computed by the
    13131328     * caller of this function */
    13141329
    1315     rect_src.left = imgx;
    1316     rect_src.right = imgx + imgw;
    1317     rect_src.top = imgy;
    1318     rect_src.bottom = imgy + imgh;
     1330    rect_src.left = video_rect.left();
     1331    rect_src.right = video_rect.left() + video_rect.width();
     1332    rect_src.top = video_rect.top();
     1333    rect_src.bottom = video_rect.top() + video_rect.height();
    13191334
    1320     if (dispxoff < dispx || dispxoff + dispwoff > dispx + dispw)
     1335    if (display_video_rect.left() < display_visible_rect.left() || display_video_rect.left() + display_video_rect.width() > display_visible_rect.left() + display_visible_rect.width())
    13211336    {
    1322         rect_dest.left = dispx;
    1323         rect_dest.right = dispx + dispw;
     1337        rect_dest.left = display_visible_rect.left();
     1338        rect_dest.right = display_visible_rect.left() + display_visible_rect.width();
    13241339       
    1325         rect_src.left += XJ_width * (dispx - dispxoff) / dispwoff;
    1326         rect_src.right -= XJ_width * (dispwoff + dispxoff - (dispw + dispx)) / dispwoff;
     1340        rect_src.left += XJ_width * (display_visible_rect.left() - display_video_rect.left()) / display_video_rect.width();
     1341        rect_src.right -= XJ_width * (display_video_rect.width() + display_video_rect.left() - (display_visible_rect.width() + display_visible_rect.left())) / display_video_rect.width();
    13271342    } else {
    1328         rect_dest.left = dispxoff;
    1329         rect_dest.right = dispxoff + dispwoff;
     1343        rect_dest.left = display_video_rect.left();
     1344        rect_dest.right = display_video_rect.left() + display_video_rect.width();
    13301345    }
    13311346   
    1332     if (dispyoff < dispy || dispyoff + disphoff > dispy + disph)
     1347    if (display_video_rect.top() < display_visible_rect.top() || display_video_rect.top() + display_video_rect.height() > display_visible_rect.top() + display_visible_rect.height())
    13331348    {
    1334         rect_dest.top = dispy;
    1335         rect_dest.bottom = dispy + disph;
     1349        rect_dest.top = display_visible_rect.top();
     1350        rect_dest.bottom = display_visible_rect.top() + display_visible_rect.height();
    13361351       
    1337         rect_src.top += imgw * (dispy - dispyoff) / disphoff;
    1338         rect_src.bottom -= imgh * (disphoff + dispyoff - (disph + dispy)) / disphoff;
     1352        rect_src.top += video_rect.width() * (display_visible_rect.top() - display_video_rect.top()) / display_video_rect.height();
     1353        rect_src.bottom -= video_rect.height() * (display_video_rect.height() + display_video_rect.top() - (display_visible_rect.height() + display_visible_rect.top()))
     1354/ display_video_rect.height();
    13391355    } else {
    1340         rect_dest.top = dispyoff;
    1341         rect_dest.bottom = dispyoff + disphoff;
     1356        rect_dest.top = display_video_rect.top();
     1357        rect_dest.bottom = display_video_rect.top() + display_video_rect.height();
    13421358    }
    13431359
    13441360    VERBOSE(VB_IMPORTANT, "rect_src ("
  • libs/libmythtv/videoout_dx.h

     
    99#include <ddraw.h>   // HACK HACK HACK
    1010
    1111// MythTV headers
     12#ifdef CONFIG_CYGWIN
     13#undef max
     14#endif
    1215#include "videooutbase.h"
    1316
    1417class VideoOutputDX : public VideoOutput
     
    4043
    4144    void MoveResize(void);
    4245    int  SetPictureAttribute(int attribute, int newValue);
    43  
    44     float GetDisplayAspect(void) const { return ((float) dispw)/disph; }
    45    
     46
     47    float GetDisplayAspect(void) const { return ((float) display_visible_rect.width())/display_visible_rect.height(); }
     48
    4649    void WaitForVSync(void);
    4750
    4851  private:
     
    7477
    7578    DWORD chroma;
    7679
     80    int XJ_width, XJ_height;
     81
    7782    int colorkey;
    7883    int rgb_colorkey;
    7984
  • libs/libmythtv/vsync.cpp

     
    252252{
    253253    int ret = -1;
    254254
    255 #ifndef _WIN32
     255#ifndef CONFIG_CYGWIN
    256256    do {
    257257       ret = ioctl(fd, DRM_IOCTL_WAIT_VBLANK, vbl);
    258258       vbl->request.type &= ~DRM_VBLANK_RELATIVE;
  • libs/libmythui/mythmainwindow.cpp

     
    4646/* from libmyth */
    4747#include "screensaver.h"
    4848#include "mythdialogs.h"
     49#ifndef CONFIG_CYGWIN
    4950#include "mythmediamonitor.h"
     51#endif
    5052
    5153#define GESTURE_TIMEOUT 1000
    5254
     
    991993                                          int            mediaType,
    992994                                          const QString &extensions)
    993995{
     996#ifndef CONFIG_CYGWIN
    994997    if (d->mediaHandlerMap.count(destination) == 0)
    995998    {
    996999        MHData mhd = { callback, mediaType, destination, description };
     
    9991002                .arg(destination).arg(QString("ext(%1)").arg(extensions)));
    10001003
    10011004        d->mediaHandlerMap[destination] = mhd;
    1002 
     1005       
    10031006        MediaMonitor *mon = MediaMonitor::GetMediaMonitor();
    10041007        if (mon && !extensions.isEmpty())
    10051008            mon->MonitorRegisterExtensions(mediaType, extensions);
     
    10091012       VERBOSE(VB_GENERAL, QString("%1 is already registered as a media "
    10101013                                   "handler.").arg(destination));
    10111014    }
     1015#endif
    10121016}
    10131017
    10141018void MythMainWindow::RegisterMediaPlugin(const QString &name,
     
    12141218        else
    12151219            QApplication::sendEvent(key_target, &key);
    12161220    }
     1221#ifndef CONFIG_CYGWIN
    12171222    else if (ce->type() == kMediaEventType)
    12181223    {
    12191224        MediaEvent *media_event = (MediaEvent*)ce;
     
    12601265                mon->Unlock(pDev);
    12611266        }
    12621267    }
     1268#endif
    12631269#if defined(USE_LIRC) || defined(USING_APPLEREMOTE)
    12641270    else if (ce->type() == kLircKeycodeEventType && !d->ignore_lirc_keys)
    12651271    {
  • libs/libmythui/myththemedmenu.cpp

     
    18681868            }
    18691869            lastbutton = NULL;
    18701870        }
     1871#ifndef CONFIG_CYGWIN
    18711872        else if (action == "EJECT")
    18721873        {
    18731874            MediaMonitor *mon = MediaMonitor::GetMediaMonitor();
    18741875            if (mon)
    18751876                mon->ChooseAndEjectMedia();
    18761877        }
     1878#endif
    18771879        else
    18781880            handled = false;
    18791881    }
     
    20762078            wantpop = true;
    20772079        }
    20782080    }
     2081#ifndef CONFIG_CYGWIN
    20792082    else if (action.left(5) == "EJECT")
    20802083    {
    20812084        MediaMonitor *mon = MediaMonitor::GetMediaMonitor();
    20822085        if (mon)
    20832086            mon->ChooseAndEjectMedia();
    20842087    }
     2088#endif
    20852089    else if (action.left(5) == "JUMP ")
    20862090    {
    20872091        QString rest = action.right(action.length() - 5);
  • libs/libmythupnp/httprequest.cpp

     
    1818#include <qfileinfo.h>
    1919
    2020#include "mythconfig.h"
    21 #ifdef CONFIG_DARWIN
     21#if defined CONFIG_DARWIN || defined CONFIG_CYGWIN
    2222#include "darwin-sendfile.h"
    2323#else
    2424#include <sys/sendfile.h>
  • libs/libmythupnp/libmythupnp.pro

     
    4242  QMAKE_EXTENSION_LIB=a
    4343}
    4444
    45 TARGETDEPS += ../libmyth/libmyth-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}
    46 TARGETDEPS += ../libmythtv/libmythtv-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}
    47 TARGETDEPS += ../libavcodec/libmythavcodec-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}
    48 TARGETDEPS += ../libavformat/libmythavformat-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}
     45TARGETDEPS += ../libmyth/libmyth-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}$${QMAKE_EXTENSION_CYGWIN}
     46TARGETDEPS += ../libmythtv/libmythtv-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}$${QMAKE_EXTENSION_CYGWIN}
     47TARGETDEPS += ../libavcodec/libmythavcodec-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}$${QMAKE_EXTENSION_CYGWIN}
     48TARGETDEPS += ../libavformat/libmythavformat-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}$${QMAKE_EXTENSION_CYGWIN}
    4949
    5050inc.path = $${PREFIX}/include/mythtv/upnp/
    5151
     
    5555
    5656INSTALLS += inc
    5757
     58cygwin {
     59  HEADERS += darwin-sendfile.h
     60  SOURCES += darwin-sendfile.c
     61}
     62
    5863macx {
    5964    HEADERS += darwin-sendfile.h
    6065    SOURCES += darwin-sendfile.c
  • programs/mythfrontend/main.cpp

     
    11231123
    11241124    qApp->unlock();
    11251125
    1126 #ifndef _WIN32
     1126#ifndef CONFIG_CYGWIN
    11271127    MediaMonitor *mon = MediaMonitor::GetMediaMonitor();
    11281128    if (mon)
    11291129    {
     
    11691169
    11701170    pmanager->DestroyAllPlugins();
    11711171
    1172 #ifndef _WIN32
     1172#ifndef CONFIG_CYGWIN
    11731173    if (mon)
    11741174    {
    11751175        mon->StopMonitoring();
  • programs/mythfrontend/statusbox.cpp

     
    12911291    // weighted average loads
    12921292    contentLines[count].append(".   " + QObject::tr("Load") + ": ");
    12931293
     1294#ifndef CONFIG_CYGWIN
    12941295    double loads[3];
    12951296    if (getloadavg(loads,3) == -1)
     1297#endif
    12961298        contentLines[count].append(QObject::tr("unknown") +
    12971299                                   " - getloadavg() " + QObject::tr("failed"));
     1300#ifndef CONFIG_CYGWIN
    12981301    else
    12991302    {
    13001303        char buff[30];
     
    13021305        sprintf(buff, "%0.2lf, %0.2lf, %0.2lf", loads[0], loads[1], loads[2]);
    13031306        contentLines[count].append(QString(buff));
    13041307    }
     1308
     1309#endif
    13051310    detailString += contentLines[count] + "\n";
    13061311    count++;
    13071312
  • programs/programs-libs.pro

     
    2323isEmpty(QMAKE_EXTENSION_LIB) {
    2424  QMAKE_EXTENSION_LIB=a
    2525}
    26 TARGETDEPS += ../../libs/libmythui/libmythui-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}
    27 TARGETDEPS += ../../libs/libmyth/libmyth-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}
    28 TARGETDEPS += ../../libs/libmythtv/libmythtv-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}
    29 TARGETDEPS += ../../libs/libavutil/libmythavutil-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}
    30 TARGETDEPS += ../../libs/libavcodec/libmythavcodec-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}
    31 TARGETDEPS += ../../libs/libavformat/libmythavformat-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}
    32 TARGETDEPS += ../../libs/libmythupnp/libmythupnp-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}
    33 TARGETDEPS += ../../libs/libmythlivemedia/libmythlivemedia-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}
     26TARGETDEPS += ../../libs/libmythui/libmythui-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}$${QMAKE_EXTENSION_CYGWIN}
     27TARGETDEPS += ../../libs/libmyth/libmyth-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}$${QMAKE_EXTENSION_CYGWIN}
     28TARGETDEPS += ../../libs/libmythtv/libmythtv-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}$${QMAKE_EXTENSION_CYGWIN}
     29TARGETDEPS += ../../libs/libavutil/libmythavutil-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}$${QMAKE_EXTENSION_CYGWIN}
     30TARGETDEPS += ../../libs/libavcodec/libmythavcodec-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}$${QMAKE_EXTENSION_CYGWIN}
     31TARGETDEPS += ../../libs/libavformat/libmythavformat-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}$${QMAKE_EXTENSION_CYGWIN}
     32TARGETDEPS += ../../libs/libmythupnp/libmythupnp-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}$${QMAKE_EXTENSION_CYGWIN}
     33TARGETDEPS += ../../libs/libmythlivemedia/libmythlivemedia-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}$${QMAKE_EXTENSION_CYGWIN}
    3434
    3535DEPENDPATH += ../.. ../../libs ../../libs/libmyth ../../libs/libmythtv
    3636DEPENDPATH += ../../libs/libavutil ../../libs/libavformat ../../libs/libsavcodec
  • settings.pro

     
    77LIBVERSION = 0.20
    88VERSION = 0.20.0
    99
     10# if CYGWIN compile, set up flag in CONFIG
     11contains(TARGET_OS, CYGWIN) {
     12    CONFIG += cygwin
     13    QMAKE_EXTENSION_SHLIB=dll
     14    QMAKE_EXTENSION_CYGWIN = .a
     15    DEFINES += CONFIG_CYGWIN
     16}
     17
    1018# Die on the (common) case where OS X users inadvertently use Fink's
    1119# Qt/X11 install instead of Qt/Mac. '
    1220contains(CONFIG_DARWIN, yes) {