Integration for December 2023 release (#85)

8 files changed, 26 insertions, 22 deletions

diff --git a/build/GenerateXMPToolkitSDK_win.bat b/build/GenerateXMPToolkitSDK_win.bat
index 338f359..1c26a2b 100755
--- a/build/GenerateXMPToolkitSDK_win.bat
+++ b/build/GenerateXMPToolkitSDK_win.bat
@@ -37,7 +37,7 @@ set GENERATE_ALL=On
 
 :32DLL
 echo "Generating XMPSDKToolkit Dynamic Win32"
-set VS_VERSION=2019
+set VS_VERSION=2022
 set BUILD_TYPE=Dynamic
 set BITS=32
 IF "%GENERATE_ALL%"=="On" (
@@ -48,7 +48,7 @@ GOTO GenerateNow
 
 :32LIB
 echo "Generating XMPSDKToolkit Static Win32"
-set VS_VERSION=2019
+set VS_VERSION=2022
 set BUILD_TYPE=Static
 set BITS=32
 IF "%GENERATE_ALL%"=="On" (
@@ -58,7 +58,7 @@ GOTO GenerateNow
 
 :64DLL
 echo "Generating XMPSDKToolkit Dynamic x64"
-set VS_VERSION=2019
+set VS_VERSION=2022
 set BUILD_TYPE=Dynamic
 set BITS=64
 IF "%GENERATE_ALL%"=="On" (
@@ -68,7 +68,7 @@ GOTO GenerateNow
 
 :64LIB
 echo "Generating XMPSDKToolkit Static x64"
-set VS_VERSION=2019
+set VS_VERSION=2022
 set BUILD_TYPE=Static
 set BITS=64
 IF "%GENERATE_ALL%"=="On" (
@@ -94,9 +94,9 @@ exit /B 0
 
 :CLEANALL
 echo "Cleaning..."
-if exist vc16 rmdir /S /Q vc16
-if exist ..\XMPCore\build\vc16 rmdir /S /Q ..\XMPCore\build\vc16
-if exist ..\XMPFiles\build\vc16 rmdir /S /Q ..\XMPFiles\build\vc16
+if exist vc17 rmdir /S /Q vc17
+if exist ..\XMPCore\build\vc17 rmdir /S /Q ..\XMPCore\build\vc17
+if exist ..\XMPFiles\build\vc17 rmdir /S /Q ..\XMPFiles\build\vc17
 if exist ..\public\libraries\windows rmdir /S /Q ..\public\libraries\windows
 if exist ..\public\libraries\windows_x64 rmdir /S /Q ..\public\libraries\windows_x64
 echo "Done"
diff --git a/build/XMP_BuildInfo.h b/build/XMP_BuildInfo.h
index e5b11a4..acbcacf 100644
--- a/build/XMP_BuildInfo.h
+++ b/build/XMP_BuildInfo.h
@@ -11,7 +11,7 @@
 // =================================================================================================
 */
 
-#define kXMP_Copyright Copyright (c) 2019
-#define kXMP_CopyrightStr "Copyright (c) 2019"
+#define kXMP_Copyright Copyright (c) 2022
+#define kXMP_CopyrightStr "Copyright (c) 2022"
 
 #endif	/* __XMP_BuildInfo_h__ */
diff --git a/build/shared/CMakeUtils.bat b/build/shared/CMakeUtils.bat
index 3dae202..42e4c5f 100755
--- a/build/shared/CMakeUtils.bat
+++ b/build/shared/CMakeUtils.bat
@@ -8,7 +8,7 @@
 
 REM Available Arguments:
 REM [64|32] Bit Architecture (optional, 64 is default)
-REM [2008|2011|2011|2015|2017] VS Version(optional, 2019 is default)
+REM [2008|2011|2011|2015|2017|2019] VS Version(optional, 2022 is default)
 REM [Dynamic | Static] optional, Dynamic by default
 REM [WarningAsError] optional
 REM [Clean] optional
@@ -22,7 +22,7 @@ set CleanCMake=OFF
 set XMPROOT=%buildSharedLoc%/../..
 
 :: Default Generator
-set GeneratorVersion=Visual Studio 16 2019
+set GeneratorVersion=Visual Studio 17 2022
 set GeneratorArchitecture=x64
 set CMake_Arch64Bit=ON
 set CMake_ARCH=x64
@@ -59,9 +59,9 @@ set CMake_LibTypeFolderName=dynamic
 	)
 
 	:: Visual Studio Version
-	if /I "%1"=="2019" (
-	echo "Generator VS 2019 specified"
-	set GeneratorVersion=Visual Studio 16 2019
+	if /I "%1"=="2022" (
+	echo "Generator VS 2022 specified"
+	set GeneratorVersion=Visual Studio 17 2022
 	set CMakeGenVersion_FolderSuffix=
 	)
 
@@ -94,7 +94,7 @@ set CMake64_Folder_Suffix=
 )
 
 :: CMake Folder specified:
-set CMakeFolder="vc16/%CMake_LibTypeFolderName%/windows%CMake64_Folder_Suffix%"
+set CMakeFolder="vc17/%CMake_LibTypeFolderName%/windows%CMake64_Folder_Suffix%"
 echo CMakeFolder: %CMakeFolder%
 
 echo Generator used: %GeneratorVersion%
diff --git a/build/shared/SharedConfig_Android.cmake b/build/shared/SharedConfig_Android.cmake
index 8eb23e6..7ab6b53 100644
--- a/build/shared/SharedConfig_Android.cmake
+++ b/build/shared/SharedConfig_Android.cmake
@@ -42,7 +42,7 @@ endif()
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMMON_SHARED_COMPILE_FLAGS} ${${COMPONENT}_EXTRA_C_COMPILE_FLAGS} -Wno-implicit ")
 set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${COMMON_SHARED_COMPILE_DEBUG_FLAGS}")
 set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${COMMON_SHARED_COMPILE_RELEASE_FLAGS}")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_SHARED_COMPILE_FLAGS} ${COMMON_EXTRA_CXX_COMPILE_FLAGS} -mfpu=vfpv3-d16 -Wno-reorder -std=c++11")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_SHARED_COMPILE_FLAGS} ${COMMON_EXTRA_CXX_COMPILE_FLAGS} -mfpu=vfpv3-d16 -Wno-reorder -std=c++17")
 set(CMAKE_CXX_FLAGS_DEBUG " ${COMMON_SHARED_COMPILE_DEBUG_FLAGS}")
 set(CMAKE_CXX_FLAGS_RELEASE " ${COMMON_SHARED_COMPILE_RELEASE_FLAGS} -s")
 set(COMMON_PLATFORM_BEGIN_WHOLE_ARCHIVE "-Wl,--whole-archive")
diff --git a/build/shared/SharedConfig_Ios.cmake b/build/shared/SharedConfig_Ios.cmake
index 0cd9744..03a0f1b 100644
--- a/build/shared/SharedConfig_Ios.cmake
+++ b/build/shared/SharedConfig_Ios.cmake
@@ -52,7 +52,7 @@ set(CMAKE_C_FLAGS "${${COMPONENT}_SHARED_COMPILE_FLAGS} ${${COMPONENT}_EXTRA_C_C
 set(CMAKE_C_FLAGS_DEBUG "${${COMPONENT}_SHARED_COMPILE_DEBUG_FLAGS}")
 set(CMAKE_C_FLAGS_RELEASE "${${COMPONENT}_SHARED_COMPILE_RELEASE_FLAGS}")
 
-set(CMAKE_CXX_FLAGS "-std=c++11 ${${COMPONENT}_SHARED_COMPILE_FLAGS} ${${COMPONENT}_EXTRA_CXX_COMPILE_FLAGS}")
+set(CMAKE_CXX_FLAGS "-std=c++17 ${${COMPONENT}_SHARED_COMPILE_FLAGS} ${${COMPONENT}_EXTRA_CXX_COMPILE_FLAGS}")
 set(CMAKE_CXX_FLAGS_DEBUG "${${COMPONENT}_SHARED_COMPILE_DEBUG_FLAGS}")
 set(CMAKE_CXX_FLAGS_RELEASE "${${COMPONENT}_SHARED_COMPILE_RELEASE_FLAGS}")
 
diff --git a/build/shared/SharedConfig_Mac.cmake b/build/shared/SharedConfig_Mac.cmake
index cd8eda0..302704d 100644
--- a/build/shared/SharedConfig_Mac.cmake
+++ b/build/shared/SharedConfig_Mac.cmake
@@ -53,7 +53,7 @@ set(CMAKE_C_FLAGS "${COMMON_SHARED_COMPILE_FLAGS} ${COMMON_EXTRA_C_COMPILE_FLAGS
 set(CMAKE_C_FLAGS_DEBUG "${COMMON_SHARED_COMPILE_DEBUG_FLAGS}")
 set(CMAKE_C_FLAGS_RELEASE "${COMMON_SHARED_COMPILE_RELEASE_FLAGS}")
 
-set(COMMON_SHARED_CXX_COMPILE_FLAGS "${${COMPONENT}_SHARED_CXX_COMPILE_FLAGS} -std=c++11 -Wnon-virtual-dtor -Woverloaded-virtual -Wno-unused-variable -Wno-unused-function -Wno-unused-parameter")
+set(COMMON_SHARED_CXX_COMPILE_FLAGS "${${COMPONENT}_SHARED_CXX_COMPILE_FLAGS} -std=c++17 -Wnon-virtual-dtor -Woverloaded-virtual -Wno-unused-variable -Wno-unused-function -Wno-unused-parameter")
 set(CMAKE_CXX_FLAGS "-funsigned-char -fshort-enums -fno-common ${COMMON_SHARED_CXX_COMPILE_FLAGS} ${COMMON_EXTRA_CXX_COMPILE_FLAGS}")
 set(CMAKE_CXX_FLAGS_DEBUG "${COMMON_SHARED_COMPILE_DEBUG_FLAGS}")
 set(CMAKE_CXX_FLAGS_RELEASE "${COMMON_SHARED_COMPILE_RELEASE_FLAGS}")
diff --git a/build/shared/SharedConfig_Win.cmake b/build/shared/SharedConfig_Win.cmake
index 8c59f93..965f3fc 100644
--- a/build/shared/SharedConfig_Win.cmake
+++ b/build/shared/SharedConfig_Win.cmake
@@ -19,6 +19,9 @@ endif(ANDROID)
 # ==============================================================================
 # Shared config for windows
 # ==============================================================================
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
 
 if(CMAKE_CL_64)
 	set(COMMON_SHARED_COMPILE_FLAGS "-DWIN64 -D_WIN64=1")
diff --git a/build/shared/ToolchainLLVM.cmake b/build/shared/ToolchainLLVM.cmake
index ab3c736..69d632c 100644
--- a/build/shared/ToolchainLLVM.cmake
+++ b/build/shared/ToolchainLLVM.cmake
@@ -14,8 +14,9 @@
 set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvm.clang.1_0")
 set(CMAKE_C_COMPILER xcrun -find clang)
 set(CMAKE_CXX_COMPILER xcrun -find clang++)
+set(CMAKE_XCODE_BUILD_SYSTEM 12)
 
-
-# SDK and deployment 
-set(XMP_OSX_SDK		 	11.1)
-set(XMP_OSX_TARGET	 	10.13)
+# SDK and deployment
+set(XMP_OSX_SDK		 	13.1)
+set(XMP_OSX_TARGET	 	10.15)
+set(APPLE_UNIVERSAL 	True)