diff --git a/Buildings/Resources/Library/win32/ffd.dll b/Buildings/Resources/Library/win32/ffd.dll index 3205bbebe23..db9187e372a 100644 Binary files a/Buildings/Resources/Library/win32/ffd.dll and b/Buildings/Resources/Library/win32/ffd.dll differ diff --git a/Buildings/Resources/Library/win32/ffd.lib b/Buildings/Resources/Library/win32/ffd.lib index af84268f10c..6bc6895a8f7 100644 Binary files a/Buildings/Resources/Library/win32/ffd.lib and b/Buildings/Resources/Library/win32/ffd.lib differ diff --git a/Buildings/Resources/Library/win64/ffd.dll b/Buildings/Resources/Library/win64/ffd.dll index 7a662ea85b2..65fb3e093fc 100644 Binary files a/Buildings/Resources/Library/win64/ffd.dll and b/Buildings/Resources/Library/win64/ffd.dll differ diff --git a/Buildings/Resources/Library/win64/ffd.lib b/Buildings/Resources/Library/win64/ffd.lib index b77f29af0ab..b7524242f4b 100644 Binary files a/Buildings/Resources/Library/win64/ffd.lib and b/Buildings/Resources/Library/win64/ffd.lib differ diff --git a/Buildings/Resources/src/FastFluidDynamics/Compile.bat b/Buildings/Resources/src/FastFluidDynamics/Compile.bat index a74781c9d29..7c7bf964111 100644 --- a/Buildings/Resources/src/FastFluidDynamics/Compile.bat +++ b/Buildings/Resources/src/FastFluidDynamics/Compile.bat @@ -3,10 +3,10 @@ ::******************************************************************* ::Set the Output Directory, Compile Mode and MSbuild File Name ::******************************************************************* -set DIR=..\..\Library\win32 +set DIR=..\..\Library\win64 set MSbuildName=ffd set BuildConfiguration=Release -set Platform=Win32 +set Platform=Win64 ::Note: Two build mode, Debug or Release ::******************************************************************* @@ -41,8 +41,8 @@ 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=10.0 -set Toolset=v100 +set VCVersion=14.0 +set Toolset=v140 ::------------------------------------------------------------------- ::Call vcvarsall.bat (Not user editable) @@ -53,8 +53,17 @@ if %PROCESSOR_ARCHITECTURE%==AMD64 set VCDIR=C:\Program Files (x86)\Microsoft Vi ::Note: IA64 is not supported ::Set Environment Variable +if %Platform%==Win32 ( + set Conf=x86 + set Conf_Platform=Win32 + ) +if %Platform%==Win64 ( + set conf=x64 + set Conf_Platform=x64 + ) + if exist "%VCDIR% %VCVersion%\VC\vcvarsall.bat" ( - call "%VCDIR% %VCVersion%\VC\vcvarsall.bat" x86 + call "%VCDIR% %VCVersion%\VC\vcvarsall.bat" %Conf% goto MSbuildSetting ) @@ -84,7 +93,7 @@ goto missing :: Debug mode emitted symbolic debug information,and the code execution is not optimized. :: Release mode does not emitted debug information,and the code execution is optimized. ::Note: WIN32 in Preprocessor Definitions: Defined for applications for Win32 and Win64. Always defined. -if /i %BuildConfiguration%_%Platform%==Debug_Win32 ( +if /i %BuildConfiguration%_%Conf_Platform%==Debug_Win32 ( set UseDebugLibrariesSetValue=true set WholeProgramOptimizationSetValue=false set CharacterSetSetValue=Unicode @@ -104,8 +113,29 @@ if /i %BuildConfiguration%_%Platform%==Debug_Win32 ( goto compile ) +if /i %BuildConfiguration%_%Conf_Platform%==Debug_x64 ( + set UseDebugLibrariesSetValue=true + set WholeProgramOptimizationSetValue=false + set CharacterSetSetValue=Unicode + set LinkIncrementalSetValue=true + + set WarningLevelSetValue=Level3 + set OptimizationSetValue=Disabled + set FunctionLevelLinkingSetValue=false + set IntrinsicFunctionsSetValue=false + set PreprocessorDefinitionsSetValue=Win64;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS; + + set SubSystemSetValue=Windows + set GenerateDebugInformationSetValue=true + set EnableCOMDATFoldingSetValue=false + set OptimizeReferencesSetValue=false + + goto compile + ) + +echo BuildingConfig is %BuildConfiguration% and the platform is %Platform% ::Note: To better understand code optimization, recommend to read "Optimization Best Practices" http://msdn.microsoft.com/en-us/library/ms235601.aspx -if /i %BuildConfiguration%_%Platform%==Release_Win32 ( +if /i %BuildConfiguration%_%Conf_Platform%==Release_Win32 ( set UseDebugLibrariesSetValue=false set WholeProgramOptimizationSetValue=true set CharacterSetSetValue=Unicode @@ -125,6 +155,26 @@ if /i %BuildConfiguration%_%Platform%==Release_Win32 ( goto compile ) +if /i %BuildConfiguration%_%Conf_Platform%==Release_x64 ( + set UseDebugLibrariesSetValue=false + set WholeProgramOptimizationSetValue=true + set CharacterSetSetValue=Unicode + set LinkIncrementalSetValue=false + + set WarningLevelSetValue=Level3 + set OptimizationSetValue=MaxSpeed + set FunctionLevelLinkingSetValue=true + set IntrinsicFunctionsSetValue=true + set PreprocessorDefinitionsSetValue=Win64;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS; + + set SubSystemSetValue=Windows + set GenerateDebugInformationSetValue=true + set EnableCOMDATFoldingSetValue=true + set OptimizeReferencesSetValue=true + + goto compile + ) + goto missingBuildConfiguration :compile @@ -141,15 +191,26 @@ msbuild %MSbuildName%.vcxproj /t:rebuild /p:PlatformToolset=%Toolset%;Configurat ::Copy ffd.dll to Output Directory ::******************************************************************* echo Copy %MSbuildName%.dll and %MSbuildName%.lib to %DIR% -copy "%BuildConfiguration%\%MSbuildName%.dll" "%DIR%" /Y -copy "%BuildConfiguration%\%MSbuildName%.lib" "%DIR%" /Y +if %Platform%==Win32 ( + copy "%BuildConfiguration%\%MSbuildName%.dll" "%DIR%" /Y + copy "%BuildConfiguration%\%MSbuildName%.lib" "%DIR%" /Y + ) +if %Platform%==X64 ( + copy "X64\%BuildConfiguration%\%MSbuildName%.dll" "%DIR%" /Y + copy "X64\%BuildConfiguration%\%MSbuildName%.lib" "%DIR%" /Y + ) ::Note: /y: Suppresses prompting to confirm that you want to overwrite an existing destination file. ::******************************************************************* ::Clean Build Folder ::******************************************************************* echo Clean %BuildConfiguration% Build Folder -rmdir %BuildConfiguration% /s /q +if %Platform%==Win32 ( + rmdir %BuildConfiguration% /s /q + ) +if %Platform%==X64 ( + rmdir X64 /s /q + ) goto :eof ::Note: /s: Removes the specified directory and all subdirectories including any files. diff --git a/Buildings/Resources/src/FastFluidDynamics/ffd.vcxproj b/Buildings/Resources/src/FastFluidDynamics/ffd.vcxproj index d95980482e0..c52b953913b 100644 --- a/Buildings/Resources/src/FastFluidDynamics/ffd.vcxproj +++ b/Buildings/Resources/src/FastFluidDynamics/ffd.vcxproj @@ -1,6 +1,6 @@  - +