Skip to content

More fixes for Visual Studio #2189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrew-platt merged 3 commits into from
May 7, 2024
Merged

More fixes for Visual Studio #2189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9d1b2a4
SeaState Visual Studio project
bjonkman Apr 4, 2024
42ef94d
fix VS Build for FASTlib
bjonkman Apr 4, 2024
9068698
Visual Studio build: fix dependencies for ExtLoads registry
bjonkman May 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion vs-build/FASTlib/FASTlib.vfproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2035,7 +2035,7 @@
<FileConfiguration Name="Debug_Double|x64">
<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration></File>
<File RelativePath="..\..\modules\nwtc-library\src\Registry_NWTC_Library.txt"/>
<File RelativePath="..\..\modules\nwtc-library\src\Registry_NWTC_Library_typedef_nomesh.txt">
<File RelativePath="..\..\modules\nwtc-library\src\Registry_NWTC_Library_base.txt">
<FileConfiguration Name="Release_OpenMP|x64">
<Tool Name="VFCustomBuildTool" CommandLine="call ..\RunRegistry.bat NWTC_Lib" Description="Running Registry for NWTC_Lib" Outputs="..\..\modules\nwtc-library\src\NWTC_Library_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Release|x64">
Expand Down
4 changes: 2 additions & 2 deletions vs-build/RunRegistry.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
87 changes: 44 additions & 43 deletions vs-build/SeaState/SeaStateDriver.vfproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
<FileConfiguration Name="Release|Win32">
<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration></File>
<File RelativePath="..\..\modules\nwtc-library\src\Registry_NWTC_Library.txt"/>
<File RelativePath="..\..\modules\nwtc-library\src\Registry_NWTC_Library_typedef_nomesh.txt">
<File RelativePath="..\..\modules\nwtc-library\src\Registry_NWTC_Library_base.txt">
<FileConfiguration Name="Release|x64">
<Tool Name="VFCustomBuildTool" CommandLine="call ..\RunRegistry.bat NWTC_Lib" Description="Running Registry for NWTC_Lib" Outputs="..\..\modules\nwtc-library\src\NWTC_Library_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Debug|x64">
Expand Down Expand Up @@ -256,89 +256,90 @@
<Tool Name="VFFortranCompilerTool" StandardWarnings="standardWarningsNone" WarnUnusedVariables="false"/></FileConfiguration></File></Filter>
<Filter Name="SeaState">
<Filter Name="RegistryFiles">
<File RelativePath="..\..\modules\SeaState\src\Current.txt">
<File RelativePath="..\..\modules\seastate\src\Current.txt">
<FileConfiguration Name="Debug_Double|Win32">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat Current" Description="Running Registry for Current" Outputs="..\..\modules\SeaState\src\Current_Types.f90"/></FileConfiguration>
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat Current" Description="Running Registry for Current" Outputs="..\..\modules\seastate\src\Current_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Debug|Win32">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat Current" Description="Running Registry for Current" Outputs="..\..\modules\SeaState\src\Current_Types.f90"/></FileConfiguration>
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat Current" Description="Running Registry for Current" Outputs="..\..\modules\seastate\src\Current_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Release|x64">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat Current" Description="Running Registry for Current" Outputs="..\..\modules\SeaState\src\Current_Types.f90"/></FileConfiguration>
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat Current" Description="Running Registry for Current" Outputs="..\..\modules\seastate\src\Current_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Debug|x64">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat Current" Description="Running Registry for Current" Outputs="..\..\modules\SeaState\src\Current_Types.f90"/></FileConfiguration>
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat Current" Description="Running Registry for Current" Outputs="..\..\modules\seastate\src\Current_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Debug_Double|x64">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat Current" Description="Running Registry for Current" Outputs="..\..\modules\SeaState\src\Current_Types.f90"/></FileConfiguration>
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat Current" Description="Running Registry for Current" Outputs="..\..\modules\seastate\src\Current_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Release|Win32">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat Current" Description="Running Registry for Current" Outputs="..\..\modules\SeaState\src\Current_Types.f90"/></FileConfiguration></File>
<File RelativePath="..\..\modules\SeaState\src\Current_Types.f90">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat Current" Description="Running Registry for Current" Outputs="..\..\modules\seastate\src\Current_Types.f90"/></FileConfiguration></File>
<File RelativePath="..\..\modules\seastate\src\Current_Types.f90">
<FileConfiguration Name="Debug_Double|Win32">
<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration>
<FileConfiguration Name="Debug|Win32">
<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration></File>
<File RelativePath="..\..\modules\seastate\src\SeaSt_WaveField.txt">
<FileConfiguration Name="Release|x64">
<Tool Name="VFCustomBuildTool" CommandLine="call ..\RunRegistry SeaSt_WaveField" Description="Running Registry for SeaSt_WaveField" Outputs="..\..\modules\SeaState\SeaSt_WaveField_Types.f90"/></FileConfiguration>
<Tool Name="VFCustomBuildTool" CommandLine="call ..\RunRegistry SeaSt_WaveField" Description="Running Registry for SeaSt_WaveField" Outputs="..\..\modules\seastate\SeaSt_WaveField_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Debug|x64">
<Tool Name="VFCustomBuildTool" CommandLine="call ..\RunRegistry SeaSt_WaveField" Description="Running Registry for SeaSt_WaveField" Outputs="..\..\modules\SeaState\SeaSt_WaveField_Types.f90"/></FileConfiguration>
<Tool Name="VFCustomBuildTool" CommandLine="call ..\RunRegistry SeaSt_WaveField" Description="Running Registry for SeaSt_WaveField" Outputs="..\..\modules\seastate\SeaSt_WaveField_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Debug_Double|x64">
<Tool Name="VFCustomBuildTool" CommandLine="call ..\RunRegistry SeaSt_WaveField" Description="Running Registry for SeaSt_WaveField" Outputs="..\..\modules\SeaState\SeaSt_WaveField_Types.f90"/></FileConfiguration></File>
<Tool Name="VFCustomBuildTool" CommandLine="call ..\RunRegistry SeaSt_WaveField" Description="Running Registry for SeaSt_WaveField" Outputs="..\..\modules\seastate\SeaSt_WaveField_Types.f90"/></FileConfiguration></File>
<File RelativePath="..\..\modules\seastate\src\SeaSt_WaveField_Types.f90"/>
<File RelativePath="..\..\modules\SeaState\src\SeaState.txt">
<File RelativePath="..\..\modules\seastate\src\SeaState.txt">
<FileConfiguration Name="Debug_Double|Win32">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat SeaState" Description="Running Registry for SeaState" Outputs="..\..\modules\SeaState\src\SeaState_Types.f90"/></FileConfiguration>
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat SeaState" Description="Running Registry for SeaState" Outputs="..\..\modules\seastate\src\SeaState_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Debug|Win32">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat SeaState" Description="Running Registry for SeaState" Outputs="..\..\modules\SeaState\src\SeaState_Types.f90"/></FileConfiguration>
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat SeaState" Description="Running Registry for SeaState" Outputs="..\..\modules\seastate\src\SeaState_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Release|x64">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat SeaState" Description="Running Registry for SeaState" Outputs="..\..\modules\SeaState\src\SeaState_Types.f90"/></FileConfiguration>
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat SeaState" Description="Running Registry for SeaState" Outputs="..\..\modules\seastate\src\SeaState_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Debug|x64">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat SeaState" Description="Running Registry for SeaState" Outputs="..\..\modules\SeaState\src\SeaState_Types.f90"/></FileConfiguration>
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat SeaState" Description="Running Registry for SeaState" Outputs="..\..\modules\seastate\src\SeaState_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Debug_Double|x64">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat SeaState" Description="Running Registry for SeaState" Outputs="..\..\modules\SeaState\src\SeaState_Types.f90"/></FileConfiguration>
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat SeaState" Description="Running Registry for SeaState" Outputs="..\..\modules\seastate\src\SeaState_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Release|Win32">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat SeaState" Description="Running Registry for SeaState" Outputs="..\..\modules\SeaState\src\SeaState_Types.f90"/></FileConfiguration></File>
<File RelativePath="..\..\modules\SeaState\src\Waves.txt">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat SeaState" Description="Running Registry for SeaState" Outputs="..\..\modules\seastate\src\SeaState_Types.f90"/></FileConfiguration></File>
<File RelativePath="..\..\modules\seastate\src\SeaState_Types.f90"/>
<File RelativePath="..\..\modules\seastate\src\Waves.txt">
<FileConfiguration Name="Debug_Double|Win32">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat Waves" Description="Running Registry for Waves" Outputs="..\..\modules\SeaState\src\Waves_Types.f90"/></FileConfiguration>
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat Waves" Description="Running Registry for Waves" Outputs="..\..\modules\seastate\src\Waves_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Debug|Win32">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat Waves" Description="Running Registry for Waves" Outputs="..\..\modules\SeaState\src\Waves_Types.f90"/></FileConfiguration>
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat Waves" Description="Running Registry for Waves" Outputs="..\..\modules\seastate\src\Waves_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Release|x64">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat Waves" Description="Running Registry for Waves" Outputs="..\..\modules\SeaState\src\Waves_Types.f90"/></FileConfiguration>
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat Waves" Description="Running Registry for Waves" Outputs="..\..\modules\seastate\src\Waves_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Debug|x64">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat Waves" Description="Running Registry for Waves" Outputs="..\..\modules\SeaState\src\Waves_Types.f90"/></FileConfiguration>
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat Waves" Description="Running Registry for Waves" Outputs="..\..\modules\seastate\src\Waves_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Debug_Double|x64">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat Waves" Description="Running Registry for Waves" Outputs="..\..\modules\SeaState\src\Waves_Types.f90"/></FileConfiguration>
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat Waves" Description="Running Registry for Waves" Outputs="..\..\modules\seastate\src\Waves_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Release|Win32">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat Waves" Description="Running Registry for Waves" Outputs="..\..\modules\SeaState\src\Waves_Types.f90"/></FileConfiguration></File>
<File RelativePath="..\..\modules\SeaState\src\Waves2.txt">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat Waves" Description="Running Registry for Waves" Outputs="..\..\modules\seastate\src\Waves_Types.f90"/></FileConfiguration></File>
<File RelativePath="..\..\modules\seastate\src\Waves2.txt">
<FileConfiguration Name="Debug_Double|Win32">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat Waves2" Description="Running Registry for Waves2" Outputs="..\..\modules\SeaState\src\Waves2_Types.f90"/></FileConfiguration>
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat Waves2" Description="Running Registry for Waves2" Outputs="..\..\modules\seastate\src\Waves2_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Debug|Win32">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat Waves2" Description="Running Registry for Waves2" Outputs="..\..\modules\SeaState\src\Waves2_Types.f90"/></FileConfiguration>
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat Waves2" Description="Running Registry for Waves2" Outputs="..\..\modules\seastate\src\Waves2_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Release|x64">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat Waves2" Description="Running Registry for Waves2" Outputs="..\..\modules\SeaState\src\Waves2_Types.f90"/></FileConfiguration>
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat Waves2" Description="Running Registry for Waves2" Outputs="..\..\modules\seastate\src\Waves2_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Debug|x64">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat Waves2" Description="Running Registry for Waves2" Outputs="..\..\modules\SeaState\src\Waves2_Types.f90"/></FileConfiguration>
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat Waves2" Description="Running Registry for Waves2" Outputs="..\..\modules\seastate\src\Waves2_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Debug_Double|x64">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat Waves2" Description="Running Registry for Waves2" Outputs="..\..\modules\SeaState\src\Waves2_Types.f90"/></FileConfiguration>
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat Waves2" Description="Running Registry for Waves2" Outputs="..\..\modules\seastate\src\Waves2_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Release|Win32">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat Waves2" Description="Running Registry for Waves2" Outputs="..\..\modules\SeaState\src\Waves2_Types.f90"/></FileConfiguration></File>
<File RelativePath="..\..\modules\SeaState\src\Waves2_Types.f90">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat Waves2" Description="Running Registry for Waves2" Outputs="..\..\modules\seastate\src\Waves2_Types.f90"/></FileConfiguration></File>
<File RelativePath="..\..\modules\seastate\src\Waves2_Types.f90">
<FileConfiguration Name="Debug_Double|Win32">
<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration>
<FileConfiguration Name="Debug|Win32">
<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration></File>
<File RelativePath="..\..\modules\SeaState\src\Waves_Types.f90">
<File RelativePath="..\..\modules\seastate\src\Waves_Types.f90">
<FileConfiguration Name="Debug_Double|Win32">
<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration>
<FileConfiguration Name="Debug|Win32">
<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration></File></Filter>
<File RelativePath="..\..\modules\SeaState\src\Current.f90"/>
<File RelativePath="..\..\modules\seastate\src\Current.f90"/>
<File RelativePath="..\..\modules\seastate\src\SeaSt_WaveField.f90"/>
<File RelativePath="..\..\modules\SeaState\src\SeaState.f90"/>
<File RelativePath="..\..\modules\SeaState\src\SeaState_Input.f90"/>
<File RelativePath="..\..\modules\SeaState\src\SeaState_Output.f90"/>
<File RelativePath="..\..\modules\SeaState\src\UserWaves.f90"/>
<File RelativePath="..\..\modules\SeaState\src\Waves.f90"/>
<File RelativePath="..\..\modules\SeaState\src\Waves2.f90"/></Filter>
<File RelativePath="..\..\modules\SeaState\src\SeaState_DriverCode.f90"/>
<File RelativePath="..\..\modules\seastate\src\SeaState.f90"/>
<File RelativePath="..\..\modules\seastate\src\SeaState_Input.f90"/>
<File RelativePath="..\..\modules\seastate\src\SeaState_Output.f90"/>
<File RelativePath="..\..\modules\seastate\src\UserWaves.f90"/>
<File RelativePath="..\..\modules\seastate\src\Waves.f90"/>
<File RelativePath="..\..\modules\seastate\src\Waves2.f90"/></Filter>
<File RelativePath="..\..\modules\seastate\src\SeaState_DriverCode.f90"/>
<File RelativePath="..\..\modules\version\src\VersionInfo.f90"/></Filter></Files>
<Globals/></VisualStudioProject>