mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-07-06 08:14:49 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

--Code changes

Browse Source 
-Update dependencies build script to use the latest version of openexr and other libraries.
 -Update windows platform version.
This commit is contained in:
Person
2018-09-17 19:54:26 -07:00
parent 15fdc860b8
commit 1bc9ded7ac
11 changed files with 82 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
makedeps.bat
View File

@ -7,14 +7,13 @@ git clone https://github.com/madler/zlib.git
git clone https://github.com/glennrp/libpng.git
git clone https://github.com/GNOME/libxml2.git
git clone https://github.com/g-truc/glm.git
REM Set VC paths
set INCLUDE=%INCLUDE%;C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Include;C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Include;C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin;
git clone -b tbb_2019 https://github.com/01org/tbb.git
git clone -b v2.3.0 https://github.com/openexr/openexr.git
REM libjpeg
copy fractorium\Builds\MSVC\WIN32.MAK libjpeg
cd libjpeg
nmake /f makefile.vc setup-v10 CPU=i386
nmake /f makefile.vc setup-v15 CPU=i386
nmake nodebug=1 /f makefile.vc all CPU=i386
copy libjpeg.lib ..\fractorium\Deps
cd ..
@ -45,13 +44,50 @@ copy libpng.lib ..\fractorium\Deps
cd ..
REM tbb
cd tbb\build\vs2012
devenv.exe tbb.vcxproj /upgrade
msbuild tbb.vcxproj /p:Configuration=Release
cd tbb\build\vs2013
set "curdir=%cd%"
devenv.exe makefile.sln /upgrade
cd %curdir%
Change PlatformToolset and WindowsTargetPlatformVersion to match whatever your version of Visual Studio supports. You can find this by opening makefile.sln in tbb\build\vs2013
msbuild tbb.vcxproj /p:Configuration=Release /p:Platform=x64 /p:PlatformToolset=v141 /p:WindowsTargetPlatformVersion=10.0.16299.0
copy X64\Release\tbb.dll ..\..\..\fractorium\Deps
copy X64\Release\tbb.lib ..\..\..\fractorium\Deps
cd ..\..\..
cd fractorium
openexr.cmd
REM openexr
cd openexr
SET current=%cd%
if not exist ".\output" mkdir .\output
cd ..\OpenEXR
cmake -G "Visual Studio 15 2017 Win64"^
-DCMAKE_PREFIX_PATH="%current%\output"^
-DCMAKE_INSTALL_PREFIX="%current%\output"^
-DILMBASE_PACKAGE_PREFIX="%current%\output" ^
-DZLIB_ROOT="..\zlib"^
-DOPENEXR_BUILD_SHARED_LIBS="ON"^
-DOPENEXR_BUILD_VIEWERS="OFF"^
-DOPENEXR_BUILD_STATIC_LIBS="OFF"^
-DOPENEXR_BUILD_PYTHON_LIBS="OFF"^
-DOPENEXR_ENABLE_TESTS="OFF"^
.\
cmake --build . --target install --config Release
cd %current%
copy %current%\output\lib\Half-2_3.lib %current%\..\fractorium\Deps\Half-2_3.lib
copy %current%\output\lib\Iex-2_3.lib %current%\..\fractorium\Deps\Iex-2_3.lib
copy %current%\output\lib\IexMath-2_3.lib %current%\..\fractorium\Deps\IexMath-2_3.lib
copy %current%\output\lib\IlmImf-2_3.lib %current%\..\fractorium\Deps\IlmImf-2_3.lib
copy %current%\output\lib\IlmImfUtil-2_3.lib %current%\..\fractorium\Deps\IlmImfUtil-2_3.lib
copy %current%\output\lib\IlmThread-2_3.lib %current%\..\fractorium\Deps\IlmThread-2_3.lib
copy %current%\output\lib\Imath-2_3.lib %current%\..\fractorium\Deps\Imath-2_3.lib
copy %current%\OpenEXR\IlmImf\Release\IlmImf-2_3.dll %current%\..\fractorium\Deps\IlmImf-2_3.dll
xcopy %current%\output\Include %current%\..\fractorium\Deps\Include\ /S /Y
xcopy %current%\output\bin\*.dll %current%\..\fractorium\Deps\ /Y
cd ..\fractorium