Skip to content
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

Update FFD library with VS 2019 #4067

Merged
merged 4 commits into from
Nov 28, 2024
Merged

Update FFD library with VS 2019 #4067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cd673bb
updated windows library
JayHuLBL Nov 23, 2024
b99285a
Merge branch 'master' into issue4015_updateBinary
JayHuLBL Nov 23, 2024
fb47f81
re-build the binary with VS2019
JayHuLBL Nov 26, 2024
10a5b4f
updated binary with VS 2019
JayHuLBL Nov 26, 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
Binary file modified Buildings/Resources/Library/win32/ffd.dll
View file
Open in desktop
Binary file not shown.
Binary file modified Buildings/Resources/Library/win32/ffd.lib
View file
Open in desktop
Binary file not shown.
Binary file modified Buildings/Resources/Library/win64/ffd.dll
View file
Open in desktop
Binary file not shown.
Binary file modified Buildings/Resources/Library/win64/ffd.lib
View file
Open in desktop
Binary file not shown.
30 changes: 20 additions & 10 deletions Buildings/Resources/src/FastFluidDynamics/Compile.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
::*******************************************************************
::Set the Output Directory, Compile Mode and MSbuild File Name
::*******************************************************************
set DIR=..\..\Library\win64
set DIR=..\..\Library\win32
set MSbuildName=ffd
set BuildConfiguration=Release
set Platform=Win64
set Platform=Win32
::Note: Two build mode, Debug or Release

::*******************************************************************
Expand Down Expand Up @@ -41,8 +41,11 @@ if exist "%DIR%\%MSbuildName%.lib" (
::Set Default Compiler Version and Toolset (edited by user)
::-------------------------------------------------------------------
::Note: Toolset: V100 for VC10.0, v110 for VC11.0
set VCVersion=14.0
set Toolset=v140
:: Toolset: V160 for VC 2019
::set VCVersion=14.0
::set Toolset=v140
set VCVersion=2019
set Toolset=v142

::-------------------------------------------------------------------
::Call vcvarsall.bat (Not user editable)
Expand All @@ -62,11 +65,16 @@ if %Platform%==Win64 (
set Conf_Platform=x64
)

if exist "%VCDIR% %VCVersion%\VC\vcvarsall.bat" (
call "%VCDIR% %VCVersion%\VC\vcvarsall.bat" %Conf%
::if exist "%VCDIR% %VCVersion%\VC\vcvarsall.bat" (
:: call "%VCDIR% %VCVersion%\VC\vcvarsall.bat" %Conf%
:: goto MSbuildSetting
:: )
if exist "%VCDIR%\%VCVersion%\Community\VC\Auxiliary\Build\vcvarsall.bat" (
call "%VCDIR%\%VCVersion%\Community\VC\Auxiliary\Build\vcvarsall.bat" %Conf%
goto MSbuildSetting
)


goto missing

:MSbuildSetting
Expand Down Expand Up @@ -191,11 +199,13 @@ msbuild %MSbuildName%.vcxproj /t:rebuild /p:PlatformToolset=%Toolset%;Configurat
::Copy ffd.dll to Output Directory
::*******************************************************************
echo Copy %MSbuildName%.dll and %MSbuildName%.lib to %DIR%
if %Platform%==Win32 (
echo %Platform%
pause
if %Platform%==x86 (
copy "%BuildConfiguration%\%MSbuildName%.dll" "%DIR%" /Y
copy "%BuildConfiguration%\%MSbuildName%.lib" "%DIR%" /Y
)
if %Platform%==X64 (
if %Platform%==x64 (
copy "X64\%BuildConfiguration%\%MSbuildName%.dll" "%DIR%" /Y
copy "X64\%BuildConfiguration%\%MSbuildName%.lib" "%DIR%" /Y
)
Expand All @@ -205,10 +215,10 @@ if %Platform%==X64 (
::Clean Build Folder
::*******************************************************************
echo Clean %BuildConfiguration% Build Folder
if %Platform%==Win32 (
if %Platform%==x86 (
rmdir %BuildConfiguration% /s /q
)
if %Platform%==X64 (
if %Platform%==x64 (
rmdir X64 /s /q
)
goto :eof
Expand Down