[sc-dev] SF.net SVN: supercollider:[8215] trunk/windows

[danstowell@xxxxxxxxxxxxxxxxxxxxx]

Revision: 8215
          http://supercollider.svn.sourceforge.net/supercollider/?rev=8215&view=rev
Author:   danstowell
Date:     2008-12-19 21:36:32 +0000 (Fri, 19 Dec 2008)

Log Message:
-----------
Update windows installer to show more info while installing.
Also some tweaks to win compile options.

Modified Paths:
--------------
    trunk/windows/PlugIns/OSCUGens.vcproj
    trunk/windows/distrowin.py
    trunk/windows/sc3-win-installer-template.wxs
    trunk/windows/scsynth.vcproj

Added Paths:
-----------
    trunk/windows/LicenseForWinInstaller.rtf

Added: trunk/windows/LicenseForWinInstaller.rtf
===================================================================
(Binary files differ)


Property changes on: trunk/windows/LicenseForWinInstaller.rtf
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/windows/PlugIns/OSCUGens.vcproj
===================================================================
--- trunk/windows/PlugIns/OSCUGens.vcproj	2008-12-19 20:20:20 UTC (rev 8214)
+++ trunk/windows/PlugIns/OSCUGens.vcproj	2008-12-19 21:36:32 UTC (rev 8215)
@@ -121,6 +121,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\headers\plugin_interface&quot;;&quot;$(ProjectDir)..\..\libsndfile&quot;;&quot;$(ProjectDir)..\..\headers\common&quot;;&quot;$(ProjectDir)..\..\headers\server&quot;;&quot;$(ProjectDir)..\..\..\pthread-win32&quot;"
 				PreprocessorDefinitions="WIN32;SC_WIN32;NDEBUG;_WINDOWS;_USRDLL;OSCUGENS_EXPORTS"
 				RuntimeLibrary="0"

Modified: trunk/windows/distrowin.py
===================================================================
--- trunk/windows/distrowin.py	2008-12-19 20:20:20 UTC (rev 8214)
+++ trunk/windows/distrowin.py	2008-12-19 21:36:32 UTC (rev 8215)
@@ -128,7 +128,7 @@
 
 print "Calling WiX compile/link steps...\n"
 os.system('candle supercollider-installer.wxs')
-os.system('light supercollider-installer.wixobj')
+os.system('light -ext WixUIExtension -cultures:en-us supercollider-installer.wixobj')
 
 print "\ndistrowin.py: done building MSI\n"
 print "\ndistrowin.py: now to bundle a zip file\n"

Modified: trunk/windows/sc3-win-installer-template.wxs
===================================================================
--- trunk/windows/sc3-win-installer-template.wxs	2008-12-19 20:20:20 UTC (rev 8214)
+++ trunk/windows/sc3-win-installer-template.wxs	2008-12-19 21:36:32 UTC (rev 8215)
@@ -139,5 +139,13 @@
     <MergeRef Id="VCRedistPolicy"/>
 </Feature>
 
+<!-- UIRef Id="WixUI_InstallDir" / -->
+<UIRef Id="WixUI_Minimal" /> 
+<WixVariable Id="WixUILicenseRtf" Value="LicenseForWinInstaller.rtf" />
+<!--
+<WixVariable Id="WixUIBannerBmp" Value="Bitmaps/BannrBmp.bmp" />
+<WixVariable Id="WixUIDlgBmp" Value="Bitmaps/DlgBmp.bmp" />
+-->
+
 </Product>
 </Wix>

Modified: trunk/windows/scsynth.vcproj
===================================================================
--- trunk/windows/scsynth.vcproj	2008-12-19 20:20:20 UTC (rev 8214)
+++ trunk/windows/scsynth.vcproj	2008-12-19 21:36:32 UTC (rev 8215)
@@ -121,6 +121,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
 				AdditionalIncludeDirectories="..\headers\plugin_interface;..\headers\server;..\headers\common;..\libsndfile;&quot;..\..\pthread-win32&quot;;..\..\portaudio\src\common;..\..\portaudio\include;&quot;..\..\asio-sdk\common&quot;;&quot;..\..\asio-sdk\host&quot;;&quot;..\..\asio-sdk\host\pc&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;SC_WIN32;NOMINMAX;PTW32_BUILD;SC_WIN32_STATIC_PTHREADS;PA_NO_DS;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="2"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

_______________________________________________
sc-dev mailing list

info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
archive: https://listarc.bham.ac.uk/marchives/sc-dev/
search: https://listarc.bham.ac.uk/lists/sc-dev/search/