Merge from master (peg SDK=10.0.19041.0)

Author: chipbarnaby

.github/workflows/build-and-test.yml

@@ -5,13 +5,17 @@ on: push
 jobs:
   build-cse:
     name: Build CSE executable
-    runs-on: windows-latest
+    runs-on: windows-2022
     defaults:
       run:
         shell: bash
     steps:
       - name: Checkout
         uses: actions/checkout@v1
+      - name: Install recent SDK
+        uses: GuillaumeFalourd/setup-windows10-sdk-action@v1
+        with:
+          sdk-version: 19041
       - name: Get branch name
         uses: tj-actions/branch-names@v5
         id: branch-name
@@ -38,7 +42,7 @@ jobs:
   test-cse:
     name: Test CSE
     needs: build-cse
-    runs-on: windows-latest
+    runs-on: windows-2022
     steps:
       - name: Checkout
         uses: actions/checkout@v1
@@ -52,13 +56,26 @@ jobs:
         with:
           name: CSE.exe
           path: msvc
+      # - name: Download Mesa3D on Windows
+      #   if: runner.os == 'Windows'
+      #   shell: cmd
+      #   run: curl.exe -L --output mesa.7z --url https://github.com/pal1000/mesa-dist-win/releases/download/20.3.2/mesa3d-20.3.2-release-msvc.7z
+      #   working-directory: msvc
+      # - name: Install Mesa3D on Windows
+      #   if: runner.os == 'Windows'
+      #   shell: cmd
+      #   run: |
+      #     "C:\Program Files\7-Zip\7z.exe" x mesa.7z
+      #     mklink opengl32.dll "x64\opengl32.dll"
+      #     mklink libglapi.dll "x64\libglapi.dll"
+      #   working-directory: msvc
       - name: Test
-        run: ctest -C Release --output-on-failure -E shadetest  # CI can't do GPU calcs at this time
+        run: ctest -C Release --output-on-failure -E shadetest  # CI can't do GPU calcs at this time (the steps above get us close, but throws an exception on destruction)
         working-directory: msvc/build
   build-doc:
     name: Build CSE documentation
     needs: build-cse
-    runs-on: windows-latest
+    runs-on: windows-2022
     steps:
       - name: Checkout
         uses: actions/checkout@v1

.github/workflows/release.yml

@@ -8,13 +8,17 @@ on:
 jobs:
   release-cse:
     name: Deploy CSE release
-    runs-on: windows-latest
+    runs-on: windows-2022
     defaults:
       run:
         shell: bash
     steps:
       - name: Checkout
         uses: actions/checkout@v1
+      - name: Install recent SDK
+        uses: GuillaumeFalourd/setup-windows10-sdk-action@v1
+        with:
+          sdk-version: 19041
       - name: Get branch name
         uses: tj-actions/branch-names@v5
         id: branch-name

cmake/configure.cmake

@@ -2,7 +2,7 @@ message("Making build directory: ${CMAKE_CURRENT_SOURCE_DIR}/msvc/build")
 file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/msvc)
 file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/msvc/build)
 message("Generating project files...")
-execute_process(COMMAND ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR} -T v142 -A Win32 -D CMAKE_SYSTEM_VERSION=10.0.17763.0
+execute_process(COMMAND ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR} -T v142 -A Win32 -DCMAKE_SYSTEM_VERSION=10.0.19041.0
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/msvc/build
   RESULT_VARIABLE success
 )

src/CMakeLists.txt

@@ -10,6 +10,9 @@ set(defs
   CNRECS.DEF
 )
 
+# User Option
+option(USE_XMODULE "Add XMODULE to the build." OFF)
+
 macro(c_preprocess file)
   add_custom_command(
     OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${file}.i"
@@ -129,7 +132,6 @@ set(source
   VRPAK.CPP
   WFPAK.CPP
   XIOPAK.CPP
-  XMODULE.CPP
   YACAM.CPP
 )
 
@@ -196,10 +198,14 @@ set(headers
   VRPAK.H
   WFPAK.H
   XIOPAK.H
-  XMODULE.h
   YACAM.H
 )
 
+if(USE_XMODULE) # Runtime Share Library interface - Not used since Version 0.899. (Windows only)
+  list(APPEND source XMODULE.CPP)
+  list(APPEND headers XMODULE.H)
+endif()
+
 include_directories(
   "${CMAKE_SOURCE_DIR}/src"
   "${CMAKE_SOURCE_DIR}/vendor"
@@ -234,6 +240,10 @@ addMSVCPrecompiledHeader("cnglob.h" precomp source)
 add_executable(CSE ${source} ${rcFile} ${headers})
 target_compile_features(CSE PUBLIC cxx_std_17)
 
+if(USE_XMODULE)
+  target_compile_definitions(CSE PRIVATE SUPPURT_XMODULE)
+endif()
+
 set(libs
   glad
   penumbra

src/ashwface.cpp

@@ -1081,22 +1081,28 @@ XASHWAT ASHWAT(		// public ASHWAT object
 #endif
 //=============================================================================
 XASHWAT::XASHWAT( const char* moduleName)		// c'tor
+#if defined(SUPPORT_XMODULE)
 	: XMODULE( moduleName)
+#endif // SUPPORT_XMODULE
 {
+#if defined(SUPPORT_XMODULE)
 	xm_ClearPtrs();
+#endif // SUPPORT_XMODULE
 }
 //-----------------------------------------------------------------------------
 XASHWAT::~XASHWAT()
 {
 }	// XASHWAT::~XASHWAT
 //-----------------------------------------------------------------------------
+#if defined(SUPPORT_XMODULE)
 /*virtual*/ void XASHWAT::xm_ClearPtrs()
 {
 #if defined( ASHWAT_LINKDLL)
 	xw_pAWThermal = NULL;
 	xw_pAWCheckFixCFSLayer = NULL;
 #endif
 }		// XASHWAT::xm_ClearPtrs
+#endif // SUPPORT_XMODULE
 //-----------------------------------------------------------------------------
 RC XASHWAT::xw_Setup()		// general initialization
 // duplicate calls OK

src/ashwface.h

@@ -292,8 +292,12 @@ class FENAW
 #define FCSL( s) s, sizeof( s)
 #define FCSET( d, s) strSpacePad( FCSL( d), s)
 #define FCGET( s) strTrim( NULL, FCSL( s))
+#if defined(SUPPORT_XMODULE)
 #include "xmodule.h"
 class XASHWAT : public XMODULE
+#else
+class XASHWAT
+#endif // SUPPORT_XMODULE
 {
 friend class FENAW;
 friend struct CFSTY;
@@ -349,7 +353,9 @@ typedef int _stdcall AWRatings( const CFSTY& CFS, double& Urat, double& SHGCrat)
 public:
 	XASHWAT( const char* moduleName);
 	~XASHWAT();
+	#if defined(SUPPORT_XMODULE)
 	virtual void xm_ClearPtrs();
+	#endif // SUPPORT_XMODULE
 
 	RC xw_Setup();
 	static void MsgCallBackFunc( void* msgContext, AWMSGTY msgTy, const string& msg);