Skip to content
This repository has been archived by the owner on Feb 11, 2021. It is now read-only.

Commit

Permalink
Fixed bug 1287 - VS2010 project doesn't include the SDL_syscond.c file
Browse files Browse the repository at this point in the history 
Liam 2011-08-23 09:09:18 PDT
Hiya!

Seems like there's no implementation of condition variables included when
building with VS2010, adding the generic SDL_syscond.c file to the project
seems to fix it right up.
  • Loading branch information
@slouken
slouken committed Jan 8, 2012
1 parent 542e375 commit c9d83e1
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 40 deletions.
4 changes: 4 additions & 0 deletions VisualC/SDL/SDL_VS2005.vcproj
View file
Expand Up @@ -1083,6 +1083,10 @@
RelativePath="..\..\src\audio\SDL_sysaudio.h"
>
</File>
<File
RelativePath="..\..\src\thread\generic\SDL_syscond.c"
>
</File>
<File
RelativePath="..\..\src\events\SDL_sysevents.h"
>
Expand Down
82 changes: 43 additions & 39 deletions VisualC/SDL/SDL_VS2008.vcproj
View file
Expand Up @@ -104,16 +104,17 @@
/>
</Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
Name="Release|Win32"
OutputDirectory=".\Release"
IntermediateDirectory=".\Release"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
<Tool
Name="VCPreBuildEventTool"
CommandLine=""
/>
<Tool
Name="VCCustomBuildTool"
Expand All @@ -126,31 +127,33 @@
/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="_DEBUG"
PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="3"
TypeLibraryName=".\Debug/SDL.tlb"
TargetEnvironment="1"
TypeLibraryName=".\Release/SDL.tlb"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
InlineFunctionExpansion="1"
EnableIntrinsicFunctions="false"
AdditionalIncludeDirectories="..\..\include"
PreprocessorDefinitions="_DEBUG;_WINDOWS"
PreprocessorDefinitions="NDEBUG;_WINDOWS"
StringPooling="true"
RuntimeLibrary="2"
BufferSecurityCheck="false"
EnableFunctionLevelLinking="true"
WarningLevel="3"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
/>
<Tool
Expand All @@ -162,9 +165,7 @@
OutputFile="$(IntDir)\SDL.dll"
SuppressStartupBanner="true"
IgnoreAllDefaultLibraries="true"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
Expand All @@ -189,17 +190,16 @@
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory=".\Release"
IntermediateDirectory=".\Release"
Name="Debug|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
<Tool
Name="VCPreBuildEventTool"
CommandLine=""
/>
<Tool
Name="VCCustomBuildTool"
Expand All @@ -212,33 +212,31 @@
/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="NDEBUG"
PreprocessorDefinitions="_DEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
TypeLibraryName=".\Release/SDL.tlb"
TargetEnvironment="3"
TypeLibraryName=".\Debug/SDL.tlb"
/>
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
EnableIntrinsicFunctions="false"
Optimization="0"
AdditionalIncludeDirectories="..\..\include"
PreprocessorDefinitions="NDEBUG;_WINDOWS"
StringPooling="true"
PreprocessorDefinitions="_DEBUG;_WINDOWS"
RuntimeLibrary="2"
BufferSecurityCheck="false"
EnableFunctionLevelLinking="true"
WarningLevel="3"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
PreprocessorDefinitions="_DEBUG"
Culture="1033"
/>
<Tool
Expand All @@ -250,7 +248,9 @@
OutputFile="$(IntDir)\SDL.dll"
SuppressStartupBanner="true"
IgnoreAllDefaultLibraries="true"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
Expand Down Expand Up @@ -785,11 +785,11 @@
>
</File>
<File
RelativePath="..\..\src\audio\winmm\SDL_winmm.c"
RelativePath="..\..\src\audio\directsound\SDL_directsound.c"
>
</File>
<File
RelativePath="..\..\src\audio\winmm\SDL_winmm.h"
RelativePath="..\..\src\audio\directsound\SDL_directsound.h"
>
</File>
<File
Expand Down Expand Up @@ -828,18 +828,6 @@
RelativePath="..\..\src\audio\dummy\SDL_dummyaudio.h"
>
</File>
<File
RelativePath="..\..\src\audio\directsound\SDL_directsound.c"
>
</File>
<File
RelativePath="..\..\src\audio\directsound\SDL_directsound.h"
>
</File>
<File
RelativePath="..\..\src\audio\xaudio2\SDL_xaudio2.c"
>
</File>
<File
RelativePath="..\..\src\joystick\windows\SDL_dxjoystick.c"
>
Expand Down Expand Up @@ -1072,6 +1060,10 @@
RelativePath="..\..\src\audio\SDL_sysaudio.h"
>
</File>
<File
RelativePath="..\..\src\thread\generic\SDL_syscond.c"
>
</File>
<File
RelativePath="..\..\src\events\SDL_sysevents.h"
>
Expand Down Expand Up @@ -1268,6 +1260,18 @@
RelativePath="..\..\src\video\windows\SDL_windowswindow.h"
>
</File>
<File
RelativePath="..\..\src\audio\winmm\SDL_winmm.c"
>
</File>
<File
RelativePath="..\..\src\audio\winmm\SDL_winmm.h"
>
</File>
<File
RelativePath="..\..\src\audio\xaudio2\SDL_xaudio2.c"
>
</File>
<File
RelativePath="..\..\src\render\SDL_yuv_mmx.c"
>
Expand Down
3 changes: 2 additions & 1 deletion VisualC/SDL/SDL_VS2010.vcxproj
View file
Expand Up @@ -413,6 +413,7 @@
<ClCompile Include="..\..\src\video\SDL_stretch.c" />
<ClCompile Include="..\..\src\stdlib\SDL_string.c" />
<ClCompile Include="..\..\src\video\SDL_surface.c" />
<ClCompile Include="..\..\src\thread\generic\SDL_syscond.c" />
<ClCompile Include="..\..\src\haptic\windows\SDL_syshaptic.c" />
<ClCompile Include="..\..\src\loadso\windows\SDL_sysloadso.c" />
<ClCompile Include="..\..\src\thread\windows\SDL_sysmutex.c" />
Expand Down Expand Up @@ -442,4 +443,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

0 comments on commit c9d83e1

Please sign in to comment.