Commit 725a56ad authored by David Llewellyn-Jones's avatar David Llewellyn-Jones

Updated Windows WiX installer build to include a couple of required gcc dlls.

parent ffb2f61f
......@@ -2,94 +2,94 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
<DirectoryRef Id="FunctyAssetsFolder">
<Component Id="functy.ui" Guid="{D7E23FD2-ACC0-4F85-A1CE-E2B4EC159C03}">
<Component Id="functy.ui" Guid="{AAE01815-6596-47A6-A4F9-3A6DF873371F}">
<File Id="functy.ui" KeyPath="yes" Source="$(var.AssetsDir)\functy.ui" />
</Component>
<Component Id="Makefile.in" Guid="{516536EB-0F99-4286-96B9-02B31672511B}">
<Component Id="Makefile.in" Guid="{BBEE6726-9A5A-438B-B3D9-25A14F8445A4}">
<File Id="Makefile.in" KeyPath="yes" Source="$(var.AssetsDir)\Makefile.in" />
</Component>
<Directory Id="icons" Name="icons">
<Component Id="export_anim.png" Guid="{3B229E8D-7631-41FE-9470-5807C4D3F748}">
<Component Id="export_anim.png" Guid="{55D4D3CE-75B5-4A4E-9057-B9523B8D7E05}">
<File Id="export_anim.png" KeyPath="yes" Source="$(var.AssetsDir)\icons\export-anim.png" />
</Component>
<Component Id="export_model.png" Guid="{B3B74A3C-9165-45F3-9E10-622B54B9803F}">
<Component Id="export_model.png" Guid="{0DEB892F-7682-4990-94D6-AE18C10B9ED8}">
<File Id="export_model.png" KeyPath="yes" Source="$(var.AssetsDir)\icons\export-model.png" />
</Component>
<Component Id="functy.png" Guid="{ADCC732F-F09D-4800-BAB9-4043384327AA}">
<Component Id="functy.png" Guid="{94A2B4E5-C0B4-49D1-A085-83474952D1F2}">
<File Id="functy.png" KeyPath="yes" Source="$(var.AssetsDir)\icons\functy.png" />
</Component>
<Component Id="Makefile.in_1" Guid="{854D4670-A5F5-4792-A68E-E5D4C9378252}">
<Component Id="Makefile.in_1" Guid="{26848877-DE42-48B5-A722-95D66D2FAA04}">
<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}">
<Component Id="new_cartesian.png" Guid="{406B352C-2CC3-4DF4-99A9-8BA4666F8DC6}">
<File Id="new_cartesian.png" KeyPath="yes" Source="$(var.AssetsDir)\icons\new-cartesian.png" />
</Component>
<Component Id="new_curve.png" Guid="{08C73C5F-127D-454F-81BF-4474A613189C}">
<Component Id="new_curve.png" Guid="{57B58311-D2A3-455A-8363-2D1A9D7C0C11}">
<File Id="new_curve.png" KeyPath="yes" Source="$(var.AssetsDir)\icons\new-curve.png" />
</Component>
<Component Id="new_spherical.png" Guid="{41C1FC27-F314-46E4-A606-EBEE32711FE2}">
<Component Id="new_spherical.png" Guid="{7C46117A-B8F3-497A-88A3-7EA8C85FD99A}">
<File Id="new_spherical.png" KeyPath="yes" Source="$(var.AssetsDir)\icons\new-spherical.png" />
</Component>
<Component Id="panel_bottom.png" Guid="{D7DA4AC4-A836-41BA-96E1-D68F4BEF5DF3}">
<Component Id="panel_bottom.png" Guid="{1A6905A0-B1AE-4471-BAE7-BDB8C44072F7}">
<File Id="panel_bottom.png" KeyPath="yes" Source="$(var.AssetsDir)\icons\panel-bottom.png" />
</Component>
<Component Id="panel_left.png" Guid="{42328DE2-AAAB-45F7-A8FD-0CC8E2614F48}">
<Component Id="panel_left.png" Guid="{FECA3E4A-3700-4ED9-AEEC-69824FC5C0CC}">
<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="{2E5710EB-7058-4C58-B8D7-55CC4F6AFAA8}">
<Component Id="cartesian_shadow.fs" Guid="{12B7B669-0EE6-4130-B993-CE656A903E34}">
<File Id="cartesian_shadow.fs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\cartesian-shadow.fs" />
</Component>
<Component Id="cartesian_shadow.vs" Guid="{0E133BB1-E3C8-429C-9464-17C0C9971F0B}">
<Component Id="cartesian_shadow.vs" Guid="{6FC5FC30-E074-4DD2-8878-1BAD16DA30E0}">
<File Id="cartesian_shadow.vs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\cartesian-shadow.vs" />
</Component>
<Component Id="cartesian.fs" Guid="{6D8725BA-13D1-47DB-A392-8E14977A1A55}">
<Component Id="cartesian.fs" Guid="{D35158BF-9B3E-4B3F-8649-BA55D0ABF57E}">
<File Id="cartesian.fs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\cartesian.fs" />
</Component>
<Component Id="cartesian.vs" Guid="{A5C7CABF-66A0-49A2-921B-166F50B0BA4A}">
<Component Id="cartesian.vs" Guid="{AC74CDCC-A51B-4271-B964-6A8B0C6EF80C}">
<File Id="cartesian.vs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\cartesian.vs" />
</Component>
<Component Id="curve_shadow.fs" Guid="{AD994E30-94CD-44F4-B231-2CC10BDBB88C}">
<Component Id="curve_shadow.fs" Guid="{CAE82EC6-550D-44DD-9B5B-9EA25B7D0C5C}">
<File Id="curve_shadow.fs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\curve-shadow.fs" />
</Component>
<Component Id="curve_shadow.vs" Guid="{4243DD13-6AA0-406F-B36C-10D1B5C0CB66}">
<Component Id="curve_shadow.vs" Guid="{74537A04-7C89-4B6D-9967-E686DAF7F167}">
<File Id="curve_shadow.vs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\curve-shadow.vs" />
</Component>
<Component Id="curve.fs" Guid="{8E1359DC-DD9D-4662-B756-62474840B1B9}">
<Component Id="curve.fs" Guid="{00B4E78A-1FD5-40AE-8BD1-30C4CDD25A11}">
<File Id="curve.fs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\curve.fs" />
</Component>
<Component Id="curve.vs" Guid="{E0A44237-A6E0-42FA-BB46-1D0D464B5C2B}">
<Component Id="curve.vs" Guid="{ABE07A6F-342A-4DB7-8D65-D9B3296FF92A}">
<File Id="curve.vs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\curve.vs" />
</Component>
<Component Id="depth.fs" Guid="{7B96FA28-5062-4A79-9354-F4B94D767A5F}">
<Component Id="depth.fs" Guid="{001CEDD5-8FCD-4825-BADA-F37DA26255AA}">
<File Id="depth.fs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\depth.fs" />
</Component>
<Component Id="depth.vs" Guid="{430A62B1-F13F-4632-BB04-FAD17EB0DF60}">
<Component Id="depth.vs" Guid="{C0309FE6-BE2A-49E3-AB12-6BBE4BE1FD3F}">
<File Id="depth.vs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\depth.vs" />
</Component>
<Component Id="Makefile.in_2" Guid="{79DE700F-21AF-4DBB-8863-7E8EB5C7C635}">
<Component Id="Makefile.in_2" Guid="{6202AACB-D64B-48A0-98C0-5E8DDCB19C8A}">
<File Id="Makefile.in_2" KeyPath="yes" Source="$(var.AssetsDir)\shaders\Makefile.in" />
</Component>
<Component Id="screen.fs" Guid="{0BA482D4-ED16-4C4B-A305-0A74D6A587E2}">
<Component Id="screen.fs" Guid="{B15D9812-1424-4948-9F95-EC1CFE1719B0}">
<File Id="screen.fs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\screen.fs" />
</Component>
<Component Id="screen.vs" Guid="{C3CB7238-293F-4E08-AF63-C1516FC79BC3}">
<Component Id="screen.vs" Guid="{23254974-BEF3-446B-8855-39C0712D7BCE}">
<File Id="screen.vs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\screen.vs" />
</Component>
<Component Id="spherical_shadow.fs" Guid="{27D2F40C-29EE-4D68-BD76-7D5A69E17B6B}">
<Component Id="spherical_shadow.fs" Guid="{003A0126-FB98-436C-8CCE-A836C0FD3B52}">
<File Id="spherical_shadow.fs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\spherical-shadow.fs" />
</Component>
<Component Id="spherical_shadow.vs" Guid="{D1EFAFDF-7206-4DB7-97B5-158FB64C47AA}">
<Component Id="spherical_shadow.vs" Guid="{3FA47700-A9D9-49AA-B557-DEF48782DA70}">
<File Id="spherical_shadow.vs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\spherical-shadow.vs" />
</Component>
<Component Id="spherical.fs" Guid="{857F8630-33A1-4278-9465-D9CA621C32D8}">
<Component Id="spherical.fs" Guid="{82D4C231-AA31-4D45-8E7B-229314E2C2ED}">
<File Id="spherical.fs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\spherical.fs" />
</Component>
<Component Id="spherical.vs" Guid="{65FCCDDB-2B03-4DFB-821F-8AF5C6B8CF62}">
<Component Id="spherical.vs" Guid="{2E34597E-712D-48A7-A690-7C3F5A8BD8A4}">
<File Id="spherical.vs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\spherical.vs" />
</Component>
</Directory>
......
......@@ -15,7 +15,7 @@ g++ -DFUNCTYDIR=\"./assets\" -DVERSION=\"%productversion%\" -DOPENVDB_OPENEXR_ST
dlltool --output-def functy.def functy.o
dlltool --dllname functy.exe --def functy.def --output-exp functy.exp
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
g++ -DUSE_GLADE -g -O2 -mwindows -static *.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.dll -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