summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChun-wei Fan <fanchunwei@src.gnome.org>2014-03-03 11:10:46 +0800
committerChun-wei Fan <fanchunwei@src.gnome.org>2014-03-03 11:10:46 +0800
commit2568182506351766999e28521ae8d9f95ff156d8 (patch)
tree30d3365559bb25fc72c917fe1cec2c9d38bd214e
parente69dd84004447c70aaf2fba01917afac8829e72a (diff)
downloadcogl-2568182506351766999e28521ae8d9f95ff156d8.tar.gz
MSVC 2008 Builds: Build the SDL-2.x example
...instead of the SDL-1.x example. The SDL-1.x example is not going to run well against Cogl built against SDL-2.x.
-rw-r--r--build/win32/vs9/Makefile.am2
-rw-r--r--build/win32/vs9/cogl-sdl2-hello.vcproj (renamed from build/win32/vs9/cogl-sdl-hello.vcproj)14
-rw-r--r--build/win32/vs9/cogl.sln2
3 files changed, 9 insertions, 9 deletions
diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am
index 0e93a3b6..76090620 100644
--- a/build/win32/vs9/Makefile.am
+++ b/build/win32/vs9/Makefile.am
@@ -11,7 +11,7 @@ EXTRA_DIST = \
test-conformance-cogl.vcproj \
test-conformance-cogl.vcprojin \
cogl-hello.vcproj \
- cogl-sdl-hello.vcproj \
+ cogl-sdl2-hello.vcproj \
cogl-crate.vcproj \
cogl-msaa.vcproj \
cogl-info.vcproj \
diff --git a/build/win32/vs9/cogl-sdl-hello.vcproj b/build/win32/vs9/cogl-sdl2-hello.vcproj
index 12b90426..1badfef7 100644
--- a/build/win32/vs9/cogl-sdl-hello.vcproj
+++ b/build/win32/vs9/cogl-sdl2-hello.vcproj
@@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
- Name="cogl-sdl-hello"
+ Name="cogl-sdl2-hello"
ProjectGUID="{0B5D144D-1872-42CD-8437-FFDCDD08C03E}"
- RootNamespace="coglsdlhello"
+ RootNamespace="coglsdl2hello"
Keyword="Win32Proj"
TargetFrameworkVersion="196613"
>
@@ -41,7 +41,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="SDL.lib SDLmain.lib"
+ AdditionalDependencies="SDL2.lib SDL2main.lib"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="1"
@@ -71,7 +71,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="SDL.lib SDLmain.lib"
+ AdditionalDependencies="SDL2.lib SDL2main.lib"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="1"
@@ -103,7 +103,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="SDL.lib SDLmain.lib"
+ AdditionalDependencies="SDL2.lib SDL2main.lib"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="1"
@@ -133,7 +133,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="SDL.lib SDLmain.lib"
+ AdditionalDependencies="SDL2.lib SDL2main.lib"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="1"
@@ -153,7 +153,7 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
- <File RelativePath="..\..\..\examples\cogl-sdl-hello.c" />
+ <File RelativePath="..\..\..\examples\cogl-sdl2-hello.c" />
</Filter>
</Files>
<Globals>
diff --git a/build/win32/vs9/cogl.sln b/build/win32/vs9/cogl.sln
index 0fed4a31..f91b99f6 100644
--- a/build/win32/vs9/cogl.sln
+++ b/build/win32/vs9/cogl.sln
@@ -18,7 +18,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-hello", "cogl-hello.vc
{F3A80987-5411-43DB-A23B-06F2076E1206} = {F3A80987-5411-43DB-A23B-06F2076E1206}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-sdl-hello", "cogl-sdl-hello.vcproj", "{0B5D144D-1872-42CD-8437-FFDCDD08C03E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-sdl2-hello", "cogl-sdl2-hello.vcproj", "{0B5D144D-1872-42CD-8437-FFDCDD08C03E}"
ProjectSection(ProjectDependencies) = postProject
{F3A80987-5411-43DB-A23B-06F2076E1206} = {F3A80987-5411-43DB-A23B-06F2076E1206}
EndProjectSection