summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Isorce <julien.isorce@gmail.com>2009-01-24 00:50:46 +0100
committerJulien Isorce <julien.isorce@gmail.com>2009-01-24 00:50:46 +0100
commit8342dea88ed2d87ed706ccdcd57af4941e308ab0 (patch)
tree7be349aa942edacabea2dc6e7deea266bb7bc543
parentfed46a661d1d83a875422b4943085e8ddefadfab (diff)
vs8 -> vs9 about gtk examples
-rw-r--r--tests/examples/generic/cube/cube.vcproj21
-rw-r--r--tests/examples/generic/cubeyuv/cubeyuv.vcproj21
-rw-r--r--tests/examples/generic/doublecube/doublecube.vcproj21
-rw-r--r--tests/examples/generic/generic.sln4
-rw-r--r--tests/examples/generic/recordgraphic/recordgraphic.vcproj21
-rw-r--r--win32/vs9/libgstopengl.vcproj8
6 files changed, 46 insertions, 50 deletions
diff --git a/tests/examples/generic/cube/cube.vcproj b/tests/examples/generic/cube/cube.vcproj
index cc02eab..6de5e43 100644
--- a/tests/examples/generic/cube/cube.vcproj
+++ b/tests/examples/generic/cube/cube.vcproj
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8,00"
+ Version="9,00"
Name="cube"
ProjectGUID="{DA41FBFF-E1DE-4DA1-BB96-C56C63D5CDBE}"
RootNamespace="cube"
Keyword="Win32Proj"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -40,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="&quot;..\..\..\..\libxml2-2.6.30+.win32\include&quot;;..\..\..\..\libiconv\include;..\..\..\..\glib\include;..\..\..\..\gstreamer\include"
+ AdditionalIncludeDirectories="&quot;..\..\..\..\..\glib\include\glib-2.0&quot;;&quot;..\..\..\..\..\glib\lib\glib-2.0\include&quot;;..\..\..\..\..\gstreamer\include;..\..\..\..\..\glew\include"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -63,9 +64,11 @@
Name="VCLinkerTool"
AdditionalDependencies="libgstreamer-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib opengl32.lib glu32.lib glew32.lib glew32s.lib"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\..\..\..\glib\lib;..\..\..\..\gstreamer\lib"
+ AdditionalLibraryDirectories="..\..\..\..\..\glib\lib;..\..\..\..\..\gstreamer\lib;..\..\..\..\..\glew\lib"
GenerateDebugInformation="true"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -87,9 +90,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -118,7 +118,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="&quot;..\..\..\..\libxml2-2.6.30+.win32\include&quot;;..\..\..\..\libiconv\include;..\..\..\..\glib\include;..\..\..\..\gstreamer\include"
+ AdditionalIncludeDirectories="&quot;..\..\..\..\..\glib\include\glib-2.0&quot;;&quot;..\..\..\..\..\glib\lib\glib-2.0\include&quot;;..\..\..\..\..\gstreamer\include;..\..\..\..\..\glew\include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -139,11 +139,13 @@
Name="VCLinkerTool"
AdditionalDependencies="libgstreamer-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib opengl32.lib glu32.lib glew32.lib glew32s.lib"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\..\..\glib\lib;..\..\..\..\gstreamer\lib"
+ AdditionalLibraryDirectories="..\..\..\..\..\glib\lib;..\..\..\..\..\gstreamer\lib;..\..\..\..\..\glew\lib"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -165,9 +167,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
diff --git a/tests/examples/generic/cubeyuv/cubeyuv.vcproj b/tests/examples/generic/cubeyuv/cubeyuv.vcproj
index 27e5a89..f88609d 100644
--- a/tests/examples/generic/cubeyuv/cubeyuv.vcproj
+++ b/tests/examples/generic/cubeyuv/cubeyuv.vcproj
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8,00"
+ Version="9,00"
Name="cubeyuv"
ProjectGUID="{6C94B86A-8E34-4163-840A-BFD5C80B1F2E}"
RootNamespace="cubeyuv"
Keyword="Win32Proj"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -40,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="&quot;..\..\..\..\libxml2-2.6.30+.win32\include&quot;;..\..\..\..\libiconv\include;..\..\..\..\glib\include;..\..\..\..\gstreamer\include"
+ AdditionalIncludeDirectories="&quot;..\..\..\..\..\glib\include\glib-2.0&quot;;&quot;..\..\..\..\..\glib\lib\glib-2.0\include&quot;;..\..\..\..\..\gstreamer\include;..\..\..\..\..\glew\include"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -63,9 +64,11 @@
Name="VCLinkerTool"
AdditionalDependencies="libgstreamer-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib opengl32.lib glu32.lib glew32.lib glew32s.lib"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\..\..\..\glib\lib;..\..\..\..\gstreamer\lib"
+ AdditionalLibraryDirectories="..\..\..\..\..\glib\lib;..\..\..\..\..\gstreamer\lib;..\..\..\..\..\glew\lib"
GenerateDebugInformation="true"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -87,9 +90,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -118,7 +118,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="&quot;..\..\..\..\libxml2-2.6.30+.win32\include&quot;;..\..\..\..\libiconv\include;..\..\..\..\glib\include;..\..\..\..\gstreamer\include"
+ AdditionalIncludeDirectories="&quot;..\..\..\..\..\glib\include\glib-2.0&quot;;&quot;..\..\..\..\..\glib\lib\glib-2.0\include&quot;;..\..\..\..\..\gstreamer\include;..\..\..\..\..\glew\include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -139,11 +139,13 @@
Name="VCLinkerTool"
AdditionalDependencies="libgstreamer-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib opengl32.lib glu32.lib glew32.lib glew32s.lib"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\..\..\glib\lib;..\..\..\..\gstreamer\lib"
+ AdditionalLibraryDirectories="..\..\..\..\..\glib\lib;..\..\..\..\..\gstreamer\lib;..\..\..\..\..\glew\lib"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -165,9 +167,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
diff --git a/tests/examples/generic/doublecube/doublecube.vcproj b/tests/examples/generic/doublecube/doublecube.vcproj
index d008b1f..aa6a1bb 100644
--- a/tests/examples/generic/doublecube/doublecube.vcproj
+++ b/tests/examples/generic/doublecube/doublecube.vcproj
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8,00"
+ Version="9,00"
Name="doublecube"
ProjectGUID="{4EC968E0-5B6C-418A-8A75-F390D56DFFE8}"
RootNamespace="doublecube"
Keyword="Win32Proj"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -40,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="&quot;..\..\..\..\libxml2-2.6.30+.win32\include&quot;;..\..\..\..\libiconv\include;..\..\..\..\glib\include;..\..\..\..\gstreamer\include"
+ AdditionalIncludeDirectories="&quot;..\..\..\..\..\glib\include\glib-2.0&quot;;&quot;..\..\..\..\..\glib\lib\glib-2.0\include&quot;;..\..\..\..\..\gstreamer\include;..\..\..\..\..\glew\include"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -63,9 +64,11 @@
Name="VCLinkerTool"
AdditionalDependencies="libgstreamer-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib opengl32.lib glu32.lib glew32.lib glew32s.lib"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\..\..\..\glib\lib;..\..\..\..\gstreamer\lib"
+ AdditionalLibraryDirectories="..\..\..\..\..\glib\lib;..\..\..\..\..\gstreamer\lib;..\..\..\..\..\glew\lib"
GenerateDebugInformation="true"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -87,9 +90,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -118,7 +118,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="&quot;..\..\..\..\libxml2-2.6.30+.win32\include&quot;;..\..\..\..\libiconv\include;..\..\..\..\glib\include;..\..\..\..\gstreamer\include"
+ AdditionalIncludeDirectories="&quot;..\..\..\..\..\glib\include\glib-2.0&quot;;&quot;..\..\..\..\..\glib\lib\glib-2.0\include&quot;;..\..\..\..\..\gstreamer\include;..\..\..\..\..\glew\include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -139,11 +139,13 @@
Name="VCLinkerTool"
AdditionalDependencies="libgstreamer-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib opengl32.lib glu32.lib glew32.lib glew32s.lib"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\..\..\glib\lib;..\..\..\..\gstreamer\lib"
+ AdditionalLibraryDirectories="..\..\..\..\..\glib\lib;..\..\..\..\..\gstreamer\lib;..\..\..\..\..\glew\lib"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -165,9 +167,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
diff --git a/tests/examples/generic/generic.sln b/tests/examples/generic/generic.sln
index 4cd3865..22e86f6 100644
--- a/tests/examples/generic/generic.sln
+++ b/tests/examples/generic/generic.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}") = "cube", "cube\cube.vcproj", "{DA41FBFF-E1DE-4DA1-BB96-C56C63D5CDBE}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cubeyuv", "cubeyuv\cubeyuv.vcproj", "{6C94B86A-8E34-4163-840A-BFD5C80B1F2E}"
diff --git a/tests/examples/generic/recordgraphic/recordgraphic.vcproj b/tests/examples/generic/recordgraphic/recordgraphic.vcproj
index 211d84f..d93960a 100644
--- a/tests/examples/generic/recordgraphic/recordgraphic.vcproj
+++ b/tests/examples/generic/recordgraphic/recordgraphic.vcproj
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8,00"
+ Version="9,00"
Name="recordgraphic"
ProjectGUID="{E9A5E91B-5F8B-4322-9531-00CCFCB29A2D}"
RootNamespace="recordgraphic"
Keyword="Win32Proj"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -40,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="&quot;..\..\..\..\libxml2-2.6.30+.win32\include&quot;;..\..\..\..\libiconv\include;..\..\..\..\glib\include;..\..\..\..\gstreamer\include"
+ AdditionalIncludeDirectories="&quot;..\..\..\..\..\glib\include\glib-2.0&quot;;&quot;..\..\..\..\..\glib\lib\glib-2.0\include&quot;;..\..\..\..\..\gstreamer\include;..\..\..\..\..\glew\include"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -63,9 +64,11 @@
Name="VCLinkerTool"
AdditionalDependencies="libgstreamer-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib opengl32.lib glu32.lib glew32.lib glew32s.lib"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\..\..\..\glib\lib;..\..\..\..\gstreamer\lib"
+ AdditionalLibraryDirectories="..\..\..\..\..\glib\lib;..\..\..\..\..\gstreamer\lib;..\..\..\..\..\glew\lib"
GenerateDebugInformation="true"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -87,9 +90,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -118,7 +118,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="&quot;..\..\..\..\libxml2-2.6.30+.win32\include&quot;;..\..\..\..\libiconv\include;..\..\..\..\glib\include;..\..\..\..\gstreamer\include"
+ AdditionalIncludeDirectories="&quot;..\..\..\..\..\glib\include\glib-2.0&quot;;&quot;..\..\..\..\..\glib\lib\glib-2.0\include&quot;;..\..\..\..\..\gstreamer\include;..\..\..\..\..\glew\include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -139,11 +139,13 @@
Name="VCLinkerTool"
AdditionalDependencies="libgstreamer-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib opengl32.lib glu32.lib glew32.lib glew32s.lib"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\..\..\glib\lib;..\..\..\..\gstreamer\lib"
+ AdditionalLibraryDirectories="..\..\..\..\..\glib\lib;..\..\..\..\..\gstreamer\lib;..\..\..\..\..\glew\lib"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -165,9 +167,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
diff --git a/win32/vs9/libgstopengl.vcproj b/win32/vs9/libgstopengl.vcproj
index e1cae21..4164248 100644
--- a/win32/vs9/libgstopengl.vcproj
+++ b/win32/vs9/libgstopengl.vcproj
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="&quot;D:\workspace\glib\include\glib-2.0&quot;;&quot;D:\workspace\glib\lib\glib-2.0\include&quot;;D:\workspace\gstreamer\include;D:\workspace\glew\include;D:\workspace\png\include;D:\workspace\zlib\include;..\common;&quot;..\..\gst-libs\gst\gl&quot;;..\..\gst\gl;..\..\gst\gl\effects;&quot;..\..\gst-libs&quot;"
+ AdditionalIncludeDirectories="&quot;..\..\..\glib\include\glib-2.0&quot;;&quot;..\..\..\glib\lib\glib-2.0\include&quot;;..\..\..\gstreamer\include;..\..\..\glew\include;..\..\..\png\include;..\..\..\zlib\include;..\common;&quot;..\..\gst-libs\gst\gl&quot;;..\..\gst\gl;..\..\gst\gl\effects;&quot;..\..\gst-libs&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBGSTGL_EXPORTS;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;HAVE_GDKPIXBUF"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -64,7 +64,7 @@
Name="VCLinkerTool"
AdditionalDependencies="libgstreamer-0.10.lib libgstbase-0.10.lib libgstinterfaces-0.10.lib libgstvideo-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib libpngd.lib zlibd.lib opengl32.lib glu32.lib glew32.lib glew32s.lib winmm.lib"
LinkIncremental="2"
- AdditionalLibraryDirectories="D:\workspace\gstreamer\lib;D:\workspace\glib\lib;D:\workspace\glew\lib;D:\workspace\png\lib;D:\workspace\zlib\lib"
+ AdditionalLibraryDirectories="..\..\..\gstreamer\lib;..\..\..\glib\lib;..\..\..\glew\lib;..\..\..\png\lib;..\..\..\zlib\lib"
GenerateDebugInformation="true"
SubSystem="2"
RandomizedBaseAddress="1"
@@ -119,7 +119,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="&quot;D:\workspace\glib\include\glib-2.0&quot;;&quot;D:\workspace\glib\lib\glib-2.0\include&quot;;D:\workspace\gstreamer\include;D:\workspace\glew\include;D:\workspace\png\include;D:\workspace\zlib\include;..\common;&quot;..\..\gst-libs\gst\gl&quot;;..\..\gst\gl;..\..\gst\gl\effects;&quot;..\..\gst-libs&quot;"
+ AdditionalIncludeDirectories="&quot;..\..\..\glib\include\glib-2.0&quot;;&quot;..\..\..\glib\lib\glib-2.0\include&quot;;..\..\..\gstreamer\include;..\..\..\glew\include;..\..\..\png\include;..\..\..\zlib\include;..\common;&quot;..\..\gst-libs\gst\gl&quot;;..\..\gst\gl;..\..\gst\gl\effects;&quot;..\..\gst-libs&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBGSTGL_EXPORTS;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;HAVE_GDKPIXBUF"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -140,7 +140,7 @@
Name="VCLinkerTool"
AdditionalDependencies="libgstreamer-0.10.lib libgstbase-0.10.lib libgstinterfaces-0.10.lib libgstvideo-0.10.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib libpng.lib zlib.lib opengl32.lib glu32.lib glew32.lib glew32s.lib winmm.lib"
LinkIncremental="1"
- AdditionalLibraryDirectories="D:\workspace\gstreamer\lib;D:\workspace\glib\lib;D:\workspace\glew\lib;D:\workspace\png\lib;D:\workspace\zlib\lib"
+ AdditionalLibraryDirectories="..\..\..\gstreamer\lib;..\..\..\glib\lib;..\..\..\glew\lib;..\..\..\png\lib;..\..\..\zlib\lib"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"