Author: dhudson
Date: 2006-11-09 12:29:48 -0500 (Thu, 09 Nov 2006)
New Revision: 67617
Removed:
trunk/tao/other/Prebuild/Prebuild2.exe
Modified:
trunk/tao/other/Prebuild/Prebuild.exe
trunk/tao/prebuild.xml
trunk/tao/src/Examples/
trunk/tao/src/Examples/Properties/
trunk/tao/src/Examples/prebuild.xml
trunk/tao/src/Tao.DevIl/Properties/
trunk/tao/src/Tao.GlBindGen/Properties/
trunk/tao/src/Tao.Lua/Properties/
trunk/tao/src/Tao.Ode/Properties/
trunk/tao/src/Tao.OpenAl/
trunk/tao/src/Tao.OpenAl/Properties/
trunk/tao/src/Tao.OpenGl/Properties/
trunk/tao/src/Tao.OpenGl/prebuild.xml
trunk/tao/src/Tao.PhysFs/Properties/
trunk/tao/src/Tao.Sdl/Properties/
trunk/tao/src/Tao.Sdl/Properties/AssemblyInfo.cs
trunk/tao/src/Tao.Sdl/prebuild.xml
Log:
Fix many newly introduced problems with the opengl and sdl builds
Modified: trunk/tao/other/Prebuild/Prebuild.exe
===================================================================
(Binary files differ)
Deleted: trunk/tao/other/Prebuild/Prebuild2.exe
===================================================================
(Binary files differ)
Modified: trunk/tao/prebuild.xml
===================================================================
--- trunk/tao/prebuild.xml 2006-11-09 17:25:52 UTC (rev 67616)
+++ trunk/tao/prebuild.xml 2006-11-09 17:29:48 UTC (rev 67617)
@@ -8,5 +8,4 @@
<Process>src\Tao.Sdl\prebuild.xml</Process>
<Process>src\Tao.PhysFs\prebuild.xml</Process>
<Process>src\Tao.Lua\prebuild.xml</Process>
- <Process>src\Examples\prebuild.xml</Process>
</Prebuild>
Property changes on: trunk/tao/src/Examples
___________________________________________________________________
Name: svn:ignore
+ configure.ac
Makefile.am
Tao.Cg.pc.in
Tao.Examples.sln
Tao.FreeGlut.pc.in
Tao.Glfw.pc.in
Tao.OpenAl.pc.in
Tao.OpenGl.pc.in
Tao.Platform.Windows.pc.in
Property changes on: trunk/tao/src/Examples/Properties
___________________________________________________________________
Name: svn:ignore
+ AssemblyInfo.cs.in
Modified: trunk/tao/src/Examples/prebuild.xml
===================================================================
--- trunk/tao/src/Examples/prebuild.xml 2006-11-09 17:25:52 UTC (rev 67616)
+++ trunk/tao/src/Examples/prebuild.xml 2006-11-09 17:29:48 UTC (rev 67617)
@@ -141,7 +141,7 @@
</Files>
</Project>
-->
- <Project name="Tao.OpenGl" path="../Tao.OpenGl" language="C#"
type="Library" >
+ <Project name="Tao.OpenGl" path="../Tao.OpenGl" language="C#"
type="Library" designerFolder="Properties" >
<Configuration name="Debug">
<Options>
<CompilerDefines>DEBUG;TRACE;WIN32</CompilerDefines>
@@ -149,7 +149,7 @@
<AllowUnsafe>true</AllowUnsafe>
<OutputPath>bin/Debug</OutputPath>
<XmlDocFile>Tao.OpenGl.xml</XmlDocFile>
- <!-- KeyFile>../Tao.OpenGl/Tao.OpenGl.snk</KeyFile -->
+ <KeyFile>../Tao.OpenGl/Tao.OpenGl.snk</KeyFile>
<DebugInformation>true</DebugInformation>
</Options>
</Configuration>
@@ -160,7 +160,7 @@
<AllowUnsafe>true</AllowUnsafe>
<OutputPath>bin/Release</OutputPath>
<XmlDocFile>Tao.OpenGl.xml</XmlDocFile>
- <!-- KeyFile>../Tao.OpenGl/Tao.OpenGl.snk</KeyFile -->
+ <KeyFile>../Tao.OpenGl/Tao.OpenGl.snk</KeyFile>
<DebugInformation>false</DebugInformation>
</Options>
</Configuration>
Property changes on: trunk/tao/src/Tao.DevIl/Properties
___________________________________________________________________
Name: svn:ignore
+ AssemblyInfo.cs.in
Property changes on: trunk/tao/src/Tao.GlBindGen/Properties
___________________________________________________________________
Name: svn:ignore
+ AssemblyInfo.cs.in
Property changes on: trunk/tao/src/Tao.Lua/Properties
___________________________________________________________________
Name: svn:ignore
+ AssemblyInfo.cs.in
Property changes on: trunk/tao/src/Tao.Ode/Properties
___________________________________________________________________
Name: svn:ignore
+ AssemblyInfo.cs.in
Property changes on: trunk/tao/src/Tao.OpenAl
___________________________________________________________________
Name: svn:ignore
- Tao.OpenAl.xml
obj
Tao.OpenAl.csproj
Tao.OpenAl.csproj.user
bin
*.sln
*.suo
Tao.OpenAl.build
Tao.OpenAl.mdp
Tao.OpenAl.mds
Tao.OpenAl.dll.build
Tao.OpenAl.prjx
Makefile.in
Makefile
Tao.OpenAl.dll
Tao.OpenAl.pdb
Include
Include.in
Include.am
+ Tao.OpenAl.xml
obj
Tao.OpenAl.csproj
Tao.OpenAl.csproj.user
bin
*.sln
*.suo
Tao.OpenAl.build
Tao.OpenAl.mdp
Tao.OpenAl.mds
Tao.OpenAl.dll.build
Tao.OpenAl.prjx
Makefile.in
Makefile
Tao.OpenAl.dll
Tao.OpenAl.pdb
Include
Include.in
Include.am
configure.ac
Makefile.am
Tao.OpenAl.pc.in
Property changes on: trunk/tao/src/Tao.OpenAl/Properties
___________________________________________________________________
Name: svn:ignore
+ AssemblyInfo.cs.in
Property changes on: trunk/tao/src/Tao.OpenGl/Properties
___________________________________________________________________
Name: svn:ignore
+ AssemblyInfo.cs.in
Modified: trunk/tao/src/Tao.OpenGl/prebuild.xml
===================================================================
--- trunk/tao/src/Tao.OpenGl/prebuild.xml 2006-11-09 17:25:52 UTC (rev
67616)
+++ trunk/tao/src/Tao.OpenGl/prebuild.xml 2006-11-09 17:29:48 UTC (rev
67617)
@@ -20,12 +20,11 @@
</Options>
</Configuration>
<Files>
- <File>../Tao.OpenGl/Tao.OpenGl.License.txt</File>
- <File>../Tao.OpenGl/Tao.OpenGl.Readme.txt</File>
- <File>../Tao.OpenGl/Tao.OpenGl.snk</File>
- <File>../Tao.OpenGl/Tao.OpenGl.dll.config</File>
+ <File>Tao.OpenGl.License.txt</File>
+ <File>Tao.OpenGl.Readme.txt</File>
+ <File>Tao.OpenGl.dll.config</File>
</Files>
- <Project name="Tao.OpenGl" path="../Tao.OpenGl" language="C#"
type="Library" >
+ <Project name="Tao.OpenGl" path="." language="C#" type="Library"
designerFolder="Properties" >
<Configuration name="Debug">
<Options>
<CompilerDefines>DEBUG;TRACE;WIN32</CompilerDefines>
@@ -33,7 +32,7 @@
<AllowUnsafe>true</AllowUnsafe>
<OutputPath>bin/Debug</OutputPath>
<XmlDocFile>Tao.OpenGl.xml</XmlDocFile>
- <!-- KeyFile>../Tao.OpenGl/Tao.OpenGl.snk</KeyFile -->
+ <KeyFile>Tao.OpenGl.snk</KeyFile>
<DebugInformation>true</DebugInformation>
</Options>
</Configuration>
@@ -44,13 +43,14 @@
<AllowUnsafe>true</AllowUnsafe>
<OutputPath>bin/Release</OutputPath>
<XmlDocFile>Tao.OpenGl.xml</XmlDocFile>
- <!-- KeyFile>../Tao.OpenGl/Tao.OpenGl.snk</KeyFile -->
+ <KeyFile>Tao.OpenGl.snk</KeyFile>
<DebugInformation>false</DebugInformation>
</Options>
</Configuration>
<Reference name="System" />
<Files>
- <Match path="." pattern="(?<!AssemblyInfo)\.cs$"
recurse="true" useRegex="true"/>
+ <File buildAction="None">Tao.OpenGl.snk</File>
+ <Match path="." pattern="*.cs" recurse="true"/>
</Files>
</Project>
</Solution>
Property changes on: trunk/tao/src/Tao.PhysFs/Properties
___________________________________________________________________
Name: svn:ignore
+ AssemblyInfo.cs.in
Property changes on: trunk/tao/src/Tao.Sdl/Properties
___________________________________________________________________
Name: svn:ignore
+ AssemblyInfo.cs.in
Modified: trunk/tao/src/Tao.Sdl/Properties/AssemblyInfo.cs
===================================================================
--- trunk/tao/src/Tao.Sdl/Properties/AssemblyInfo.cs 2006-11-09 17:25:52 UTC
(rev 67616)
+++ trunk/tao/src/Tao.Sdl/Properties/AssemblyInfo.cs 2006-11-09 17:29:48 UTC
(rev 67617)
@@ -42,7 +42,6 @@
[assembly: AssemblyFileVersion("2.1.0.0")]
[assembly: AssemblyInformationalVersion("2.1.0.0")]
[assembly: AssemblyKeyName("")]
-[assembly:AssemblyKeyFile("Tao.Sdl.snk")]
[assembly: AssemblyProduct("Tao.Sdl.dll")]
[assembly: AssemblyTitle("Tao Framework Tao.Sdl Binding For .NET")]
[assembly: AssemblyTrademark("Tao Framework -- http://www.taoframework.com")]
Modified: trunk/tao/src/Tao.Sdl/prebuild.xml
===================================================================
--- trunk/tao/src/Tao.Sdl/prebuild.xml 2006-11-09 17:25:52 UTC (rev 67616)
+++ trunk/tao/src/Tao.Sdl/prebuild.xml 2006-11-09 17:29:48 UTC (rev 67617)
@@ -78,7 +78,7 @@
<Reference name="nunit.framework"/>
<Reference name="Tao.Sdl" />
<Files>
- <Match path="." pattern="(?<!AssemblyInfo)\.cs$"
recurse="true" useRegex="true"/>
+ <Match path="." pattern="*.cs" recurse="true"/>
</Files>
</Project>
<Project name="SdlExamples.Rectangles"
path="../../examples/SdlExamples/Rectangles" language="C#" type="WinExe"
startupObject="SdlExamples.Rectangles" designerFolder="Properties">
@@ -105,7 +105,7 @@
<Reference name="System" />
<Reference name="Tao.Sdl" />
<Files>
- <Match path="." pattern="(?<!AssemblyInfo)\.cs$"
recurse="true" useRegex="true"/>
+ <Match path="." pattern="*.cs" recurse="true"/>
</Files>
</Project>
<Project name="SdlExamples.SmpegPlayer"
path="../../examples/SdlExamples/SmpegPlayer" language="C#" type="WinExe"
startupObject="SdlExamples.SmpegPlayer" designerFolder="Properties">
@@ -132,7 +132,7 @@
<Reference name="System" />
<Reference name="Tao.Sdl" />
<Files>
- <Match path="." pattern="(?<!AssemblyInfo)\.cs$"
recurse="true" useRegex="true"/>
+ <Match path="." pattern="*.cs" recurse="true"/>
</Files>
</Project>
<Project name="SdlExamples.GfxPrimitives"
path="../../examples/SdlExamples/GfxPrimitives" language="C#" type="WinExe"
startupObject="SdlExamples.GfxPrimitives" designerFolder="Properties">
@@ -159,7 +159,7 @@
<Reference name="System" />
<Reference name="Tao.Sdl" />
<Files>
- <Match path="." pattern="(?<!AssemblyInfo)\.cs$"
recurse="true" useRegex="true"/>
+ <Match path="." pattern="*.cs" recurse="true"/>
</Files>
</Project>
</Solution>
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches