diff options
| -rw-r--r-- | data/Makefile.am | 1 | ||||
| -rw-r--r-- | data/wixl/cairo.wxi | 2 | ||||
| -rw-r--r-- | data/wixl/fontconfig.wxi | 2 | ||||
| -rw-r--r-- | data/wixl/gcc.wxi | 22 | ||||
| -rw-r--r-- | data/wixl/gnutls.wxi | 2 | ||||
| -rw-r--r-- | data/wixl/gstreamer.wxi | 2 | ||||
| -rw-r--r-- | data/wixl/libvirt.wxi | 2 |
7 files changed, 33 insertions, 0 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index d3ab546..8dd0323 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -11,6 +11,7 @@ dist_wxi_DATA = \ wixl/expat.wxi \ wixl/fontconfig.wxi \ wixl/freetype.wxi \ + wixl/gcc.wxi \ wixl/gdk-pixbuf.wxi \ wixl/gettext.wxi \ wixl/glib2.wxi \ diff --git a/data/wixl/cairo.wxi b/data/wixl/cairo.wxi index 0caedcd..d7fd501 100644 --- a/data/wixl/cairo.wxi +++ b/data/wixl/cairo.wxi @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> +<?require gcc.wxi?> <?require glib2.wxi?> <?require libpng.wxi?> <?require pixman.wxi?> @@ -21,6 +22,7 @@ </Fragment> <Fragment> <ComponentGroup Id="CG.cairo"> + <ComponentGroupRef Id="CG.gcc"/> <ComponentGroupRef Id="CG.glib2"/> <ComponentGroupRef Id="CG.libpng"/> <ComponentGroupRef Id="CG.pixman"/> diff --git a/data/wixl/fontconfig.wxi b/data/wixl/fontconfig.wxi index 6648782..34ea53e 100644 --- a/data/wixl/fontconfig.wxi +++ b/data/wixl/fontconfig.wxi @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> +<?require gcc.wxi?> <?require freetype.wxi?> <Include xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Fragment> @@ -184,6 +185,7 @@ </Fragment> <Fragment> <ComponentGroup Id="CG.fontconfig"> + <ComponentGroupRef Id="CG.gcc"/> <ComponentGroupRef Id="CG.freetype"/> <ComponentRef Id="cmpA1344055E0C9AC8865ADD41B7CAAC269"/> <ComponentRef Id="cmp702EA469CAE49C6E1E50DF18A433D8F9"/> diff --git a/data/wixl/gcc.wxi b/data/wixl/gcc.wxi new file mode 100644 index 0000000..c42a5ef --- /dev/null +++ b/data/wixl/gcc.wxi @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<Include xmlns="http://schemas.microsoft.com/wix/2006/wi"> + <Fragment> + <DirectoryRef Id="INSTALLDIR"> + <Directory Id="dir4920EE8CC0DF53D7912686315C7AFEB4" Name="bin"> + <Component Win64="$(var.Win64)" Id="cmp23A396DF6DA34DEDBF531E5264BF86AA" Guid="*"> +<!-- gcc 4.8 uses SEH --> +<?if $(var.Win64) = "yes"?> + <File Id="fil246F7D773B308C471E32C8FB3BE85730" KeyPath="yes" Source="$(var.SourceDir)/bin/libgcc_s_seh-1.dll"/> +<?else?> + <File Id="filDC11F2B0D7B6BE3CCA2B5003E81CC8F1" KeyPath="yes" Source="$(var.SourceDir)/bin/libgcc_s_sjlj-1.dll"/> +<?endif?> + </Component> + </Directory> + </DirectoryRef> + </Fragment> + <Fragment> + <ComponentGroup Id="CG.gcc"> + <ComponentRef Id="cmp23A396DF6DA34DEDBF531E5264BF86AA"/> + </ComponentGroup> + </Fragment> +</Include> diff --git a/data/wixl/gnutls.wxi b/data/wixl/gnutls.wxi index daa1687..119cac4 100644 --- a/data/wixl/gnutls.wxi +++ b/data/wixl/gnutls.wxi @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> +<?require gcc.wxi?> <?require libtasn1.wxi?> <?require readline.wxi?> <?require p11-kit.wxi?> @@ -14,6 +15,7 @@ </Fragment> <Fragment> <ComponentGroup Id="CG.gnutls"> + <ComponentGroupRef Id="CG.gcc"/> <ComponentGroupRef Id="CG.libtasn1"/> <ComponentGroupRef Id="CG.readline"/> <ComponentGroupRef Id="CG.p11-kit"/> diff --git a/data/wixl/gstreamer.wxi b/data/wixl/gstreamer.wxi index 7473548..4319a82 100644 --- a/data/wixl/gstreamer.wxi +++ b/data/wixl/gstreamer.wxi @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> +<?require gcc.wxi?> <?require glib2.wxi?> <Include xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Fragment> @@ -330,6 +331,7 @@ </Fragment> <Fragment> <ComponentGroup Id="CG.gstreamer"> + <ComponentGroupRef Id="CG.gcc"/> <ComponentGroupRef Id="CG.glib2"/> <ComponentRef Id="cmpFADD48213C312FDF38DBDAC806C1C602"/> <ComponentRef Id="cmp057BDD3A0F4E1D0B34E9B1552D91E4A7"/> diff --git a/data/wixl/libvirt.wxi b/data/wixl/libvirt.wxi index 88b4a0e..499e383 100644 --- a/data/wixl/libvirt.wxi +++ b/data/wixl/libvirt.wxi @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> +<?require gcc.wxi?> <?require curl.wxi?> <?require gnutls.wxi?> <?require gettext.wxi?> @@ -635,6 +636,7 @@ </Fragment> <Fragment> <ComponentGroup Id="CG.libvirt"> + <ComponentGroupRef Id="CG.gcc"/> <ComponentGroupRef Id="CG.curl"/> <ComponentGroupRef Id="CG.gettext"/> <ComponentGroupRef Id="CG.portablexdr"/> |