Ticket #4264: combine-libs.patch

File combine-libs.patch, 11.0 KB (added by anonymous, 16 years ago)

Inelegant, but simpler than changing the source - combine the 3 libs

  • libs/libmythtv/libmythtv.pro

     
    2828DEPENDPATH  += ../libmythlivemedia/UsageEnvironment
    2929
    3030LIBS += -L../libmyth -L../libavutil -L../libavcodec -L../libavformat
    31 LIBS += -L../libmythui -L../libmythupnp
     31!combine-libmyth: LIBS += -L../libmythui -L../libmythupnp
    3232LIBS += -L../libmythmpeg2 -L../libmythdvdnav
    3333LIBS += -L../libmythfreemheg -L../libmythlivemedia
    3434LIBS += -lmyth-$$LIBVERSION         -lmythavutil-$$LIBVERSION
    3535LIBS += -lmythavcodec-$$LIBVERSION  -lmythavformat-$$LIBVERSION
    36 LIBS += -lmythui-$$LIBVERSION       -lmythupnp-$$LIBVERSION
     36!combine-libmyth: LIBS += -lmythui-$$LIBVERSION       -lmythupnp-$$LIBVERSION
    3737LIBS += -lmythmpeg2-$$LIBVERSION    -lmythdvdnav-$$LIBVERSION
    3838LIBS += -lmythfreemheg-$$LIBVERSION -lmythlivemedia-$$LIBVERSION
    3939LIBS += -lz $$EXTRA_LIBS

  • libs/libs.pro

     
    88SUBDIRS += libmythsoundtouch libmythmpeg2 libmythdvdnav
    99SUBDIRS += libmythfreesurround
    1010
    11 mingw : SUBDIRS += libmyth libmythupnp libmythui
    12 !mingw: SUBDIRS += libmythupnp libmythui libmyth
     11combine-libmyth        : SUBDIRS += libmyth
     12!combine-libmyth:mingw : SUBDIRS += libmyth libmythupnp libmythui
     13!combine-libmyth:!mingw: SUBDIRS += libmythupnp libmythui libmyth
    1314
    1415SUBDIRS += libmythfreemheg libmythlivemedia
    1516

  • libs/libmyth/libmyth.pro

     
    11include ( ../../config.mak )
    22include ( ../../settings.pro )
    3  
     3
    44TEMPLATE = lib
    55TARGET = myth-$$LIBVERSION
    6 CONFIG += thread dll
     6CONFIG += thread dll debug
    77target.path = $${LIBDIR}
    88INSTALLS = target
    99
    … …  
    5656
    5757LIBS += -L../libmythsamplerate   -lmythsamplerate-$${LIBVERSION}
    5858LIBS += -L../libmythsoundtouch   -lmythsoundtouch-$${LIBVERSION}
    59 LIBS += -L../libmythui           -lmythui-$${LIBVERSION}
    60 LIBS += -L../libmythupnp         -lmythupnp-$${LIBVERSION}
     59!combine-libmyth: LIBS += -L../libmythui           -lmythui-$${LIBVERSION}
     60!combine-libmyth: LIBS += -L../libmythupnp         -lmythupnp-$${LIBVERSION}
    6161LIBS += -L../libmythfreesurround -lmythfreesurround-$${LIBVERSION}
    6262LIBS += -L../libavcodec          -lmythavcodec-$${LIBVERSION}
    6363LIBS += -L../libavutil           -lmythavutil-$${LIBVERSION}
    … …  
    113113
    114114    # For easier debugging:
    115115    target.path = $${PREFIX}/bin
    116 
     116 
     117  !combine-libmyth {
    117118    LIBS -= -lmythui-$$LIBVERSION  -lmythupnp-$$LIBVERSION
    118119    LIBS += -L. -lmythui-bootstrap -lmythupnp-bootstrap
    119120    POST_TARGETDEPS += libmythui-bootstrap.a libmythupnp-bootstrap.a
    … …  
    128129                       --dllname libmythupnp-$${LIBVERSION}.dll \
    129130                       --output-lib $$implib2.target  -k
    130131    QMAKE_EXTRA_WIN_TARGETS += implib implib2
     132  }
    131133}
    132134
    133135macx {
    … …  
    248250
    249251#The following line was inserted by qt3to4
    250252QT += network xml opengl sql qt3support
     253
     254
     255combine-libmyth {
     256    # ../libmythupnp/libmythupnp.pro
     257
     258    include (../../version.pro)
     259
     260    setting.path = $${PREFIX}/share/mythtv/
     261    setting.files += CDS_scpd.xml CMGR_scpd.xml MSRR_scpd.xml MXML_scpd.xml
     262
     263    INSTALLS += setting
     264
     265    HEADERS3 += httprequest.h upnp.h ssdp.h taskqueue.h 
     266    HEADERS3 += upnpdevice.h upnptasknotify.h upnptasksearch.h threadpool.h upnputil.h
     267    HEADERS3 += httpserver.h upnpcds.h upnpcdsobjects.h bufferedsocketdevice.h upnpmsrr.h
     268    HEADERS3 += eventing.h upnpcmgr.h upnptaskevent.h upnptaskcache.h ssdpcache.h
     269    HEADERS3 += upnpimpl.h multicast.h broadcast.h configuration.h
     270    HEADERS3 += soapclient.h mythxmlclient.h
     271
     272    SOURCES3 += httprequest.cpp upnp.cpp ssdp.cpp taskqueue.cpp upnputil.cpp
     273    SOURCES3 += upnpdevice.cpp upnptasknotify.cpp upnptasksearch.cpp threadpool.cpp
     274    SOURCES3 += httpserver.cpp upnpcds.cpp upnpcdsobjects.cpp bufferedsocketdevice.cpp
     275    SOURCES3 += eventing.cpp upnpcmgr.cpp upnpmsrr.cpp upnptaskevent.cpp ssdpcache.cpp
     276    SOURCES3 += configuration.cpp soapclient.cpp mythxmlclient.cpp
     277
     278    LIBS += $$EXTRA_LIBS
     279
     280    mingw {
     281        TARGET = lib$${TARGET}
     282
     283        # For easier debugging:
     284        target.path = $${PREFIX}/bin
     285
     286        HEADERS3 += darwin-sendfile.h
     287        SOURCES3 += darwin-sendfile.c
     288
     289        LIBS += -lws2_32
     290    }
     291
     292    inc3.path = $${PREFIX}/include/mythtv/upnp/
     293
     294    inc3.files  = httprequest.h upnp.h ssdp.h taskqueue.h bufferedsocketdevice.h
     295    inc3.files += upnpdevice.h upnptasknotify.h upnptasksearch.h threadpool.h upnputil.h
     296    inc3.files += httpserver.h httpstatus.h upnpcds.h upnpcdsobjects.h
     297    inc3.files += eventing.h upnpcmgr.h upnptaskevent.h upnptaskcache.h ssdpcache.h
     298    inc3.files += upnpimpl.h multicast.h broadcast.h configuration.h
     299    inc3.files += soapclient.h mythxmlclient.h
     300
     301    INSTALLS += inc3
     302
     303    cygwin:HEADERS3 += darwin-sendfile.h
     304    cygwin:SOURCES3 += darwin-sendfile.c
     305
     306    freebsd:HEADERS3 += darwin-sendfile.h
     307    freebsd:SOURCES3 += darwin-sendfile.c
     308
     309    macx {
     310        HEADERS3 += darwin-sendfile.h
     311        SOURCES3 += darwin-sendfile.c
     312
     313        QMAKE_LFLAGS_SHLIB += -flat_namespace
     314    }
     315
     316
     317
     318
     319    # ../libmythui/libmythui.pro
     320
     321    HEADERS4  = mythmainwindow.h mythpainter.h mythimage.h myththemebase.h
     322    HEADERS4 += mythpainter_qt.h mythmainwindow_internal.h
     323    HEADERS4 += mythscreenstack.h mythscreentype.h mythuitype.h mythuiimage.h
     324    HEADERS4 += mythuitext.h mythuistatetype.h mythgesture.h xmlparsebase.h
     325    HEADERS4 += mythuibutton.h mythlistbutton.h myththemedmenu.h mythdialogbox.h
     326    HEADERS4 += mythuiclock.h mythuitextedit.h mythprogressdialog.h mythuispinbox.h
     327
     328    SOURCES4  = mythmainwindow.cpp mythpainter.cpp mythimage.cpp myththemebase.cpp
     329    SOURCES4 += mythpainter_qt.cpp xmlparsebase.cpp
     330    SOURCES4 += mythscreenstack.cpp mythscreentype.cpp mythgesture.cpp
     331    SOURCES4 += mythuitype.cpp mythuiimage.cpp mythuitext.cpp
     332    SOURCES4 += mythuistatetype.cpp mythlistbutton.cpp mythfontproperties.cpp
     333    SOURCES4 += mythuibutton.cpp myththemedmenu.cpp mythdialogbox.cpp
     334    SOURCES4 += mythuiclock.cpp mythuitextedit.cpp mythprogressdialog.cpp
     335    SOURCES4 += mythuispinbox.cpp
     336
     337    inc4.path = $${PREFIX}/include/mythtv/libmythui/
     338
     339    inc4.files  = mythmainwindow.h mythpainter.h mythimage.h myththemebase.h
     340    inc4.files += mythpainter_qt.h mythuistatetype.h
     341    inc4.files += mythscreenstack.h mythscreentype.h mythuitype.h mythuiimage.h
     342    inc4.files += mythuitext.h mythuibutton.h mythlistbutton.h xmlparsebase.h
     343    inc4.files += myththemedmenu.h mythdialogbox.h mythfontproperties.h
     344    inc4.files += mythuiclock.h mythgesture.h mythuitextedit.h mythprogressdialog.h
     345    inc4.files += mythuispinbox.h
     346
     347    INSTALLS += inc4
     348
     349    using_x11:using_opengl {
     350        DEFINES += USE_OPENGL_PAINTER
     351        SOURCES4 += mythpainter_ogl.cpp
     352        HEADERS4 += mythpainter_ogl.h
     353        inc4.files += mythpainter_ogl.h
     354        LIBS += $$EXTRA_LIBS
     355    }
     356
     357    macx {
     358        QMAKE_CXXFLAGS += -F/System/Library/Frameworks/Carbon.framework/Frameworks
     359        LIBS           += -framework Carbon -framework OpenGL
     360
     361        QMAKE_LFLAGS_SHLIB += -flat_namespace
     362    }
     363
     364    using_joystick_menu {
     365        DEFINES += USE_JOYSTICK_MENU
     366    }
     367
     368    using_lirc {
     369        DEFINES += USE_LIRC
     370    }
     371
     372    cygwin:DEFINES += _WIN32
     373
     374    mingw {
     375        TARGET = lib$${TARGET}
     376
     377        # For easier debugging:
     378        target.path = $${PREFIX}/bin
     379
     380        using_opengl {
     381            LIBS += -lopengl32
     382            DEFINES += USE_OPENGL_PAINTER
     383            SOURCES4 += mythpainter_ogl.cpp
     384            HEADERS4 += mythpainter_ogl.h
     385            inc4.files += mythpainter_ogl.h
     386        }
     387    }
     388
     389    HEADERS += $$join(HEADERS3, ' ', '../libmythupnp/')
     390    HEADERS += $$join(HEADERS4, ' ', '../libmythui/')
     391    SOURCES += $$join(SOURCES3, ' ', '../libmythupnp/')
     392    SOURCES += $$join(SOURCES4, ' ', '../libmythui/')
     393}

  • programs/programs-libs.pro

     
     1include ( ../settings.pro )
     2
    13INCLUDEPATH += ../.. ../../libs/ ../../libs/libmyth ../../libs/libmythtv
    24INCLUDEPATH += ../../libs/libavutil ../../libs/libavformat ../../libs/libavcodec
    35INCLUDEPATH += ../../libs/libmythupnp ../../libs/libmythui
    … …  
    68LIBS += -L../../libs/libmyth -L../../libs/libmythtv
    79LIBS += -L../../libs/libavutil -L../../libs/libavcodec -L../../libs/libavformat
    810LIBS += -L../../libs/libmythfreemheg
    9 LIBS += -L../../libs/libmythui
    10 LIBS += -L../../libs/libmythupnp
     11!combine-libmyth: LIBS += -L../../libs/libmythui
     12!combine-libmyth: LIBS += -L../../libs/libmythupnp
    1113LIBS += -L../../libs/libmythlivemedia
    1214
    1315LIBS += -lmythtv-$$LIBVERSION -lmythavformat-$$LIBVERSION
    1416LIBS += -lmythavutil-$$LIBVERSION -lmythavcodec-$$LIBVERSION
    1517LIBS += -lmythfreemheg-$$LIBVERSION
    16 LIBS += -lmythupnp-$$LIBVERSION
     18!combine-libmyth: LIBS += -lmythui-$$LIBVERSION
     19!combine-libmyth: LIBS += -lmythupnp-$$LIBVERSION
    1720LIBS += -lmythlivemedia-$$LIBVERSION
    18 LIBS += -lmyth-$$LIBVERSION -lmythui-$$LIBVERSION $$EXTRA_LIBS
     21LIBS += -lmyth-$$LIBVERSION $$EXTRA_LIBS
    1922mingw {
    2023    LIBS += -lpthread
    2124    CONFIG += console
    2225}
    2326
    24 TARGETDEPS += ../../libs/libmythui/libmythui-$${MYTH_SHLIB_EXT}
     27!combine-libmyth: TARGETDEPS += ../../libs/libmythui/libmythui-$${MYTH_SHLIB_EXT}
    2528TARGETDEPS += ../../libs/libmyth/libmyth-$${MYTH_SHLIB_EXT}
    2629TARGETDEPS += ../../libs/libmythtv/libmythtv-$${MYTH_SHLIB_EXT}
    2730TARGETDEPS += ../../libs/libavutil/libmythavutil-$${MYTH_SHLIB_EXT}
    2831TARGETDEPS += ../../libs/libavcodec/libmythavcodec-$${MYTH_SHLIB_EXT}
    2932TARGETDEPS += ../../libs/libavformat/libmythavformat-$${MYTH_SHLIB_EXT}
    30 TARGETDEPS += ../../libs/libmythupnp/libmythupnp-$${MYTH_SHLIB_EXT}
     33!combine-libmyth: TARGETDEPS += ../../libs/libmythupnp/libmythupnp-$${MYTH_SHLIB_EXT}
    3134using_live: TARGETDEPS += ../../libs/libmythlivemedia/libmythlivemedia-$${MYTH_SHLIB_EXT}
    3235
    3336DEPENDPATH += ../.. ../../libs ../../libs/libmyth ../../libs/libmythtv

  • settings.pro

     
    77LIBVERSION = 0.22
    88VERSION = 0.22.0
    99
     10CONFIG += combine-libmyth
     11
    1012isEmpty(TARGET_OS) : win32 {
    1113    CONFIG += mingw
    1214    DEFINES += USING_MINGW USING_WINAUDIO USING_D3D USING_DIRECTX

  • filters/kerneldeint/kerneldeint.pro

     
    44INCLUDEPATH += ../../libs
    55
    66LIBS += -lmyth-$${LIBVERSION} -L../../libs/libmyth
     7!combine-libmyth {
    78macx:LIBS += -lmythui-$${LIBVERSION} -L../../libs/libmythui
    89macx:LIBS += -lmythupnp-$${LIBVERSION} -L../../libs/libmythupnp
     10}
    911
    1012# Input
    1113SOURCES += filter_kerneldeint.c