Merge recent changes from the witness.

This commit is contained in:
castano
2010-08-31 01:39:08 +00:00
parent 47e8f23e9f
commit e8dc679874
44 changed files with 2465 additions and 2216 deletions

View File

@ -12,16 +12,24 @@
Name="SrcDir"
Value="$(SolutionDir)..\..\src"
/>
<UserMacro
Name="ExternDir"
Value="$(SolutionDir)..\..\extern"
/>
<UserMacro
Name="PoshDir"
Value="$(SolutionDir)..\..\extern\poshlib"
Value="$(ExternDir)\poshlib"
/>
<UserMacro
Name="GnuWinDir"
Value="$(SolutionDir)..\..\extern\gnuwin32"
Value="$(ExternDir)\gnuwin32"
/>
<UserMacro
Name="FreeImageDir"
Value="$(SolutionDir)..\..\extern\FreeImage"
Value="$(ExternDir)\FreeImage"
/>
<UserMacro
Name="GlewDir"
Value="$(ExternDir)\glew"
/>
</VisualStudioPropertySheet>