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

Updated Windows installer to include GTK libraries and using WiX heat to...

Updated Windows installer to include GTK libraries and using WiX heat to gather folder contents. Menu bar removed in fullscreen mode. Documentation updated in preparation for 0.3.0 release.
parent 41fa584f
The MIT License
Copyright (c) 2012 David Llewellyn-Jones
Copyright (c) 2012-2014 David Llewellyn-Jones
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
......
......@@ -49,7 +49,7 @@ Under Windows
windows\build.bat
2. Run the application by double clicking the exe.
2. To run, copy the contents of windows\gtk-libs.zip the assets folder and the functy.exe executable into a new folder. Double click functy.exe to run.
3. Create the installer and bootstrapper using WiX 3.6 (where <version> is something like 1.0.0):
......@@ -59,7 +59,7 @@ windows\buildSetup.bat <version>
Windows Build Environment Installation
**************************************
Notes for how to set up a development environment for building Knot on Windows.
Notes for how to set up a development environment for building Functy on Windows.
1. Install GTK2+ development libraries
Run the installer: gtk-dev-2.12.9-win32-1.exe
......@@ -91,8 +91,8 @@ Run the installer: MinGW-5.1.3.exe
7. Install Windows Installer XML Toolkit (v3.6 Beta or later needed)
8. Build knot.exe and the Knot Windows installer packages
Open a command window inside the Knot folder.
8. Build functy.exe and the Functy Windows installer packages
Open a command window inside the Functy folder.
Execute: windows\build.bat
Execute: windows\buildSetup.bat
......
Functy-0.30: 20-August-2014
- Control variables added to allow extra variables with assigned values to be used.
- New single-window workbench-style UI.
- Focus blur and shadows to improve appearance of depth.
- Export multiple PLY files for external animation (e.g. using Blender).
- Improved Windows installer process with GTK libraries included in the standard MSI package.
- UI switched from libglade to GtkBuilder.
- Functions now entered using multiline text boxes for better editing control.
- New installer and UI graphics.
Functy-0.25: 1-July-2012
- Added export to Stanford Triangle Format (PLY) file for use with modelling applications.
- Option to hide the button bar.
......
......@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
AC_INIT([Functy], [0.25], [david@flypig.co.uk])
AC_INIT([Functy], [0.30], [david@flypig.co.uk])
AC_CONFIG_AUX_DIR([config])
AM_INIT_AUTOMAKE([-Wall -Werror])
AC_CONFIG_SRCDIR([src/functy.c])
......
......@@ -465,6 +465,8 @@ void ToggleFullScreenWindow (FunctyPersist * psFunctyData) {
gtk_widget_show (psWidget);
psWidget = GTK_WIDGET (gtk_builder_get_object(psFunctyData->psXML, "PaneLeft"));
gtk_widget_show (psWidget);
psWidget = GTK_WIDGET (gtk_builder_get_object(psFunctyData->psXML, "MenuBar"));
gtk_widget_show (psWidget);
SynchroniseButtonBarStyle (psFunctyData);
psWindow = GTK_WIDGET (gtk_builder_get_object(psFunctyData->psXML, "MainWindow"));
......@@ -476,6 +478,8 @@ void ToggleFullScreenWindow (FunctyPersist * psFunctyData) {
gtk_widget_hide (psWidget);
psWidget = GTK_WIDGET (gtk_builder_get_object(psFunctyData->psXML, "PaneLeft"));
gtk_widget_hide (psWidget);
psWidget = GTK_WIDGET (gtk_builder_get_object(psFunctyData->psXML, "MenuBar"));
gtk_widget_hide (psWidget);
psWidget = GTK_WIDGET (gtk_builder_get_object(psFunctyData->psXML, "ButtonBar"));
gtk_widget_hide (psWidget);
......
<?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
<DirectoryRef Id="FunctyAssetsFolder">
<Component Id="functy.ui" Guid="{3DE9B1F8-2B90-47B7-ABFF-995C0CC03B6F}">
<File Id="functy.ui" KeyPath="yes" Source="$(var.AssetsDir)\functy.ui" />
</Component>
<Directory Id="icons" Name="icons">
<Component Id="export_anim.png" Guid="{B505173A-5B92-4918-834C-24D209E80A6F}">
<File Id="export_anim.png" KeyPath="yes" Source="$(var.AssetsDir)\icons\export-anim.png" />
</Component>
<Component Id="export_model.png" Guid="{7B2429BE-5F3B-43EB-9B05-25EB70C67EF0}">
<File Id="export_model.png" KeyPath="yes" Source="$(var.AssetsDir)\icons\export-model.png" />
</Component>
<Component Id="functy.png" Guid="{5FE0B2FF-8A21-4EB3-84C4-BAD00203B5C5}">
<File Id="functy.png" KeyPath="yes" Source="$(var.AssetsDir)\icons\functy.png" />
</Component>
<Component Id="new_cartesian.png" Guid="{DF25B147-E778-44B2-9E52-FFD08038D8DC}">
<File Id="new_cartesian.png" KeyPath="yes" Source="$(var.AssetsDir)\icons\new-cartesian.png" />
</Component>
<Component Id="new_curve.png" Guid="{2796F68E-9185-4DB5-832C-F4F40FD2659A}">
<File Id="new_curve.png" KeyPath="yes" Source="$(var.AssetsDir)\icons\new-curve.png" />
</Component>
<Component Id="new_spherical.png" Guid="{4629ACCD-7211-466B-9924-13959681D879}">
<File Id="new_spherical.png" KeyPath="yes" Source="$(var.AssetsDir)\icons\new-spherical.png" />
</Component>
</Directory>
<Directory Id="shaders" Name="shaders">
<Component Id="cartesian_shadow.fs" Guid="{DEF2AB04-257F-427B-B7D3-D55CE5BAA291}">
<File Id="cartesian_shadow.fs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\cartesian-shadow.fs" />
</Component>
<Component Id="cartesian_shadow.vs" Guid="{C20B6B3C-441A-4316-9C3B-5F4D49B12449}">
<File Id="cartesian_shadow.vs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\cartesian-shadow.vs" />
</Component>
<Component Id="cartesian.fs" Guid="{64C24C10-200C-431D-9FF6-BC71DDC8B0F5}">
<File Id="cartesian.fs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\cartesian.fs" />
</Component>
<Component Id="cartesian.vs" Guid="{45BCBE9C-E24F-4A45-8336-2F0BAE151106}">
<File Id="cartesian.vs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\cartesian.vs" />
</Component>
<Component Id="curve_shadow.fs" Guid="{7797E015-A921-4155-9A8F-EA57735B4C6E}">
<File Id="curve_shadow.fs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\curve-shadow.fs" />
</Component>
<Component Id="curve_shadow.vs" Guid="{9238464E-A0A3-40CE-900F-C93963F2FBBE}">
<File Id="curve_shadow.vs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\curve-shadow.vs" />
</Component>
<Component Id="curve.fs" Guid="{018F3A9A-CA4A-431E-B644-F3D45EDCDB65}">
<File Id="curve.fs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\curve.fs" />
</Component>
<Component Id="curve.vs" Guid="{C7DC18F8-A083-49BD-A9DF-C518DFC57DC2}">
<File Id="curve.vs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\curve.vs" />
</Component>
<Component Id="depth.fs" Guid="{947B178D-BD71-4FFA-BCFC-35842D926191}">
<File Id="depth.fs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\depth.fs" />
</Component>
<Component Id="depth.vs" Guid="{38EED069-C47E-4A85-970F-B26B1402C689}">
<File Id="depth.vs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\depth.vs" />
</Component>
<Component Id="screen.fs" Guid="{CFFB9C5A-24B9-4A1C-B5D2-7D7908F593A0}">
<File Id="screen.fs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\screen.fs" />
</Component>
<Component Id="screen.vs" Guid="{3CD2C201-A2BA-4656-8DD5-94D972242D6F}">
<File Id="screen.vs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\screen.vs" />
</Component>
<Component Id="spherical_shadow.fs" Guid="{53B63729-6E47-4752-9159-CE57C6B8BCEC}">
<File Id="spherical_shadow.fs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\spherical-shadow.fs" />
</Component>
<Component Id="spherical_shadow.vs" Guid="{3195C549-D32A-4808-92A0-2E238B438528}">
<File Id="spherical_shadow.vs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\spherical-shadow.vs" />
</Component>
<Component Id="spherical.fs" Guid="{4739BA0F-ADA0-4028-9FCC-6030A071CC1C}">
<File Id="spherical.fs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\spherical.fs" />
</Component>
<Component Id="spherical.vs" Guid="{50B124FD-86AE-49B1-975D-64273283C50B}">
<File Id="spherical.vs" KeyPath="yes" Source="$(var.AssetsDir)\shaders\spherical.vs" />
</Component>
</Directory>
</DirectoryRef>
</Fragment>
<Fragment>
<ComponentGroup Id="FunctyAssets">
<ComponentRef Id="functy.ui" />
<ComponentRef Id="export_anim.png" />
<ComponentRef Id="export_model.png" />
<ComponentRef Id="functy.png" />
<ComponentRef Id="new_cartesian.png" />
<ComponentRef Id="new_curve.png" />
<ComponentRef Id="new_spherical.png" />
<ComponentRef Id="cartesian_shadow.fs" />
<ComponentRef Id="cartesian_shadow.vs" />
<ComponentRef Id="cartesian.fs" />
<ComponentRef Id="cartesian.vs" />
<ComponentRef Id="curve_shadow.fs" />
<ComponentRef Id="curve_shadow.vs" />
<ComponentRef Id="curve.fs" />
<ComponentRef Id="curve.vs" />
<ComponentRef Id="depth.fs" />
<ComponentRef Id="depth.vs" />
<ComponentRef Id="screen.fs" />
<ComponentRef Id="screen.vs" />
<ComponentRef Id="spherical_shadow.fs" />
<ComponentRef Id="spherical_shadow.vs" />
<ComponentRef Id="spherical.fs" />
<ComponentRef Id="spherical.vs" />
</ComponentGroup>
</Fragment>
</Wix>
\ No newline at end of file
......@@ -2,10 +2,10 @@ cd src
del *.o
gcc -DFUNCTYDIR=\"./assets\" -c -Wall -mwindows -mno-cygwin -mms-bitfields -I"%GTK_BASEPATH%\include\gtk-2.0" -I"%GTK_BASEPATH%\include\cairo" -I"%GTK_BASEPATH%\include\libglade-2.0" -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"..\..\freeglut\include" -I"..\..\GLee" -I"..\..\Symbolic\src" -I"..\..\libzip\lib" *.c
gcc -DFUNCTYDIR=\"./assets\" -c -Wall -mwindows -mno-cygwin -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
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 -lglade-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 -L"..\..\freeglut\lib" -lfreeglut -L"..\..\GLee" -L"..\..\libzip\lib" -lzip -lintl -L"..\..\Symbolic" -lsymbolic -o ..\functy.exe
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 -L"..\..\freeglut\lib" -lfreeglut -L"..\..\GLee" -L"..\..\libzip\lib" -lzip -lintl -L"..\..\Symbolic" -lsymbolic -o ..\functy.exe
cd ..
@ECHO OFF
cd windows
REM This file will build the WiX installer fragments for the assets, examples and gtk-lib files
ECHO Creating the gtk-lib fragments
heat dir "gtk-libs" -suid -gg -srd -sfrag -template fragment -cg GtkLibs -dr GtkLibFolder -indent 2 -var var.GtkLibDir -nologo -out gtk-libs.wxs
ECHO Creating the examples fragments
heat dir "..\examples" -suid -gg -srd -sfrag -template fragment -cg FunctyExamples -dr FunctyExamplesFolder -indent 2 -var var.ExamplesDir -nologo -out examples.wxs
ECHO Creating the assets fragments
heat dir "..\assets" -suid -gg -srd -sfrag -template fragment -cg FunctyAssets -dr FunctyAssetsFolder -indent 2 -var var.AssetsDir -nologo -t stripMakefiles.xsl -out assets.wxs
cd ..
......@@ -3,31 +3,41 @@ IF "%~1"=="" ECHO Error: Must specify a version number as a parameter. E.g. "bui
IF "%~1"=="" GOTO End
SET productversion=%1
REM Unpack the GTK libraries if they're not already there
IF NOT EXIST windows\gtk-libs ECHO Extract the gtk-libs.zip archive into the windows\gtk-libs folder first.
IF NOT EXIST windows\gtk-libs GOTO End
cd windows\wixui
REM Create the msi installer user interface
ECHO.
ECHO Creating MSI installer user interface
candle.exe functy\WixUI_Functy.wxs *.wxs
lit.exe -out WixUI_Functy.wixlib *.wixobj
candle.exe -nologo functy\WixUI_Functy.wxs *.wxs
lit.exe -nologo -out WixUI_Functy.wixlib *.wixobj
cd ..\..
REM Create the MSI installer
ECHO Creating MSI installer
ECHO.
ECHO Compiling MSI resources
candle windows\functy.wxs -out windows\functy.wixobj
candle windows\functy.wxs -nologo -out windows\functy.wixobj
candle windows\assets.wxs -nologo -out windows\assets.wixobj -dAssetsDir="assets"
candle windows\gtk-libs.wxs -nologo -out windows\gtk-libs.wixobj -dGtkLibDir="windows\gtk-libs"
candle windows\examples.wxs -nologo -out windows\examples.wixobj -dExamplesDir="examples"
light.exe -out functy-%productversion%-win32-bin.msi windows\functy.wixobj "windows\wixui\WixUI_Functy.wixlib" -loc "windows\wixui\WixUI_en-us.wxl"
ECHO.
ECHO Linking MSI installer
REM Create the BootStrapper installer
ECHO Creating BootStrapper installer
light.exe -nologo -out functy-%productversion%-win32-bin.msi windows\functy.wixobj windows\assets.wixobj windows\examples.wixobj windows\gtk-libs.wixobj "windows\wixui\WixUI_Functy.wixlib" -loc "windows\wixui\WixUI_en-us.wxl"
candle windows\bootstrap\bootstrap.wxs -out windows\bootstrap\bootstrap.wixobj
REM No BootStrapper is needed since the GTK libs are now installed directly with the program
light -out FunctySetup-%productversion%-win32-bin.exe -ext WixBalExtension windows\bootstrap\bootstrap.wixobj
REM Create the BootStrapper installer
REM ECHO Creating BootStrapper installer
REM candle windows\bootstrap\bootstrap.wxs -out windows\bootstrap\bootstrap.wixobj
REM light -out FunctySetup-%productversion%-win32-bin.exe -ext WixBalExtension windows\bootstrap\bootstrap.wixobj
:End
<?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
<DirectoryRef Id="FunctyExamplesFolder">
<Component Id="BouncingBall.xml" Guid="{D18E919B-36A6-4437-9964-C3751752410D}">
<File Id="BouncingBall.xml" KeyPath="yes" Source="$(var.ExamplesDir)\BouncingBall.xml" />
</Component>
<Component Id="BumpySlides.xml" Guid="{57024B2C-2EE5-4F49-BFF6-FFBF7DB0D477}">
<File Id="BumpySlides.xml" KeyPath="yes" Source="$(var.ExamplesDir)\BumpySlides.xml" />
</Component>
<Component Id="CurveSphere01.xml" Guid="{6C9C4C3B-ABC2-45BF-BF31-F1C47E7A20F9}">
<File Id="CurveSphere01.xml" KeyPath="yes" Source="$(var.ExamplesDir)\CurveSphere01.xml" />
</Component>
<Component Id="CurveSphere02.xml" Guid="{143E368D-6FF9-49AD-9501-FF2BA1BCB606}">
<File Id="CurveSphere02.xml" KeyPath="yes" Source="$(var.ExamplesDir)\CurveSphere02.xml" />
</Component>
<Component Id="Fan01.xml" Guid="{0305B738-95D7-46EA-8870-EF31E57E3B9B}">
<File Id="Fan01.xml" KeyPath="yes" Source="$(var.ExamplesDir)\Fan01.xml" />
</Component>
<Component Id="Flower01.xml" Guid="{09ABA39E-BB90-444F-A8E3-60195981E7DD}">
<File Id="Flower01.xml" KeyPath="yes" Source="$(var.ExamplesDir)\Flower01.xml" />
</Component>
<Component Id="Flower02.xml" Guid="{2D008512-B66B-4E95-80F0-4C611F159264}">
<File Id="Flower02.xml" KeyPath="yes" Source="$(var.ExamplesDir)\Flower02.xml" />
</Component>
<Component Id="Flower03.xml" Guid="{F715D36D-FEDC-4B18-8F61-7D510C945671}">
<File Id="Flower03.xml" KeyPath="yes" Source="$(var.ExamplesDir)\Flower03.xml" />
</Component>
<Component Id="Grid.xml" Guid="{276CEFC5-AA82-425C-ADAC-C30CC502EEC6}">
<File Id="Grid.xml" KeyPath="yes" Source="$(var.ExamplesDir)\Grid.xml" />
</Component>
<Component Id="Islands01.xml" Guid="{88085828-5797-4364-9B7F-F8069FCDD5B2}">
<File Id="Islands01.xml" KeyPath="yes" Source="$(var.ExamplesDir)\Islands01.xml" />
</Component>
<Component Id="LavaLamp01.xml" Guid="{9194C933-7912-4EEF-9676-9F65C0CE43D4}">
<File Id="LavaLamp01.xml" KeyPath="yes" Source="$(var.ExamplesDir)\LavaLamp01.xml" />
</Component>
<Component Id="LavaLamp02.xml" Guid="{F9A73AF0-5315-4547-94FB-A36224F5C553}">
<File Id="LavaLamp02.xml" KeyPath="yes" Source="$(var.ExamplesDir)\LavaLamp02.xml" />
</Component>
<Component Id="Lemonade01.xml" Guid="{10439D4E-9C03-43C1-ADD7-C7A88288DE9B}">
<File Id="Lemonade01.xml" KeyPath="yes" Source="$(var.ExamplesDir)\Lemonade01.xml" />
</Component>
<Component Id="LensEffect.xml" Guid="{F0CFBAA0-C172-49B2-8CEF-2F6D86207263}">
<File Id="LensEffect.xml" KeyPath="yes" Source="$(var.ExamplesDir)\LensEffect.xml" />
</Component>
<Component Id="Lissajous01.xml" Guid="{7B95F913-94D2-49D0-A824-DE7D8EA7C007}">
<File Id="Lissajous01.xml" KeyPath="yes" Source="$(var.ExamplesDir)\Lissajous01.xml" />
</Component>
<Component Id="Lissajous02.xml" Guid="{433581DA-989D-4AAE-ACAB-0CE3D3B0513B}">
<File Id="Lissajous02.xml" KeyPath="yes" Source="$(var.ExamplesDir)\Lissajous02.xml" />
</Component>
<Component Id="Lissajous03.xml" Guid="{139A49E4-80F9-4580-B35F-A47638661FA6}">
<File Id="Lissajous03.xml" KeyPath="yes" Source="$(var.ExamplesDir)\Lissajous03.xml" />
</Component>
<Component Id="LissajousLights.xml" Guid="{B4C0C207-1D9F-4AFA-BC8D-69BE3402B9BC}">
<File Id="LissajousLights.xml" KeyPath="yes" Source="$(var.ExamplesDir)\LissajousLights.xml" />
</Component>
<Component Id="Logo.xml" Guid="{65645C5A-4627-4756-9481-66E3F24AD2ED}">
<File Id="Logo.xml" KeyPath="yes" Source="$(var.ExamplesDir)\Logo.xml" />
</Component>
<Component Id="Loops01.xml" Guid="{587CA2CD-46DA-406F-8B65-6B1F5E0A9A4C}">
<File Id="Loops01.xml" KeyPath="yes" Source="$(var.ExamplesDir)\Loops01.xml" />
</Component>
<Component Id="Metal.xml" Guid="{BFF68439-0C3F-40B5-B63C-84E8E086BDDA}">
<File Id="Metal.xml" KeyPath="yes" Source="$(var.ExamplesDir)\Metal.xml" />
</Component>
<Component Id="Pulsate.xml" Guid="{DF2CBE96-03A5-4FDE-8571-33534A70010C}">
<File Id="Pulsate.xml" KeyPath="yes" Source="$(var.ExamplesDir)\Pulsate.xml" />
</Component>
<Component Id="Ribbon01.xml" Guid="{5D3F6426-BEA6-4204-8641-7683A0147D20}">
<File Id="Ribbon01.xml" KeyPath="yes" Source="$(var.ExamplesDir)\Ribbon01.xml" />
</Component>
<Component Id="Ring01.xml" Guid="{781DA055-B6F3-4FBA-8E99-35281340865E}">
<File Id="Ring01.xml" KeyPath="yes" Source="$(var.ExamplesDir)\Ring01.xml" />
</Component>
<Component Id="Ring02.xml" Guid="{5F1321FA-ED1F-4B28-943B-0FAFFA33F89B}">
<File Id="Ring02.xml" KeyPath="yes" Source="$(var.ExamplesDir)\Ring02.xml" />
</Component>
<Component Id="Ring03.xml" Guid="{9E09CF0D-B5AA-41F1-B0F5-1ED3F6AA22EE}">
<File Id="Ring03.xml" KeyPath="yes" Source="$(var.ExamplesDir)\Ring03.xml" />
</Component>
<Component Id="ScaryForest.xml" Guid="{11A1E012-54ED-42EE-B518-6F1313286220}">
<File Id="ScaryForest.xml" KeyPath="yes" Source="$(var.ExamplesDir)\ScaryForest.xml" />
</Component>
<Component Id="ScarySlides.xml" Guid="{C8C62A80-0C37-4BED-8D90-FB997C4C03E4}">
<File Id="ScarySlides.xml" KeyPath="yes" Source="$(var.ExamplesDir)\ScarySlides.xml" />
</Component>
<Component Id="Spikes01.xml" Guid="{34707103-53DF-42ED-A3E1-BA6407564CB8}">
<File Id="Spikes01.xml" KeyPath="yes" Source="$(var.ExamplesDir)\Spikes01.xml" />
</Component>
<Component Id="Spiral01.xml" Guid="{075DCBA7-E9DC-4B3D-999E-A476F318E01D}">
<File Id="Spiral01.xml" KeyPath="yes" Source="$(var.ExamplesDir)\Spiral01.xml" />
</Component>
<Component Id="Spiral02.xml" Guid="{538F0B1E-BB1E-42B1-ACC3-367B0741C3C4}">
<File Id="Spiral02.xml" KeyPath="yes" Source="$(var.ExamplesDir)\Spiral02.xml" />
</Component>
<Component Id="Spiral03.xml" Guid="{5EC7CFD3-53DC-4E8C-B027-D1B6DB7E65B8}">
<File Id="Spiral03.xml" KeyPath="yes" Source="$(var.ExamplesDir)\Spiral03.xml" />
</Component>
<Component Id="Tartan.xml" Guid="{DE83E48B-CF75-4AE5-86CF-625B5D6555CE}">
<File Id="Tartan.xml" KeyPath="yes" Source="$(var.ExamplesDir)\Tartan.xml" />
</Component>
<Component Id="WhirlpoolSphere.xml" Guid="{2193F047-9A3E-49B1-B34D-073431961B5A}">
<File Id="WhirlpoolSphere.xml" KeyPath="yes" Source="$(var.ExamplesDir)\WhirlpoolSphere.xml" />
</Component>
<Component Id="Wrap01.xml" Guid="{05EE8EA0-4735-4BB8-AB9E-D51816B8CD70}">
<File Id="Wrap01.xml" KeyPath="yes" Source="$(var.ExamplesDir)\Wrap01.xml" />
</Component>
<Component Id="Wrap02.xml" Guid="{C382B5A7-F654-445C-B544-6211BDEA08A9}">
<File Id="Wrap02.xml" KeyPath="yes" Source="$(var.ExamplesDir)\Wrap02.xml" />
</Component>
</DirectoryRef>
</Fragment>
<Fragment>
<ComponentGroup Id="FunctyExamples">
<ComponentRef Id="BouncingBall.xml" />
<ComponentRef Id="BumpySlides.xml" />
<ComponentRef Id="CurveSphere01.xml" />
<ComponentRef Id="CurveSphere02.xml" />
<ComponentRef Id="Fan01.xml" />
<ComponentRef Id="Flower01.xml" />
<ComponentRef Id="Flower02.xml" />
<ComponentRef Id="Flower03.xml" />
<ComponentRef Id="Grid.xml" />
<ComponentRef Id="Islands01.xml" />
<ComponentRef Id="LavaLamp01.xml" />
<ComponentRef Id="LavaLamp02.xml" />
<ComponentRef Id="Lemonade01.xml" />
<ComponentRef Id="LensEffect.xml" />
<ComponentRef Id="Lissajous01.xml" />
<ComponentRef Id="Lissajous02.xml" />
<ComponentRef Id="Lissajous03.xml" />
<ComponentRef Id="LissajousLights.xml" />
<ComponentRef Id="Logo.xml" />
<ComponentRef Id="Loops01.xml" />
<ComponentRef Id="Metal.xml" />
<ComponentRef Id="Pulsate.xml" />
<ComponentRef Id="Ribbon01.xml" />
<ComponentRef Id="Ring01.xml" />
<ComponentRef Id="Ring02.xml" />
<ComponentRef Id="Ring03.xml" />
<ComponentRef Id="ScaryForest.xml" />
<ComponentRef Id="ScarySlides.xml" />
<ComponentRef Id="Spikes01.xml" />
<ComponentRef Id="Spiral01.xml" />
<ComponentRef Id="Spiral02.xml" />
<ComponentRef Id="Spiral03.xml" />
<ComponentRef Id="Tartan.xml" />
<ComponentRef Id="WhirlpoolSphere.xml" />
<ComponentRef Id="Wrap01.xml" />
<ComponentRef Id="Wrap02.xml" />
</ComponentGroup>
</Fragment>
</Wix>
\ No newline at end of file
......@@ -24,38 +24,6 @@
</Component>
<Directory Id='FunctyExamplesFolder' Name='examples'>
<Component Id='ExampleFiles' Guid='877D949E-B708-4A17-97CE-A0EE7A9404FD'>
<File Id='ExampleBouncingBall' Name='BouncingBall.xml' DiskId='1' Source='examples\BouncingBall.xml' />
<File Id='ExampleBumpySlides' Name='BumpySlides.xml' DiskId='1' Source='examples\BumpySlides.xml' />
<File Id='ExampleCurveSphere01' Name='CurveSphere01.xml' DiskId='1' Source='examples\CurveSphere01.xml' />
<File Id='ExampleCurveSphere02' Name='CurveSphere02.xml' DiskId='1' Source='examples\CurveSphere02.xml' />
<File Id='ExampleFan01' Name='Fan01.xml' DiskId='1' Source='examples\Fan01.xml' />
<File Id='ExampleFlower01' Name='Flower01.xml' DiskId='1' Source='examples\Flower01.xml' />
<File Id='ExampleFlower02' Name='Flower02.xml' DiskId='1' Source='examples\Flower02.xml' />
<File Id='ExampleGrid' Name='Grid.xml' DiskId='1' Source='examples\Grid.xml' />
<File Id='ExampleIslands01' Name='Islands01.xml' DiskId='1' Source='examples\Islands01.xml' />
<File Id='ExampleLavaLamp01' Name='LavaLamp01.xml' DiskId='1' Source='examples\LavaLamp01.xml' />
<File Id='ExampleLavaLamp02' Name='LavaLamp02.xml' DiskId='1' Source='examples\LavaLamp02.xml' />
<File Id='ExampleLemonade01' Name='Lemonade01.xml' DiskId='1' Source='examples\Lemonade01.xml' />
<File Id='ExampleLissajous01' Name='Lissajous01.xml' DiskId='1' Source='examples\Lissajous01.xml' />
<File Id='ExampleLissajous02' Name='Lissajous02.xml' DiskId='1' Source='examples\Lissajous02.xml' />
<File Id='ExampleLissajous03' Name='Lissajous03.xml' DiskId='1' Source='examples\Lissajous03.xml' />
<File Id='ExampleLissajousLights' Name='LissajousLights.xml' DiskId='1' Source='examples\LissajousLights.xml' />
<File Id='ExampleLogo' Name='Logo.xml' DiskId='1' Source='examples\Logo.xml' />
<File Id='ExampleLoops01' Name='Loops01.xml' DiskId='1' Source='examples\Loops01.xml' />
<File Id='ExampleMetal' Name='Metal.xml' DiskId='1' Source='examples\Metal.xml' />
<File Id='ExamplePulsate' Name='Pulsate.xml' DiskId='1' Source='examples\Pulsate.xml' />
<File Id='ExampleRibbon01' Name='Ribbon01.xml' DiskId='1' Source='examples\Ribbon01.xml' />
<File Id='ExampleScaryForest' Name='ScaryForest.xml' DiskId='1' Source='examples\ScaryForest.xml' />
<File Id='ExampleScarySlides' Name='ScarySlides.xml' DiskId='1' Source='examples\ScarySlides.xml' />
<File Id='ExampleSpikes01' Name='Spikes01.xml' DiskId='1' Source='examples\Spikes01.xml' />
<File Id='ExampleSpiral01' Name='Spiral01.xml' DiskId='1' Source='examples\Spiral01.xml' />
<File Id='ExampleSpiral02' Name='Spiral02.xml' DiskId='1' Source='examples\Spiral02.xml' />
<File Id='ExampleSpiral03' Name='Spiral03.xml' DiskId='1' Source='examples\Spiral03.xml' />
<File Id='ExampleTartan' Name='Tartan.xml' DiskId='1' Source='examples\Tartan.xml' />
<File Id='ExampleWrap01' Name='Wrap01.xml' DiskId='1' Source='examples\Wrap01.xml' />
<File Id='ExampleWrap02' Name='Wrap02.xml' DiskId='1' Source='examples\Wrap02.xml' />
</Component>
<Component Id='StartMenuExampleShortcuts' Guid='3FF0D33E-DE33-4DFB-AFBF-8CC03DCE7E97'>
<Shortcut Id="StartMenuExamples" Directory="ProgramMenuDir" Name="Examples"
WorkingDirectory='INSTALLDIR' />
......@@ -88,28 +56,17 @@
</Component>
<Directory Id='FunctyAssetsFolder' Name='assets'>
<Component Id='FunctyAssets' Guid='F7CFF205-205D-437E-B97C-3DCC15F280A4'>
<File Id='FunctyGlade' Name='Functy.glade' DiskId='1' Source='assets\Functy.glade' Vital='yes' />
<File Id='FunctyCartesianVertex' Name='cartesian.vs' DiskId='1' Source='assets\cartesian.vs' Vital='yes' />
<File Id='FunctyCartesianFragment' Name='cartesian.fs' DiskId='1' Source='assets\cartesian.fs' Vital='yes' />
<File Id='FunctySphericalVertex' Name='spherical.vs' DiskId='1' Source='assets\spherical.vs' Vital='yes' />
<File Id='FunctySphericalFragment' Name='spherical.fs' DiskId='1' Source='assets\spherical.fs' Vital='yes' />
<File Id='FunctyCurveVertex' Name='curve.vs' DiskId='1' Source='assets\curve.vs' Vital='yes' />
<File Id='FunctyCurveFragment' Name='curve.fs' DiskId='1' Source='assets\curve.fs' Vital='yes' />
</Component>
</Directory>
<Component Id='FreeGlutLibrary' Guid='E6C828A3-1517-42BA-9860-ECC7A07DBAA4'>
<File Id='freeglutDLL' Name='freeglut.dll' DiskId='1' Source='freeglut.dll' />
</Component>
<Directory Id='GtkLibFolder' Name='.'>
</Directory>
<Component Id='InfoFiles' Guid='EAEB814F-BA22-4194-BC27-06EEAB05188D'>
<File Id='ReadMe' Name='README' DiskId='1' Source='README' />
<File Id='News' Name='NEWS' DiskId='1' Source='NEWS' />
<File Id='Install' Name='INSTALL' DiskId='1' Source='INSTALL' />
<File Id='Authors' Name='AUTHORS' DiskId='1' Source='AUTHORS' />
<File Id='Copying' Name='COPYING' DiskId='1' Source='COPYING' />
<File Id='Copying_Functy' Name='COPYING' DiskId='1' Source='COPYING' />
</Component>
</Directory>
......@@ -125,8 +82,8 @@
<Feature Id='Complete' Title="Functy" Description="The Functy graph rendering package" Display="expand" Level='1' ConfigurableDirectory='INSTALLDIR'>
<Feature Id='MainProgram' Title="Program" Description="The main executable" Level='1'>
<ComponentRef Id='MainExecutable' />
<ComponentRef Id='FunctyAssets' />
<ComponentRef Id='FreeGlutLibrary' />
<ComponentGroupRef Id='FunctyAssets' />
<ComponentGroupRef Id='GtkLibs' />
</Feature>
<Feature Id='StartMenu' Title="Start Menu Shortcuts" Description="Shortcuts to the program added to your Start menu" Level='1'>
......@@ -142,7 +99,7 @@
<ComponentRef Id='InfoFiles' />
</Feature>
<Feature Id='Examples' Title='Examples' Description='Example function files that can be loaded into Functy.' Level='1'>
<ComponentRef Id='ExampleFiles' />
<ComponentGroupRef Id='FunctyExamples' />
</Feature>
</Feature>
......@@ -153,6 +110,7 @@
<UIRef Id="WixUI_ErrorProgressText" />
<Icon Id="functy.ico" SourceFile="functy.ico" />
<Property Id="ARPPRODUCTICON" Value="functy.ico" />
</Product>
</Wix>
......
This source diff could not be displayed because it is too large. You can view the blob instead.
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:wi="http://schemas.microsoft.com/wix/2006/wi">
<xsl:output method="xml" indent="no" omit-xml-declaration="yes"/>
<!-- <xsl:strip-space elements="*"/> -->
<xsl:key name="kCompsToRemove" match="wi:Component[contains(wi:File/@Source, 'Makefile.am')]" use="@Id" />
<xsl:template match="@* | node()">
<xsl:copy>
<xsl:apply-templates select="@* | node()"/>
</xsl:copy>
</xsl:template>
<xsl:template match="*[self::wi:Component or self::wi:ComponentRef] [key('kCompsToRemove', @Id)]" />
</xsl:stylesheet>
\ No newline at end of file
windows/wixui/Bitmaps/bannrbmp.bmp

29.1 KB | W: | H:

windows/wixui/Bitmaps/bannrbmp.bmp

83.9 KB | W: | H:

windows/wixui/Bitmaps/bannrbmp.bmp
windows/wixui/Bitmaps/bannrbmp.bmp
windows/wixui/Bitmaps/bannrbmp.bmp
windows/wixui/Bitmaps/bannrbmp.bmp
  • 2-up
  • Swipe
  • Onion skin
windows/wixui/Bitmaps/dlgbmp.bmp

152 KB | W: | H:

windows/wixui/Bitmaps/dlgbmp.bmp

601 KB | W: | H:

windows/wixui/Bitmaps/dlgbmp.bmp
windows/wixui/Bitmaps/dlgbmp.bmp
windows/wixui/Bitmaps/dlgbmp.bmp
windows/wixui/Bitmaps/dlgbmp.bmp
  • 2-up
  • Swipe
  • Onion skin
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