Commit ffb2f61f authored by David Llewellyn-Jones's avatar David Llewellyn-Jones

Added OpenVDB support to Windows version. Updated Windows build scripts for version 0.35.

parent f435658c
......@@ -14,8 +14,8 @@
#include <errno.h>
#include <unistd.h>
#include <ovdbc.h>
#include "ovdbc.h"
#include "exportvdb.h"
#include "filesave.h"
......
......@@ -2,85 +2,94 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
<DirectoryRef Id="FunctyAssetsFolder">
<Component Id="functy.ui" Guid="{1718FABD-0105-4938-B8C6-71D7E8AA87CE}">
<Component Id="functy.ui" Guid="{D7E23FD2-ACC0-4F85-A1CE-E2B4EC159C03}">
<File Id="functy.ui" KeyPath="yes" Source="$(var.AssetsDir)\functy.ui" />
</Component>
<Component Id="Makefile.in" Guid="{516536EB-0F99-4286-96B9-02B31672511B}">
<File Id="Makefile.in" KeyPath="yes" Source="$(var.AssetsDir)\Makefile.in" />
</Component>
<Directory Id="icons" Name="icons">
<Component Id="export_anim.png" Guid="{47AF6037-4433-43D8-84F5-E77F1E6B7ABA}">
<Component Id="export_anim.png" Guid="{3B229E8D-7631-41FE-9470-5807C4D3F748}">
<File Id="export_anim.png" KeyPath="yes" Source="$(var.AssetsDir)\icons\export-anim.png" />
</Component>
<Component Id="export_model.png" Guid="{B0585285-E08A-4828-9647-3C3AAC853B09}">
<Component Id="export_model.png" Guid="{B3B74A3C-9165-45F3-9E10-622B54B9803F}">
<File Id="export_model.png" KeyPath="yes" Source="$(var.AssetsDir)\icons\export-model.png" />
</Component>
<Component Id="functy.png" Guid="{C741C0A2-0416-4034-97B6-BECF85388C01}">
<Component Id="functy.png" Guid="{ADCC732F-F09D-4800-BAB9-4043384327AA}">
<File Id="functy.png" KeyPath="yes" Source="$(var.AssetsDir)\icons\functy.png" />
</Component>
<Component Id="new_cartesian.png" Guid="{664876C3-4211-4D6C-8F9A-12063B875805}">
<Component Id="Makefile.in_1" Guid="{854D4670-A5F5-4792-A68E-E5D4C9378252}">
<File Id="Makefile.in_1" KeyPath="yes" Source="$(var.AssetsDir)\icons\Makefile.in" />
</Component>
<Component Id="new_cartesian.png" Guid="{8BC98299-A939-4E1A-A5DC-0CDFA5E9A6E2}">
<File Id="new_cartesian.png" KeyPath="yes" Source="$(var.AssetsDir)\icons\new-cartesian.png" />
</Component>
<Component Id="new_curve.png" Guid="{1CFF0F9E-A466-4361-ABAF-5028A16D01A2}">
<Component Id="new_curve.png" Guid="{08C73C5F-127D-454F-81BF-4474A613189C}">
<File Id="new_curve.png" KeyPath="yes" Source="$(var.AssetsDir)\icons\new-curve.png" />
</Component>
<Component Id="new_spherical.png" Guid="{3A4822CA-4AD4-4CD9-BAA2-D6678CA3D8F0}">
<Component Id="new_spherical.png" Guid="{41C1FC27-F314-46E4-A606-EBEE32711FE2}">
<File Id="new_spherical.png" KeyPath="yes" Source="$(var.AssetsDir)\icons\new-spherical.png" />
</Component>
<Component Id="panel_bottom.png" Guid="{DE381319-47E9-4FC2-BC86-6C55C576A952}">
<Component Id="panel_bottom.png" Guid="{D7DA4AC4-A836-41BA-96E1-D68F4BEF5DF3}">
<File Id="panel_bottom.png" KeyPath="yes" Source="$(var.AssetsDir)\icons\panel-bottom.png" />
</Component>
<Component Id="panel_left.png" Guid="{0D3B14F3-3F4E-4386-B0F4-FF63DF6D9D84}">
<Component Id="panel_left.png" Guid="{42328DE2-AAAB-45F7-A8FD-0CC8E2614F48}">
<File Id="panel_left.png" KeyPath="yes" Source="$(var.AssetsDir)\icons\panel-left.png" />
</Component>
</Directory>
<Directory Id="shaders" Name="shaders">
<Component Id="cartesian_shadow.fs" Guid="{D43A5687-5D15-4FB7-9F19-27CB747EC498}">
<Component Id="cartesian_shadow.fs" Guid="{2E5710EB-7058-4C58-B8D7-55CC4F6AFAA8}">
<File Id="cartesian_shadow.fs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\cartesian-shadow.fs" />
</Component>
<Component Id="cartesian_shadow.vs" Guid="{7DAC6BF0-AF8C-40D6-A76C-9D323060E29F}">
<Component Id="cartesian_shadow.vs" Guid="{0E133BB1-E3C8-429C-9464-17C0C9971F0B}">
<File Id="cartesian_shadow.vs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\cartesian-shadow.vs" />
</Component>
<Component Id="cartesian.fs" Guid="{62ACC012-D17A-4B70-A0B2-D1A531977818}">
<Component Id="cartesian.fs" Guid="{6D8725BA-13D1-47DB-A392-8E14977A1A55}">
<File Id="cartesian.fs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\cartesian.fs" />
</Component>
<Component Id="cartesian.vs" Guid="{A1CFA491-5AC5-4832-BDFB-B191EB45E2FA}">
<Component Id="cartesian.vs" Guid="{A5C7CABF-66A0-49A2-921B-166F50B0BA4A}">
<File Id="cartesian.vs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\cartesian.vs" />
</Component>
<Component Id="curve_shadow.fs" Guid="{8A34A407-19A9-4307-9E2B-107A7BC0D8D8}">
<Component Id="curve_shadow.fs" Guid="{AD994E30-94CD-44F4-B231-2CC10BDBB88C}">
<File Id="curve_shadow.fs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\curve-shadow.fs" />
</Component>
<Component Id="curve_shadow.vs" Guid="{B6CC05B2-3026-4D69-AD19-0845F177299B}">
<Component Id="curve_shadow.vs" Guid="{4243DD13-6AA0-406F-B36C-10D1B5C0CB66}">
<File Id="curve_shadow.vs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\curve-shadow.vs" />
</Component>
<Component Id="curve.fs" Guid="{D80E51E3-C3B0-48D1-A019-E031874C0FC4}">
<Component Id="curve.fs" Guid="{8E1359DC-DD9D-4662-B756-62474840B1B9}">
<File Id="curve.fs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\curve.fs" />
</Component>
<Component Id="curve.vs" Guid="{A89ABAAA-8EF2-452E-8194-C2CF50BB5E22}">
<Component Id="curve.vs" Guid="{E0A44237-A6E0-42FA-BB46-1D0D464B5C2B}">
<File Id="curve.vs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\curve.vs" />
</Component>
<Component Id="depth.fs" Guid="{D5251F94-7CB3-4E20-AC13-0623FD4AF4F2}">
<Component Id="depth.fs" Guid="{7B96FA28-5062-4A79-9354-F4B94D767A5F}">
<File Id="depth.fs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\depth.fs" />
</Component>
<Component Id="depth.vs" Guid="{7DE9ED08-4374-4658-B3CE-F1A8B6B3C880}">
<Component Id="depth.vs" Guid="{430A62B1-F13F-4632-BB04-FAD17EB0DF60}">
<File Id="depth.vs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\depth.vs" />
</Component>
<Component Id="screen.fs" Guid="{A4129AA1-5352-47E0-A63C-3B71CC97EB93}">
<Component Id="Makefile.in_2" Guid="{79DE700F-21AF-4DBB-8863-7E8EB5C7C635}">
<File Id="Makefile.in_2" KeyPath="yes" Source="$(var.AssetsDir)\shaders\Makefile.in" />
</Component>
<Component Id="screen.fs" Guid="{0BA482D4-ED16-4C4B-A305-0A74D6A587E2}">
<File Id="screen.fs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\screen.fs" />
</Component>
<Component Id="screen.vs" Guid="{E11FB62F-6EBE-4A8A-8037-DDB4E45A77CC}">
<Component Id="screen.vs" Guid="{C3CB7238-293F-4E08-AF63-C1516FC79BC3}">
<File Id="screen.vs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\screen.vs" />
</Component>
<Component Id="spherical_shadow.fs" Guid="{69909A17-D7DD-4709-A4F1-C76F026C8ECC}">
<Component Id="spherical_shadow.fs" Guid="{27D2F40C-29EE-4D68-BD76-7D5A69E17B6B}">
<File Id="spherical_shadow.fs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\spherical-shadow.fs" />
</Component>
<Component Id="spherical_shadow.vs" Guid="{79E82100-6E54-467B-8B9A-4BAE97B606AA}">
<Component Id="spherical_shadow.vs" Guid="{D1EFAFDF-7206-4DB7-97B5-158FB64C47AA}">
<File Id="spherical_shadow.vs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\spherical-shadow.vs" />
</Component>
<Component Id="spherical.fs" Guid="{B24AE53C-B092-4239-84A5-559636D95E0D}">
<Component Id="spherical.fs" Guid="{857F8630-33A1-4278-9465-D9CA621C32D8}">
<File Id="spherical.fs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\spherical.fs" />
</Component>
<Component Id="spherical.vs" Guid="{24ABD582-9499-4967-B376-05FE41C13E35}">
<Component Id="spherical.vs" Guid="{65FCCDDB-2B03-4DFB-821F-8AF5C6B8CF62}">
<File Id="spherical.vs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\spherical.vs" />
</Component>
</Directory>
......@@ -88,12 +97,15 @@
</Fragment>
<Fragment>
<ComponentGroup Id="FunctyAssets">
<ComponentRef Id="COPYING" />
<ComponentRef Id="functy.ui" />
<ComponentRef Id="Makefile.in" />
<ComponentRef Id="export_anim.png" />
<ComponentRef Id="export_model.png" />
<ComponentRef Id="functy.png" />
<ComponentRef Id="Makefile.in_1" />
<ComponentRef Id="new_cartesian.png" />
<ComponentRef Id="new_curve.png" />
<ComponentRef Id="new_spherical.png" />
......@@ -110,6 +122,7 @@
<ComponentRef Id="depth.fs" />
<ComponentRef Id="depth.vs" />
<ComponentRef Id="Makefile.in_2" />
<ComponentRef Id="screen.fs" />
<ComponentRef Id="screen.vs" />
<ComponentRef Id="spherical_shadow.fs" />
......
......@@ -10,10 +10,12 @@ del *.o
gcc -DFUNCTYDIR=\"./assets\" -DVERSION=\"%productversion%\" -c -Wall -mwindows -mms-bitfields -I"%GTK_BASEPATH%\include\gtk-2.0" -I"%GTK_BASEPATH%\include\cairo" -I"%GTK_BASEPATH%\include\glib-2.0" -I"%GTK_BASEPATH%\include\pango-1.0" -I"%GTK_BASEPATH%\lib\gtk-2.0\include" -I"%GTK_BASEPATH%\lib\glib-2.0\include" -I"%GTK_BASEPATH%\include\atk-1.0" -I"%GTK_BASEPATH%\include" -I"%GTK_BASEPATH%\include\gtkglext-1.0" -I"%GTK_BASEPATH%\lib\gtkglext-1.0\include" -I"%GTK_BASEPATH%\include\gdk-pixbuf-2.0" -I"..\..\freeglut\include" -I"..\..\GLee" -I"..\..\Symbolic\src" -I"..\..\libzip\lib" *.c
g++ -DFUNCTYDIR=\"./assets\" -DVERSION=\"%productversion%\" -DOPENVDB_OPENEXR_STATICLIB=\"1\" -UOPENEXR_DLL -DHALF_EXPORTS=\"1\" -c -w -mwindows -mms-bitfields -I"%GTK_BASEPATH%\include\gtk-2.0" -I"%GTK_BASEPATH%\include\cairo" -I"%GTK_BASEPATH%\include\glib-2.0" -I"%GTK_BASEPATH%\include\pango-1.0" -I"%GTK_BASEPATH%\lib\gtk-2.0\include" -I"%GTK_BASEPATH%\lib\glib-2.0\include" -I"%GTK_BASEPATH%\include\atk-1.0" -I"%GTK_BASEPATH%\include" -I"%GTK_BASEPATH%\include\gtkglext-1.0" -I"%GTK_BASEPATH%\lib\gtkglext-1.0\include" -I"%GTK_BASEPATH%\include\gdk-pixbuf-2.0" -I"..\..\freeglut\include" -I"..\..\GLee" -I"..\..\Symbolic\src" -I"..\..\libzip\lib" -I"..\..\openvdb" -I"..\..\openvdb\boost" -I"..\..\openvdb\ilmbase\Half" -I"..\..\openvdb\tbb\include" *.cpp
dlltool --output-def functy.def functy.o
dlltool --dllname functy.exe --def functy.def --output-exp functy.exp
gcc -DUSE_GLADE -g -O2 -mwindows *.o functy.exp -L"%GTK_BASEPATH%\lib" -Wl,-luuid -lgtkglext-win32-1.0 -lgdkglext-win32-1.0 -lglu32 -lGLee -luser32 -lkernel32 -lopengl32 -lgtk-win32-2.0 -lglib-2.0 -lgdk-win32-2.0 -lgdk_pixbuf-2.0 -limm32 -lshell32 -lole32 -latk-1.0 -lpangocairo-1.0 -lcairo -lpangoft2-1.0 -lpangowin32-1.0 -lgdi32 -lz -lpango-1.0 -lgobject-2.0 -lm -lgmodule-2.0 -lgio-2.0 -L"..\..\freeglut\lib" -lfreeglut -L"..\..\GLee" -L"..\..\libzip\lib" -lzip -lintl -llibpng -L"..\..\Symbolic" -lsymbolic -o ..\functy.exe
g++ -DUSE_GLADE -g -O2 -mwindows *.o functy.exp -L"%GTK_BASEPATH%\lib" -Wl,-luuid -lgtkglext-win32-1.0 -lgdkglext-win32-1.0 -lglu32 -lGLee -luser32 -lkernel32 -lopengl32 -lgtk-win32-2.0 -lglib-2.0 -lgdk-win32-2.0 -lgdk_pixbuf-2.0 -limm32 -lshell32 -lole32 -latk-1.0 -lpangocairo-1.0 -lcairo -lpangoft2-1.0 -lpangowin32-1.0 -lgdi32 -lz -lpango-1.0 -lgobject-2.0 -lm -lgmodule-2.0 -lgio-2.0 -L"..\..\freeglut\lib" -lfreeglut -L"..\..\GLee" -L"..\..\libzip\lib" -lzip -lintl -llibpng -L"..\..\Symbolic" -lsymbolic -L"..\..\openvdb" -lhalf -lopenvdb ..\..\openvdb\tbb.dll ..\..\openvdb\zlib1.dll -L"..\..\openvdb\boost\stage\lib" -lboost_system-mgw48-mt-1_58 -lboost_iostreams-mgw48-mt-1_58 -o ..\functy.exe
cd ..
:End
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment