diff options
| author | Arnon Gilboa <agilboa@redhat.com> | 2010-03-23 16:21:24 +0200 |
|---|---|---|
| committer | Uri Lublin <uril@redhat.com> | 2010-03-24 19:16:09 +0200 |
| commit | 56196e79bb4404c60fc8e0431c2506e495c9a0d8 (patch) | |
| tree | 908d30ad705b9f63d1e1fcb1f966414fef675606 | |
| parent | e66f3671002ee041cd4ca9ac3ee69be7278aa1d9 (diff) | |
| download | spice-56196e79bb4404c60fc8e0431c2506e495c9a0d8.tar.gz spice-56196e79bb4404c60fc8e0431c2506e495c9a0d8.tar.xz spice-56196e79bb4404c60fc8e0431c2506e495c9a0d8.zip | |
spice client: convert solution & project to VS2008 #576639
Change solution and project files.
VS2008 does not like a #define to appear above #include files,
so move it into its own .h file.
| -rw-r--r-- | client/display_channel.cpp | 6 | ||||
| -rw-r--r-- | client/glext_proto.h | 6 | ||||
| -rw-r--r-- | client/windows/redc.sln | 4 | ||||
| -rw-r--r-- | client/windows/redc.vcproj | 17 |
4 files changed, 19 insertions, 14 deletions
diff --git a/client/display_channel.cpp b/client/display_channel.cpp index b6696659..5f69abfe 100644 --- a/client/display_channel.cpp +++ b/client/display_channel.cpp @@ -15,8 +15,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#define GL_GLEXT_PROTOTYPES - +#include "glext_proto.h" #include "common.h" #include "canvas.h" #include "red_pixmap.h" @@ -25,7 +24,6 @@ #endif #include "debug.h" #include "utils.h" -#include "common.h" #include "display_channel.h" #include "application.h" #include "screen.h" @@ -34,8 +32,6 @@ #endif #include "red_cairo_canvas.h" #include "red_client.h" -#include "utils.h" -#include "debug.h" #ifdef WIN32 #include "red_gdi_canvas.h" #endif diff --git a/client/glext_proto.h b/client/glext_proto.h new file mode 100644 index 00000000..0ad39fe9 --- /dev/null +++ b/client/glext_proto.h @@ -0,0 +1,6 @@ +#ifndef _H_GLEXT_PROTO +#define _H_GLEXT_PROTO + +#define GL_GLEXT_PROTOTYPES + +#endif diff --git a/client/windows/redc.sln b/client/windows/redc.sln index 0562b95e..a948239a 100644 --- a/client/windows/redc.sln +++ b/client/windows/redc.sln @@ -1,6 +1,6 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "redc", "redc.vcproj", "{4F03BAF9-DFBC-4CA7-B860-8929555981AE}"
EndProject
Global
diff --git a/client/windows/redc.vcproj b/client/windows/redc.vcproj index f4ca1b6b..806cdd41 100644 --- a/client/windows/redc.vcproj +++ b/client/windows/redc.vcproj @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="windows-1255"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9.00"
Name="redc"
ProjectGUID="{4F03BAF9-DFBC-4CA7-B860-8929555981AE}"
RootNamespace="redc"
Keyword="Win32Proj"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -71,6 +72,8 @@ IgnoreAllDefaultLibraries="false"
GenerateDebugInformation="true"
SubSystem="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -92,9 +95,6 @@ Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -152,6 +152,8 @@ SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -173,9 +175,6 @@ Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -469,6 +468,10 @@ >
</File>
<File
+ RelativePath="..\glext_proto.h"
+ >
+ </File>
+ <File
RelativePath="..\glz_decoded_image.h"
>
</File>
|