From e718196fa57e12424d4cae888ae7aea1c15c3ae8 Mon Sep 17 00:00:00 2001 From: ray cutler Date: Wed, 26 Jun 2019 13:19:45 -0400 Subject: [PATCH] small updates fixed some bugs in Qt project files that were causing compilation to fail on windows :: this is probably the 2.9.10 version of the ISF editor --- .../Qt/ISFEditor/ISFEditor_app/ISFEditor_app.pro | 10 +++++----- .../com.vidvox.ISFEditor.mac/meta/package.xml | 4 ++-- .../com.vidvox.ISFFiles.mac/meta/package.xml | 4 ++-- .../com.vidvox.ISFEditor.win/meta/package.xml | 4 ++-- .../com.vidvox.ISFFiles.win/meta/package.xml | 6 +++--- .../Qt/TexDownloadBenchmark/TexDownloadBenchmark.pro | 12 ++++++++---- .../Qt/TexUploadBenchmark/TexUploadBenchmark.pro | 12 ++++++++---- 7 files changed, 30 insertions(+), 22 deletions(-) diff --git a/examples/Qt/ISFEditor/ISFEditor_app/ISFEditor_app.pro b/examples/Qt/ISFEditor/ISFEditor_app/ISFEditor_app.pro index 2634618..4c4bb07 100644 --- a/examples/Qt/ISFEditor/ISFEditor_app/ISFEditor_app.pro +++ b/examples/Qt/ISFEditor/ISFEditor_app/ISFEditor_app.pro @@ -22,7 +22,7 @@ DEFINES += QT_DEPRECATED_WARNINGS CONFIG += c++14 -VERSION = 2.9.9 +VERSION = 2.9.10 mac { ICON = ISFEditorAppIcon.icns } @@ -60,7 +60,6 @@ SOURCES += \ ../../common/GLBufferQVideoSurface.cpp \ ../../common/GLBufferQWidget.cpp \ ../../common/ISFGLBufferQWidget.cpp \ - ../../common/DisplayLinkDriver.mm \ DocWindow.cpp \ misc_classes/FileLoadEventFilter.cpp \ ISFController.cpp \ @@ -126,7 +125,6 @@ HEADERS += \ ../../common/GLBufferQVideoSurface.h \ ../../common/GLBufferQWidget.h \ ../../common/ISFGLBufferQWidget.h \ - ../../common/DisplayLinkDriver.h \ DocWindow.h \ misc_classes/FileLoadEventFilter.h \ ISFController.h \ @@ -196,10 +194,12 @@ HEADERS += \ mac { SOURCES += ../../common/SyphonVVBufferPoolAdditions.mm \ VideoSource/InterAppVideoSource_Mac.mm \ - VideoOutput/InterAppOutput_Mac.mm + VideoOutput/InterAppOutput_Mac.mm \ + ../../common/DisplayLinkDriver.mm HEADERS += ../../common/SyphonVVBufferPoolAdditions.h \ VideoSource/InterAppVideoSource_Mac.h \ - VideoOutput/InterAppOutput_Mac.h + VideoOutput/InterAppOutput_Mac.h \ + ../../common/DisplayLinkDriver.h } win32 { SOURCES += VideoSource/InterAppVideoSource_Win.cpp \ diff --git a/examples/Qt/ISFEditor/ISFEditor_installer_mac/packages/com.vidvox.ISFEditor.mac/meta/package.xml b/examples/Qt/ISFEditor/ISFEditor_installer_mac/packages/com.vidvox.ISFEditor.mac/meta/package.xml index 2e121e2..5206f42 100644 --- a/examples/Qt/ISFEditor/ISFEditor_installer_mac/packages/com.vidvox.ISFEditor.mac/meta/package.xml +++ b/examples/Qt/ISFEditor/ISFEditor_installer_mac/packages/com.vidvox.ISFEditor.mac/meta/package.xml @@ -2,8 +2,8 @@ The ISF Editor app Install the ISF Editor application. - 2.9.9 - 2019-05-22 + 2.9.10 + 2019-06-26 true 10 diff --git a/examples/Qt/ISFEditor/ISFEditor_installer_mac/packages/com.vidvox.ISFFiles.mac/meta/package.xml b/examples/Qt/ISFEditor/ISFEditor_installer_mac/packages/com.vidvox.ISFFiles.mac/meta/package.xml index d7ed184..33e4b40 100644 --- a/examples/Qt/ISFEditor/ISFEditor_installer_mac/packages/com.vidvox.ISFFiles.mac/meta/package.xml +++ b/examples/Qt/ISFEditor/ISFEditor_installer_mac/packages/com.vidvox.ISFFiles.mac/meta/package.xml @@ -2,8 +2,8 @@ ISF Sample Files Hundreds of sample ISF generators and filters. These will be installed in /Library/Graphics/ISF, where they can be accessed by all users and applications on this machine. - 1.0.1 - 2019-05-22 + 1.0.2 + 2019-06-26 true true diff --git a/examples/Qt/ISFEditor/ISFEditor_installer_win/packages/com.vidvox.ISFEditor.win/meta/package.xml b/examples/Qt/ISFEditor/ISFEditor_installer_win/packages/com.vidvox.ISFEditor.win/meta/package.xml index dc4c2de..b33a875 100644 --- a/examples/Qt/ISFEditor/ISFEditor_installer_win/packages/com.vidvox.ISFEditor.win/meta/package.xml +++ b/examples/Qt/ISFEditor/ISFEditor_installer_win/packages/com.vidvox.ISFEditor.win/meta/package.xml @@ -2,8 +2,8 @@ The ISF Editor app Install the ISF Editor application. - 2.9.9 - 2019-05-22 + 2.9.10 + 2019-06-26 true 10 diff --git a/examples/Qt/ISFEditor/ISFEditor_installer_win/packages/com.vidvox.ISFFiles.win/meta/package.xml b/examples/Qt/ISFEditor/ISFEditor_installer_win/packages/com.vidvox.ISFFiles.win/meta/package.xml index 820747e..bb303e4 100644 --- a/examples/Qt/ISFEditor/ISFEditor_installer_win/packages/com.vidvox.ISFFiles.win/meta/package.xml +++ b/examples/Qt/ISFEditor/ISFEditor_installer_win/packages/com.vidvox.ISFFiles.win/meta/package.xml @@ -1,9 +1,9 @@ ISF Sample Files - Hundreds of ISF generators and filters. These will be installed in the root "ProgramDirectory" on the target drive (usually C:\\ProgramData\\ISF). - 1.0.1 - 2019-05-22 + Hundreds of sample ISF generators and filters. These will be installed in the root "ProgramDirectory" on the target drive (usually C:\\ProgramData\\ISF). + 1.0.2 + 2019-06-26 true true diff --git a/examples/Qt/TexDownloadBenchmark/TexDownloadBenchmark.pro b/examples/Qt/TexDownloadBenchmark/TexDownloadBenchmark.pro index b219772..c9bcf3a 100644 --- a/examples/Qt/TexDownloadBenchmark/TexDownloadBenchmark.pro +++ b/examples/Qt/TexDownloadBenchmark/TexDownloadBenchmark.pro @@ -34,19 +34,23 @@ DEFINES += VVGL_SDK_QT SOURCES += \ main.cpp \ TexDownloadBenchmarkMainWindow.cpp \ - ../common/GLBufferQWidget.cpp \ - ../common/DisplayLinkDriver.mm + ../common/GLBufferQWidget.cpp HEADERS += \ TexDownloadBenchmarkMainWindow.h \ - ../common/GLBufferQWidget.h \ - ../common/DisplayLinkDriver.h + ../common/GLBufferQWidget.h FORMS += \ TexDownloadBenchmarkMainWindow.ui mac { + SOURCES += \ + ../common/DisplayLinkDriver.mm + + HEADERS += \ + ../common/DisplayLinkDriver.h + LIBS += -framework CoreVideo -framework AppKit } diff --git a/examples/Qt/TexUploadBenchmark/TexUploadBenchmark.pro b/examples/Qt/TexUploadBenchmark/TexUploadBenchmark.pro index 1a2f52c..7ca3108 100644 --- a/examples/Qt/TexUploadBenchmark/TexUploadBenchmark.pro +++ b/examples/Qt/TexUploadBenchmark/TexUploadBenchmark.pro @@ -34,19 +34,23 @@ DEFINES += VVGL_SDK_QT SOURCES += \ main.cpp \ TexUploadBenchmarkMainWindow.cpp \ - ../common/GLBufferQWidget.cpp \ - ../common/DisplayLinkDriver.mm + ../common/GLBufferQWidget.cpp HEADERS += \ TexUploadBenchmarkMainWindow.h \ - ../common/GLBufferQWidget.h \ - ../common/DisplayLinkDriver.h + ../common/GLBufferQWidget.h FORMS += \ TexUploadBenchmarkMainWindow.ui mac { + SOURCES += \ + ../common/DisplayLinkDriver.mm + + HEADERS += \ + ../common/DisplayLinkDriver.h + LIBS += -framework CoreVideo -framework AppKit }