diff --git a/general.pri b/general.pri index 9f790b4..81b63cd 100644 --- a/general.pri +++ b/general.pri @@ -13,21 +13,14 @@ unix { } # prefix targetprefix = $$(TARGET_PREFIX) -equals(targetprefix, "") { - win32 { - targetprefix = ../../.. - } else { - targetprefix = ../.. - } -} message("Using target prefix \"$${targetprefix}\".") # print install root message("Using install root \"$$(INSTALL_ROOT)\".") # target CONFIG(debug, debug|release) { - TARGET = $$targetprefix/$${projectname}d + TARGET = $${targetprefix}$${projectname}d } else { - TARGET = $$targetprefix/$$projectname + TARGET = $${targetprefix}$${projectname} } # variables to check target architecture win32-g++:QMAKE_TARGET.arch = $$QMAKE_HOST.arch @@ -79,3 +72,14 @@ guiqtwidgets { DEFINES += GUI_QTWIDGETS DEFINES += MODEL_UNDO_SUPPORT } +# configuration for cross compliation with mingw-w64 +mingw-w64-manualstrip-dll { + QMAKE_POST_LINK=$${CROSS_COMPILE}strip --strip-unneeded ./release/$(TARGET); \ + $${CROSS_COMPILE}strip --strip-unneeded ./release/lib$(TARGET).a +} +mingw-w64-manualstrip-exe { + QMAKE_POST_LINK=$${CROSS_COMPILE}strip --strip-unneeded ./release/$(TARGET) +} +mingw-w64-noversion { + VERSION = "" +} diff --git a/tagparser.pro b/tagparser.pro index 3467c15..813a04e 100644 --- a/tagparser.pro +++ b/tagparser.pro @@ -70,7 +70,9 @@ SOURCES += \ mediaformat.cpp \ avc/avcconfiguration.cpp \ mp4/mpeg4descriptor.cpp \ - avi/bitmapinfoheader.cpp + avi/bitmapinfoheader.cpp \ + adts/adtsframe.cpp \ + adts/adtsstream.cpp HEADERS += \ abstractcontainer.h \ @@ -137,7 +139,9 @@ HEADERS += \ avc/avcconfiguration.h \ generictagfield.h \ mp4/mpeg4descriptor.h \ - avi/bitmapinfoheader.h + avi/bitmapinfoheader.h \ + adts/adtsframe.h \ + adts/adtsstream.h LIBS += -lz @@ -158,9 +162,18 @@ OTHER_FILES += \ INCLUDEPATH += ../ # installs -target.path = $$(INSTALL_ROOT)/lib -INSTALLS += target -for(dir, $$list(./ avc id3 matroska mp4 mpegaudio ogg vorbis wav avi)) { +mingw-w64-install { + target.path = $$(INSTALL_ROOT) + target.extra = install -m755 -D $${OUT_PWD}/release/lib$(TARGET).a $$(INSTALL_ROOT)/lib/lib$(TARGET).a + INSTALLS += target + dlltarget.path = $$(INSTALL_ROOT) + dlltarget.extra = install -m755 -D $${OUT_PWD}/release/$(TARGET) $$(INSTALL_ROOT)/bin/$(TARGET) + INSTALLS += dlltarget +} else { + target.path = $$(INSTALL_ROOT)/lib + INSTALLS += target +} +for(dir, $$list(./ avc adts id3 matroska mp4 mpegaudio ogg vorbis wav avi)) { eval(inc_$${dir} = $${dir}) inc_$${dir}.path = $$(INSTALL_ROOT)/include/$$projectname/$${dir} inc_$${dir}.files = $${dir}/*.h