Version 2.026

Update SpoutDX files.
Rebuild x86/x64 VS2022 /MT with updated SpoutDX.
Update Version.h copyright and year to 2023
Add binaries
Version 2.026

README.md

@@ -12,17 +12,17 @@ The Master branch contains a version of SpoutCam based on DirectX. The project r
 
 The OpenGL branch contains the original version of SpoutCam based on OpenGL. The OpenGL version may not be updated after 2.007 release.
 
-### Output folder
+### Binaries folder
 
-Binaries for both release and debug compile, are copied as either SpoutCam32.ax or SpoutCam64.ax to the "release" folder.
+Binaries for both release and debug compile, are copied as either SpoutCam32.ax or SpoutCam64.ax to the "release" folder and also to a "binaries\SPOUTCAM" folder which contains separate folders to 32bit (SpoutCam32) and 64bit (SpoutCam64) builds
 
-### Register SpoutCam.
+### SpoutCam options
 
-SpoutCam 32 bit is registered if Spout 2.006 is installed. If you build using this repository. The "release" folder has batch files which can be used to register or unregister different versions of SpoutCam. 
+"SpoutCamSettings.exe" has also been copied to the "binaries\SPOUTCAM" folder and can be used to set options for SpoutCam. Documentation for the functions can be found in the program itself using the |?| buttons.
 
-Please also refer to the 2.007 version of [SpoutCamSettings](https://github.com/leadedge/Spout2/tree/beta/SPOUTCAM) which allows resolution and frame rate to be changed.
+### Register SpoutCam.
 
-The program can also register SpoutCam and binaries are included in the repository. To register different ones, copy your binary files to the SpoutCam32 or SpoutCam64 folders before running SpoutCamSettings.
+"SpoutCamSettings" can also be used to register SpoutCam. Registration can also be done manually. The "SpoutCam32" and "SpoutCam64" folders contain batch files for this purpose. Refer to the readme.txt file in the "binaries\SPOUTCAM" folder. 
 
 ### Credit
 

SpoutCamDX.vcxproj

@@ -140,9 +140,9 @@
       <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
     </Link>
     <PostBuildEvent>
-      <Command>copy /y $(TargetPath) release\win32\SpoutCam32.ax
-
+      <Command>copy /y $(TargetPath) "Win32\Release\SpoutCam32.ax"
 
+copy /y $(TargetPath) "binaries\SPOUTCAM\SpoutCam32\SpoutCam32.ax"
 </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
@@ -166,7 +166,8 @@
       <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
     </Link>
     <PostBuildEvent>
-      <Command>copy /y $(TargetPath) release\x64\SpoutCam64.ax
+      <Command>copy /y $(TargetPath) "x64\Release\SpoutCam64.ax"
+copy /y $(TargetPath) "binaries\SPOUTCAM\SpoutCam64\SpoutCam64.ax"
 </Command>
     </PostBuildEvent>
     <Manifest>

SpoutDX/source/SpoutCommon.h

@@ -1,13 +1,18 @@
-/*
-
-			SpoutCommon.h
-
-			Enables build of the SDK as a DLL
-			Includes header for utilities - SpoutUtils
-			Optional legacyOpenGL define to enable legacy draw functions
+//
+// Header: SpoutCommon.h
+//
+// Enables build of the SDK as a DLL.
+//
+// Includes header for common utilities namespace "SpoutUtils".
+//
+// Optional _#define legacyOpenGL_ to enable legacy draw functions
+//
 
+/*
+		Thanks and credit to Malcolm Bechard, the author of this file
+		https://github.com/mbechard
 
-		Copyright (c) 2014-2020, Lynn Jarvis. All rights reserved.
+		Copyright (c) 2014-2023, Lynn Jarvis. All rights reserved.
 
 		Redistribution and use in source and binary forms, with or without modification, 
 		are permitted provided that the following conditions are met:
@@ -36,6 +41,11 @@
 #ifndef __SpoutCommon__
 #define __SpoutCommon__
 
+//
+// To build the Spout library as a dll, define
+// SPOUT_BUILD_DLL in the preprocessor defines.
+// Properties > C++ > Preprocessor > Preprocessor Definitions
+//
 #if defined(_MSC_VER)
 	#if defined(SPOUT_BUILD_DLL)
 		#define SPOUT_DLLEXP	__declspec(dllexport)
@@ -48,12 +58,26 @@
 	#define SPOUT_DLLEXP
 #endif // _MSC_VERR
 
+// Common utility functions namespace
+#include "SpoutUtils.h"
+
+//
 // This definition enables legacy OpenGL rendering code
 // used for shared texture Draw functions in SpoutGLDXinterop.cpp
+// Not required unless compatibility with OpenGL < 3 is necessary
 // Disabled by default for OpenGL 4 compliance
+// * Note that the same definition is necessary in SpoutGLextensions.h
+//   so that SpoutGLextensions can be used independently of the Spout library.
+//
 // #define legacyOpenGL
+//
 
-// Common utility functions namespace
-#include "SpoutUtils.h"
+//
+// Visual Studio code analysis warnings
+//
+
+// C++11 scoped (class) enums are not compatible with early compilers (< VS2012 and others).
+// The warning is designated "Prefer" and "C" standard unscoped enums are retained for compatibility.
+#pragma warning(disable:26812) // unscoped enums
 
 #endif