using updated windows libraries:
http://www.spice-space.org/download/stable/wspice-x86_08032011.zip
http://www.spice-space.org/download/stable/wspice-x64_08032011.zip
-remove IgnoreDefaultLibraryNames="MSVCRT.lib", since pixman is now compiled
using MT threading model similar to other libraries. It used to be mistakenly
compiled with MD.
-downgrade freetype lib to 2.3.11-7, which is the one used/tested with
CEGUI 0.6.2
-pthread lib patched (InterlockedCompareExchange), so x64 client will no
longer crash on SelectClipRgn, BitBlt etc.
---
client/windows/redc.vcproj | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/client/windows/redc.vcproj b/client/windows/redc.vcproj
index a937001..b1b7341 100644
--- a/client/windows/redc.vcproj
+++ b/client/windows/redc.vcproj
@@ -72,12 +72,12 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="pixman-1D.lib
libeay32MTd.lib ssleay32MTd.lib ws2_32.lib msimg32.lib winmm.lib
libcelt_0_5_1D.lib pthreadVC2d.lib version.lib CEGUIBase_Static_d.lib
CEGUITGAImageCodec_Static_d.lib CEGUIExpatParser_Static_d.lib
freetype2312MT_D.lib libexpatMT_D.lib pcre_D.lib
CEGUIFalagardWRBase_Static_d.lib libjpeg-static-mt-debug.lib zlibwapiD.lib
png_d.lib cximage_d.lib"
+ AdditionalDependencies="pixman-1D.lib
libeay32MTd.lib ssleay32MTd.lib ws2_32.lib msimg32.lib winmm.lib
libcelt_0_5_1D.lib pthreadVC2d.lib version.lib CEGUIBase_Static_d.lib
CEGUITGAImageCodec_Static_d.lib CEGUIExpatParser_Static_d.lib
freetype2311MT_D.lib libexpatMT_D.lib pcre_D.lib
CEGUIFalagardWRBase_Static_d.lib libjpeg-static-mt-debug.lib zlibwapiD.lib
png_d.lib cximage_d.lib"
OutputFile="$(OutDir)\spicec.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(SPICE_LIBS)\lib""
IgnoreAllDefaultLibraries="false"
- IgnoreDefaultLibraryNames="MSVCRT.lib"
+ IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
SubSystem="2"
RandomizedBaseAddress="1"
@@ -160,12 +160,12 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="pixman-1D.lib
libeay32MTd.lib ssleay32MTd.lib ws2_32.lib msimg32.lib winmm.lib zlibwapiD.lib
version.lib pthreadVC2D.lib libjpeg-static-mt-debug.lib libcelt_0_5_1D.lib
CEGUIBase_Static_d.lib CEGUIExpatParser_Static_d.lib
CEGUIFalagardWRBase_Static_d.lib CEGUITGAImageCodec_Static_d.lib
freetype2312MT.lib libexpatMT.lib pcre.lib png_d.lib cximage_d.lib"
+ AdditionalDependencies="pixman-1D.lib
libeay32MTd.lib ssleay32MTd.lib ws2_32.lib msimg32.lib winmm.lib zlibwapiD.lib
version.lib pthreadVC2D.lib libjpeg-static-mt-debug.lib libcelt_0_5_1D.lib
CEGUIBase_Static_d.lib CEGUIExpatParser_Static_d.lib
CEGUIFalagardWRBase_Static_d.lib CEGUITGAImageCodec_Static_d.lib
freetype2311MT.lib libexpatMT.lib pcre.lib png_d.lib cximage_d.lib"
OutputFile="$(OutDir)\spicec.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(SPICE_LIBS)\lib64""
IgnoreAllDefaultLibraries="false"
- IgnoreDefaultLibraryNames="MSVCRT.lib"
+ IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
SubSystem="2"
RandomizedBaseAddress="1"
@@ -240,11 +240,11 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="pixman-1.lib
libeay32MT.lib ssleay32MT.lib ws2_32.lib msimg32.lib winmm.lib
libcelt_0_5_1.lib pthreadVC2.lib version.lib CEGUIBase_Static.lib
CEGUITGAImageCodec_Static.lib CEGUIExpatParser_Static.lib freetype2312MT.lib
libexpatMT.lib pcre.lib CEGUIFalagardWRBase_Static.lib libjpeg-static-mt.lib
zlibwapi.lib png.lib cximage.lib"
+ AdditionalDependencies="pixman-1.lib
libeay32MT.lib ssleay32MT.lib ws2_32.lib msimg32.lib winmm.lib
libcelt_0_5_1.lib pthreadVC2.lib version.lib CEGUIBase_Static.lib
CEGUITGAImageCodec_Static.lib CEGUIExpatParser_Static.lib freetype2311MT.lib
libexpatMT.lib pcre.lib CEGUIFalagardWRBase_Static.lib libjpeg-static-mt.lib
zlibwapi.lib png.lib cximage.lib"
OutputFile="$(OutDir)\spicec.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(SPICE_LIBS)\lib""
- IgnoreDefaultLibraryNames="MSVCRT.lib"
+ IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
@@ -323,12 +323,12 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="pixman-1.lib
libeay32MT.lib ssleay32MT.lib ws2_32.lib msimg32.lib winmm.lib zlibwapi.lib
version.lib pthreadVC2.lib libjpeg-static-mt.lib libcelt_0_5_1.lib
CEGUIBase_Static.lib CEGUIExpatParser_Static.lib CEGUIFalagardWRBase_Static.lib
CEGUITGAImageCodec_Static.lib freetype2312MT.lib libexpatMT.lib pcre.lib
png.lib cximage.lib"
+ AdditionalDependencies="pixman-1.lib
libeay32MT.lib ssleay32MT.lib ws2_32.lib msimg32.lib winmm.lib zlibwapi.lib
version.lib pthreadVC2.lib libjpeg-static-mt.lib libcelt_0_5_1.lib
CEGUIBase_Static.lib CEGUIExpatParser_Static.lib CEGUIFalagardWRBase_Static.lib
CEGUITGAImageCodec_Static.lib freetype2311MT.lib libexpatMT.lib pcre.lib
png.lib cximage.lib"
OutputFile="$(OutDir)\spicec.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(SPICE_LIBS)\lib64""
IgnoreAllDefaultLibraries="false"
- IgnoreDefaultLibraryNames="MSVCRT.lib"
+ IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
--
1.7.3.4
_______________________________________________
Spice-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/spice-devel
