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
mrRay · Jun 26, 2019 · e718196 · e718196
1 parent 6294466
commit e718196
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 22 deletions.
diff --git 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/...s/Qt/ISFEditor/ISFEditor_installer_mac/packages/com.vidvox.ISFEditor.mac/meta/package.xml b/...s/Qt/ISFEditor/ISFEditor_installer_mac/packages/com.vidvox.ISFEditor.mac/meta/package.xml
@@ -2,8 +2,8 @@
 <Package>
     <DisplayName>The ISF Editor app</DisplayName>
     <Description>Install the ISF Editor application.</Description>
-	<Version>2.9.9</Version>
-    <ReleaseDate>2019-05-22</ReleaseDate>
+	<Version>2.9.10</Version>
+	<ReleaseDate>2019-06-26</ReleaseDate>
     <Default>true</Default>
     <SortingPriority>10</SortingPriority>
 </Package>
diff --git a/...es/Qt/ISFEditor/ISFEditor_installer_mac/packages/com.vidvox.ISFFiles.mac/meta/package.xml b/...es/Qt/ISFEditor/ISFEditor_installer_mac/packages/com.vidvox.ISFFiles.mac/meta/package.xml
@@ -2,8 +2,8 @@
 <Package>
     <DisplayName>ISF Sample Files</DisplayName>
     <Description>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.</Description>
-    <Version>1.0.1</Version>
-    <ReleaseDate>2019-05-22</ReleaseDate>
+	<Version>1.0.2</Version>
+	<ReleaseDate>2019-06-26</ReleaseDate>
     <RequiresAdminRights>true</RequiresAdminRights>
     <Script>installscript.js</Script>
     <Default>true</Default>

diff --git a/...s/Qt/ISFEditor/ISFEditor_installer_win/packages/com.vidvox.ISFEditor.win/meta/package.xml b/...s/Qt/ISFEditor/ISFEditor_installer_win/packages/com.vidvox.ISFEditor.win/meta/package.xml
@@ -2,8 +2,8 @@
 <Package>
     <DisplayName>The ISF Editor app</DisplayName>
     <Description>Install the ISF Editor application.</Description>
-	<Version>2.9.9</Version>
-    <ReleaseDate>2019-05-22</ReleaseDate>
+	<Version>2.9.10</Version>
+	<ReleaseDate>2019-06-26</ReleaseDate>
     <Default>true</Default>
     <SortingPriority>10</SortingPriority>
 	<Script>installscript.js</Script>

diff --git a/...es/Qt/ISFEditor/ISFEditor_installer_win/packages/com.vidvox.ISFFiles.win/meta/package.xml b/...es/Qt/ISFEditor/ISFEditor_installer_win/packages/com.vidvox.ISFFiles.win/meta/package.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Package>
     <DisplayName>ISF Sample Files</DisplayName>
-	<Description>Hundreds of ISF generators and filters.  These will be installed in the root "ProgramDirectory" on the target drive (usually C:\\ProgramData\\ISF).</Description>
-    <Version>1.0.1</Version>
-    <ReleaseDate>2019-05-22</ReleaseDate>
+	<Description>Hundreds of sample ISF generators and filters.  These will be installed in the root "ProgramDirectory" on the target drive (usually C:\\ProgramData\\ISF).</Description>
+	<Version>1.0.2</Version>
+	<ReleaseDate>2019-06-26</ReleaseDate>
     <RequiresAdminRights>true</RequiresAdminRights>
     <Script>installscript.js</Script>
     <Default>true</Default>

diff --git 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
@@ -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
 }