Ticket #5490: libs.patch

File libs.patch, 2.3 KB (added by andrei@…, 16 years ago)

  • libs-dephack.pro

     
    44
    55#macx:QMAKE_LFLAGS_SHLIB += -undefined warning
    66
    7 mingw {
    8     # Worked around by building libmyth first,
    9     # with dlltool faking the symbols from the other two libs
    10     LIBS += -L../libmyth -lmyth-$$LIBVERSION
    11 }
    12 
    137#unix {
    148    # Search for --as-needed in the link paths, and remove it
    159#}

  • libmyth/libmyth.pro

     
    103103}
    104104
    105105mingw {
    106     include ( ../libs-windows.pro )
    107 
    108106    SOURCES += mediamonitor-windows.cpp audiooutputwin.cpp
    109107    HEADERS += mediamonitor-windows.h   audiooutputwin.h
    110108
    111109    LIBS += -lpthread -lwinmm -lws2_32
    112 
    113     LIBS -= -lmythui-$$LIBVERSION  -lmythupnp-$$LIBVERSION
    114     LIBS += -L. -lmythui-bootstrap -lmythupnp-bootstrap
    115     POST_TARGETDEPS += libmythui-bootstrap.a libmythupnp-bootstrap.a
    116     implib.target    = libmythui-bootstrap.a
    117     implib.depends   = ../libmythui/libmythui.def
    118     implib.commands  = dlltool --input-def $$implib.depends   \
    119                        --dllname libmythui-$${LIBVERSION}.dll \
    120                        --output-lib $$implib.target  -k
    121     implib2.target   = libmythupnp-bootstrap.a
    122     implib2.depends  = ../libmythupnp/libmythupnp.def
    123     implib2.commands = dlltool --input-def $$implib2.depends    \
    124                        --dllname libmythupnp-$${LIBVERSION}.dll \
    125                        --output-lib $$implib2.target  -k
    126     QMAKE_EXTRA_WIN_TARGETS += implib implib2
    127110}
    128111
    129112macx {

  • libmythdb/mythdbcon.cpp

     
    88#include "mythdbcon.h"
    99#include "mythdb.h"
    1010#include "mythverbose.h"
     11#include "compat.h"
    1112
    1213QMutex MSqlQuery::prepareLock(false);
    1314

  • libmythdb/libmythdb.pro

     
    4646
    4747include ( ../libs-targetfix.pro )
    4848
     49mingw:LIBS += -lpthread -lws2_32