From 9d1b2a4b18fdb9a78dba720dfbfa0cd90659e77b Mon Sep 17 00:00:00 2001 From: Bonnie Jonkman Date: Wed, 3 Apr 2024 19:12:03 -0600 Subject: [PATCH 1/3] SeaState Visual Studio project - add SeaState_Types.f90 - fix case on seastate path name (though it doesn't matter in Windows) - fix NWTC Library registry file name --- vs-build/RunRegistry.bat | 2 +- vs-build/SeaState/SeaStateDriver.vfproj | 87 +++++++++++++------------ 2 files changed, 45 insertions(+), 44 deletions(-) diff --git a/vs-build/RunRegistry.bat b/vs-build/RunRegistry.bat index f56a56f29d..c93ae9315b 100644 --- a/vs-build/RunRegistry.bat +++ b/vs-build/RunRegistry.bat @@ -67,7 +67,7 @@ REM ---------------------------------------------------------------------------- :NWTC_Lib SET CURR_LOC=%NWTC_Lib_Loc% SET Output_Loc=%CURR_LOC% -%REGISTRY% "%CURR_LOC%\Registry_NWTC_Library_typedef_nomesh.txt" -I "%NWTC_Lib_Loc%" -I "%CURR_LOC%" -O "%Output_Loc%" -noextrap +%REGISTRY% "%CURR_LOC%\Registry_NWTC_Library_base.txt" -I "%NWTC_Lib_Loc%" -I "%CURR_LOC%" -O "%Output_Loc%" -noextrap GOTO checkError :MAP diff --git a/vs-build/SeaState/SeaStateDriver.vfproj b/vs-build/SeaState/SeaStateDriver.vfproj index 2d598d9e7c..b08e100f9a 100644 --- a/vs-build/SeaState/SeaStateDriver.vfproj +++ b/vs-build/SeaState/SeaStateDriver.vfproj @@ -100,7 +100,7 @@ - + @@ -256,89 +256,90 @@ - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - - + + + - + - + - + - + - + - - + + - + - + - + - + - + - - + + - + - + - - - - - - - + + + + + + + From 42ef94da78ec697807298e103667e4160a980209 Mon Sep 17 00:00:00 2001 From: Bonnie Jonkman Date: Thu, 4 Apr 2024 13:58:58 -0600 Subject: [PATCH 2/3] fix VS Build for FASTlib - NWTC Library registry file was misnamed --- vs-build/FASTlib/FASTlib.vfproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vs-build/FASTlib/FASTlib.vfproj b/vs-build/FASTlib/FASTlib.vfproj index 4485780101..3e1d1bc60d 100644 --- a/vs-build/FASTlib/FASTlib.vfproj +++ b/vs-build/FASTlib/FASTlib.vfproj @@ -2035,7 +2035,7 @@ - + From 9068698644e993bd64a5396d3565f9e31a4f4478 Mon Sep 17 00:00:00 2001 From: Bonnie Jonkman Date: Tue, 7 May 2024 09:27:15 -0600 Subject: [PATCH 3/3] Visual Studio build: fix dependencies for ExtLoads registry --- vs-build/RunRegistry.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vs-build/RunRegistry.bat b/vs-build/RunRegistry.bat index c93ae9315b..dfb6402e2b 100644 --- a/vs-build/RunRegistry.bat +++ b/vs-build/RunRegistry.bat @@ -144,7 +144,7 @@ GOTO checkError :ExtLoads SET CURR_LOC=%ExtLoads_Loc% SET Output_Loc=%CURR_LOC% -%REGISTRY% "%CURR_LOC%\%ModuleName%_Registry.txt" -I "%NWTC_Lib_Loc%" -I "%ExtLoads_Loc%" -O "%Output_Loc%" +%REGISTRY% "%CURR_LOC%\%ModuleName%_Registry.txt" -I "%NWTC_Lib_Loc%" -I "%CURR_LOC%" -I "%IfW_Loc%" -O "%Output_Loc%" GOTO checkError :ExtLoadsDX