From 1bc9ded7acbe446ff1836eaece0dfcbbf6188e94 Mon Sep 17 00:00:00 2001 From: Person Date: Mon, 17 Sep 2018 19:54:26 -0700 Subject: [PATCH] --Code changes -Update dependencies build script to use the latest version of openexr and other libraries. -Update windows platform version. --- .gitignore | 2 + Builds/MSVC/Installer/Product.wxs | 20 ++++----- Builds/MSVC/VS2017/Ember.vcxproj | 2 +- Builds/MSVC/VS2017/EmberAnimate.vcxproj | 6 +-- Builds/MSVC/VS2017/EmberCL.vcxproj | 2 +- Builds/MSVC/VS2017/EmberGenome.vcxproj | 6 +-- Builds/MSVC/VS2017/EmberRender.vcxproj | 6 +-- Builds/MSVC/VS2017/EmberTester.vcxproj | 6 +-- Builds/MSVC/VS2017/Fractorium.vcxproj | 6 +-- Builds/QtCreator/defaults.pri | 16 ++++---- makedeps.bat | 54 ++++++++++++++++++++----- 11 files changed, 82 insertions(+), 44 deletions(-) diff --git a/.gitignore b/.gitignore index 2a06ed7..8ffb076 100644 --- a/.gitignore +++ b/.gitignore @@ -255,3 +255,5 @@ Builds/include/GL *last.flame /Source/Fractorium/Fractorium - Copy.ui /.vs/slnx.sqlite +/Deps/Include/OpenEXR +/main.pro.user.294b646 diff --git a/Builds/MSVC/Installer/Product.wxs b/Builds/MSVC/Installer/Product.wxs index 03436ff..d461fdf 100644 --- a/Builds/MSVC/Installer/Product.wxs +++ b/Builds/MSVC/Installer/Product.wxs @@ -142,20 +142,20 @@ - - + + - - + + - - + + - - + + - - + + diff --git a/Builds/MSVC/VS2017/Ember.vcxproj b/Builds/MSVC/VS2017/Ember.vcxproj index 9dbc1f7..ef72749 100644 --- a/Builds/MSVC/VS2017/Ember.vcxproj +++ b/Builds/MSVC/VS2017/Ember.vcxproj @@ -15,7 +15,7 @@ Win32Proj EmberNs Ember - 10.0.15063.0 + 10.0.16299.0 diff --git a/Builds/MSVC/VS2017/EmberAnimate.vcxproj b/Builds/MSVC/VS2017/EmberAnimate.vcxproj index 16f65ae..ed35c8a 100644 --- a/Builds/MSVC/VS2017/EmberAnimate.vcxproj +++ b/Builds/MSVC/VS2017/EmberAnimate.vcxproj @@ -15,7 +15,7 @@ Win32Proj EmberAnimate EmberAnimate - 10.0.15063.0 + 10.0.16299.0 @@ -73,7 +73,7 @@ Console DebugFull - libjpeg.lib;libpng.lib;libxml2.lib;tbb.lib;zlib.lib;Half.lib;Iex.lib;IlmImf.lib;opencl.lib;Ws2_32.lib;%(AdditionalDependencies) + libjpeg.lib;libpng.lib;libxml2.lib;tbb.lib;zlib.lib;Half-2_3.lib;Iex-2_3.lib;IlmImf-2_3.lib;opencl.lib;Ws2_32.lib;%(AdditionalDependencies) $(ProjectDir)..\..\..\Deps;$(AMDAPPSDKROOT)\lib\x86_64;$(CUDA_PATH)\lib\$(PlatformName) @@ -106,7 +106,7 @@ xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\flam3-palettes.xml" "$(OutDir)" DebugFull true true - libjpeg.lib;libpng.lib;libxml2.lib;tbb.lib;zlib.lib;Half.lib;Iex.lib;IlmImf.lib;opencl.lib;Ws2_32.lib;%(AdditionalDependencies) + libjpeg.lib;libpng.lib;libxml2.lib;tbb.lib;zlib.lib;Half-2_3.lib;Iex-2_3.lib;IlmImf-2_3.lib;opencl.lib;Ws2_32.lib;%(AdditionalDependencies) $(ProjectDir)..\..\..\Deps;$(AMDAPPSDKROOT)\lib\x86_64;$(CUDA_PATH)\lib\$(PlatformName) diff --git a/Builds/MSVC/VS2017/EmberCL.vcxproj b/Builds/MSVC/VS2017/EmberCL.vcxproj index 26f294f..073500c 100644 --- a/Builds/MSVC/VS2017/EmberCL.vcxproj +++ b/Builds/MSVC/VS2017/EmberCL.vcxproj @@ -15,7 +15,7 @@ Win32Proj EmberCLns EmberCL - 10.0.15063.0 + 10.0.16299.0 diff --git a/Builds/MSVC/VS2017/EmberGenome.vcxproj b/Builds/MSVC/VS2017/EmberGenome.vcxproj index e3a3580..c603a3c 100644 --- a/Builds/MSVC/VS2017/EmberGenome.vcxproj +++ b/Builds/MSVC/VS2017/EmberGenome.vcxproj @@ -15,7 +15,7 @@ Win32Proj EmberGenome EmberGenome - 10.0.15063.0 + 10.0.16299.0 @@ -73,7 +73,7 @@ Console DebugFull - libjpeg.lib;libpng.lib;libxml2.lib;tbb.lib;zlib.lib;Half.lib;Iex.lib;IlmImf.lib;opencl.lib;Ws2_32.lib;%(AdditionalDependencies) + libjpeg.lib;libpng.lib;libxml2.lib;tbb.lib;zlib.lib;Half-2_3.lib;Iex-2_3.lib;IlmImf-2_3.lib;opencl.lib;Ws2_32.lib;%(AdditionalDependencies) $(ProjectDir)..\..\..\Deps;$(AMDAPPSDKROOT)\lib\x86_64;$(CUDA_PATH)\lib\$(PlatformName) @@ -106,7 +106,7 @@ xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\flam3-palettes.xml" "$(OutDir)" DebugFull true true - libjpeg.lib;libpng.lib;libxml2.lib;tbb.lib;zlib.lib;Half.lib;Iex.lib;IlmImf.lib;opencl.lib;Ws2_32.lib;%(AdditionalDependencies) + libjpeg.lib;libpng.lib;libxml2.lib;tbb.lib;zlib.lib;Half-2_3.lib;Iex-2_3.lib;IlmImf-2_3.lib;opencl.lib;Ws2_32.lib;%(AdditionalDependencies) $(ProjectDir)..\..\..\Deps;$(AMDAPPSDKROOT)\lib\x86_64;$(CUDA_PATH)\lib\$(PlatformName) diff --git a/Builds/MSVC/VS2017/EmberRender.vcxproj b/Builds/MSVC/VS2017/EmberRender.vcxproj index 10826d4..d276c1a 100644 --- a/Builds/MSVC/VS2017/EmberRender.vcxproj +++ b/Builds/MSVC/VS2017/EmberRender.vcxproj @@ -15,7 +15,7 @@ Win32Proj EmberRender EmberRender - 10.0.15063.0 + 10.0.16299.0 @@ -73,7 +73,7 @@ Console DebugFull - libjpeg.lib;libpng.lib;libxml2.lib;tbb.lib;zlib.lib;Half.lib;Iex.lib;IlmImf.lib;opencl.lib;Ws2_32.lib;%(AdditionalDependencies) + libjpeg.lib;libpng.lib;libxml2.lib;tbb.lib;zlib.lib;Half-2_3.lib;Iex-2_3.lib;IlmImf-2_3.lib;opencl.lib;Ws2_32.lib;%(AdditionalDependencies) $(ProjectDir)..\..\..\Deps;$(AMDAPPSDKROOT)\lib\x86_64;$(CUDA_PATH)\lib\$(PlatformName) @@ -107,7 +107,7 @@ xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\flam3-palettes.xml" "$(OutDir)" DebugFull true true - libjpeg.lib;libpng.lib;libxml2.lib;tbb.lib;zlib.lib;Half.lib;Iex.lib;IlmImf.lib;opencl.lib;Ws2_32.lib;%(AdditionalDependencies) + libjpeg.lib;libpng.lib;libxml2.lib;tbb.lib;zlib.lib;Half-2_3.lib;Iex-2_3.lib;IlmImf-2_3.lib;opencl.lib;Ws2_32.lib;%(AdditionalDependencies) $(ProjectDir)..\..\..\Deps;$(AMDAPPSDKROOT)\lib\x86_64;$(CUDA_PATH)\lib\$(PlatformName) diff --git a/Builds/MSVC/VS2017/EmberTester.vcxproj b/Builds/MSVC/VS2017/EmberTester.vcxproj index af3932c..664d984 100644 --- a/Builds/MSVC/VS2017/EmberTester.vcxproj +++ b/Builds/MSVC/VS2017/EmberTester.vcxproj @@ -15,7 +15,7 @@ Win32Proj EmberTester EmberTester - 10.0.15063.0 + 10.0.16299.0 @@ -73,7 +73,7 @@ Console DebugFull - libjpeg.lib;libpng.lib;libxml2.lib;tbb.lib;zlib.lib;Half.lib;IlmImf.lib;opencl.lib;Ws2_32.lib;%(AdditionalDependencies) + libjpeg.lib;libpng.lib;libxml2.lib;tbb.lib;zlib.lib;Half-2_3.lib;Iex-2_3.lib;IlmImf-2_3.lib;opencl.lib;Ws2_32.lib;%(AdditionalDependencies) $(ProjectDir)..\..\..\Deps;$(AMDAPPSDKROOT)\lib\x86_64;$(CUDA_PATH)\lib\$(PlatformName) @@ -106,7 +106,7 @@ xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Data\flam3-palettes.xml" "$(OutDir)" DebugFull true true - libjpeg.lib;libpng.lib;libxml2.lib;tbb.lib;zlib.lib;Half.lib;IlmImf.lib;opencl.lib;Ws2_32.lib;%(AdditionalDependencies) + libjpeg.lib;libpng.lib;libxml2.lib;tbb.lib;zlib.lib;Half-2_3.lib;Iex-2_3.lib;IlmImf-2_3.lib;opencl.lib;Ws2_32.lib;%(AdditionalDependencies) $(ProjectDir)..\..\..\Deps;$(AMDAPPSDKROOT)\lib\x86_64;$(CUDA_PATH)\lib\$(PlatformName) diff --git a/Builds/MSVC/VS2017/Fractorium.vcxproj b/Builds/MSVC/VS2017/Fractorium.vcxproj index 26b5ead..ba4accd 100644 --- a/Builds/MSVC/VS2017/Fractorium.vcxproj +++ b/Builds/MSVC/VS2017/Fractorium.vcxproj @@ -13,7 +13,7 @@ {6547D5FA-64CE-44BA-9D3C-B6E217456445} Qt4VSv1.0 - 10.0.15063.0 + 10.0.16299.0 @@ -82,7 +82,7 @@ $(OutDir)\$(ProjectName).exe $(ProjectDir)..\..\..\Deps;$(QTDIR)\lib;$(AMDAPPSDKROOT)\lib\x86_64;$(CUDA_PATH)\lib\$(PlatformName);%(AdditionalLibraryDirectories) DebugFull - qtmaind.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5OpenGLd.lib;opengl32.lib;glu32.lib;opencl.lib;Qt5Widgetsd.lib;Qt5Xmld.lib;Ws2_32.lib;libjpeg.lib;libpng.lib;libxml2.lib;tbb.lib;zlib.lib;Half.lib;Iex.lib;IlmImf.lib;%(AdditionalDependencies) + qtmaind.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5OpenGLd.lib;opengl32.lib;glu32.lib;opencl.lib;Qt5Widgetsd.lib;Qt5Xmld.lib;Ws2_32.lib;libjpeg.lib;libpng.lib;libxml2.lib;tbb.lib;zlib.lib;Half-2_3.lib;Iex-2_3.lib;IlmImf-2_3.lib;%(AdditionalDependencies) xcopy /F /Y /R /D "$(SolutionDir)..\..\..\Deps\*.dll" "$(OutDir)" @@ -139,7 +139,7 @@ xcopy /F /Y /R /D "$(QTDIR)\plugins\platforms\qwindowsd.dll" "$(OutDir)\platform $(OutDir)\$(ProjectName).exe $(ProjectDir)..\..\..\Deps;$(QTDIR)\lib;$(AMDAPPSDKROOT)\lib\x86_64;$(CUDA_PATH)\lib\$(PlatformName);%(AdditionalLibraryDirectories) DebugFull - qtmain.lib;Qt5Core.lib;Qt5Gui.lib;Qt5OpenGL.lib;opengl32.lib;glu32.lib;opencl.lib;Qt5Widgets.lib;Ws2_32.lib;libjpeg.lib;libpng.lib;libxml2.lib;tbb.lib;zlib.lib;Half.lib;Iex.lib;IlmImf.lib;%(AdditionalDependencies) + qtmain.lib;Qt5Core.lib;Qt5Gui.lib;Qt5OpenGL.lib;opengl32.lib;glu32.lib;opencl.lib;Qt5Widgets.lib;Ws2_32.lib;libjpeg.lib;libpng.lib;libxml2.lib;tbb.lib;zlib.lib;Half-2_3.lib;Iex-2_3.lib;IlmImf-2_3.lib;%(AdditionalDependencies) 0.1 diff --git a/Builds/QtCreator/defaults.pri b/Builds/QtCreator/defaults.pri index 84c8367..4645b99 100644 --- a/Builds/QtCreator/defaults.pri +++ b/Builds/QtCreator/defaults.pri @@ -85,9 +85,9 @@ else { LIBS += $$absolute_path($$EXTERNAL_LIB)/libxml2.lib LIBS += $$absolute_path($$EXTERNAL_LIB)/tbb.lib LIBS += $$absolute_path($$EXTERNAL_LIB)/zlib.lib - LIBS += $$absolute_path($$EXTERNAL_LIB)/Half.lib - LIBS += $$absolute_path($$EXTERNAL_LIB)/Iex.lib - LIBS += $$absolute_path($$EXTERNAL_LIB)/IlmImf.lib + LIBS += $$absolute_path($$EXTERNAL_LIB)/Half-2_3.lib + LIBS += $$absolute_path($$EXTERNAL_LIB)/Iex-2_3.lib + LIBS += $$absolute_path($$EXTERNAL_LIB)/IlmImf-2_3.lib } !win32 { @@ -253,23 +253,23 @@ win32 { INSTALLS += tbb half.path = $$BIN_INSTALL_DIR - half.files = $$absolute_path($$EMBER_ROOT/Deps/Half.dll) + half.files = $$absolute_path($$EMBER_ROOT/Deps/Half-2_3.dll) INSTALLS += half iex.path = $$BIN_INSTALL_DIR - iex.files = $$absolute_path($$EMBER_ROOT/Deps/Iex-2_2.dll) + iex.files = $$absolute_path($$EMBER_ROOT/Deps/Iex-2_3.dll) INSTALLS += iex imath.path = $$BIN_INSTALL_DIR - imath.files = $$absolute_path($$EMBER_ROOT/Deps/Imath-2_2.dll) + imath.files = $$absolute_path($$EMBER_ROOT/Deps/Imath-2_3.dll) INSTALLS += imath ilmthread.path = $$BIN_INSTALL_DIR - ilmthread.files = $$absolute_path($$EMBER_ROOT/Deps/IlmThread-2_2.dll) + ilmthread.files = $$absolute_path($$EMBER_ROOT/Deps/IlmThread-2_3.dll) INSTALLS += ilmthread ilmimf.path = $$BIN_INSTALL_DIR - ilmimf.files = $$absolute_path($$EMBER_ROOT/Deps/IlmImf-2_2.dll) + ilmimf.files = $$absolute_path($$EMBER_ROOT/Deps/IlmImf-2_3.dll) INSTALLS += ilmimf } diff --git a/makedeps.bat b/makedeps.bat index 1237332..71b4a50 100644 --- a/makedeps.bat +++ b/makedeps.bat @@ -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