Fixed bug 1287 - VS2010 project doesn't include the SDL_syscond.c file
authorSam Lantinga
Sun, 08 Jan 2012 01:15:20 -0500
changeset 61876b1932e5a36b
parent 6186 e565ac981de6
child 6188 e82023802002
Fixed bug 1287 - VS2010 project doesn't include the SDL_syscond.c file

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.
VisualC/SDL/SDL_VS2005.vcproj
VisualC/SDL/SDL_VS2008.vcproj
VisualC/SDL/SDL_VS2010.vcxproj
     1.1 --- a/VisualC/SDL/SDL_VS2005.vcproj	Sun Jan 08 01:05:25 2012 -0500
     1.2 +++ b/VisualC/SDL/SDL_VS2005.vcproj	Sun Jan 08 01:15:20 2012 -0500
     1.3 @@ -1084,6 +1084,10 @@
     1.4  			>
     1.5  		</File>
     1.6  		<File
     1.7 +			RelativePath="..\..\src\thread\generic\SDL_syscond.c"
     1.8 +			>
     1.9 +		</File>
    1.10 +		<File
    1.11  			RelativePath="..\..\src\events\SDL_sysevents.h"
    1.12  			>
    1.13  		</File>
     2.1 --- a/VisualC/SDL/SDL_VS2008.vcproj	Sun Jan 08 01:05:25 2012 -0500
     2.2 +++ b/VisualC/SDL/SDL_VS2008.vcproj	Sun Jan 08 01:15:20 2012 -0500
     2.3 @@ -104,91 +104,6 @@
     2.4  			/>
     2.5  		</Configuration>
     2.6  		<Configuration
     2.7 -			Name="Debug|x64"
     2.8 -			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
     2.9 -			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
    2.10 -			ConfigurationType="2"
    2.11 -			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
    2.12 -			UseOfMFC="0"
    2.13 -			ATLMinimizesCRunTimeLibraryUsage="false"
    2.14 -			>
    2.15 -			<Tool
    2.16 -				Name="VCPreBuildEventTool"
    2.17 -			/>
    2.18 -			<Tool
    2.19 -				Name="VCCustomBuildTool"
    2.20 -			/>
    2.21 -			<Tool
    2.22 -				Name="VCXMLDataGeneratorTool"
    2.23 -			/>
    2.24 -			<Tool
    2.25 -				Name="VCWebServiceProxyGeneratorTool"
    2.26 -			/>
    2.27 -			<Tool
    2.28 -				Name="VCMIDLTool"
    2.29 -				PreprocessorDefinitions="_DEBUG"
    2.30 -				MkTypLibCompatible="true"
    2.31 -				SuppressStartupBanner="true"
    2.32 -				TargetEnvironment="3"
    2.33 -				TypeLibraryName=".\Debug/SDL.tlb"
    2.34 -			/>
    2.35 -			<Tool
    2.36 -				Name="VCCLCompilerTool"
    2.37 -				Optimization="0"
    2.38 -				AdditionalIncludeDirectories="..\..\include"
    2.39 -				PreprocessorDefinitions="_DEBUG;_WINDOWS"
    2.40 -				RuntimeLibrary="2"
    2.41 -				BufferSecurityCheck="false"
    2.42 -				WarningLevel="3"
    2.43 -				SuppressStartupBanner="true"
    2.44 -				Detect64BitPortabilityProblems="false"
    2.45 -				DebugInformationFormat="3"
    2.46 -				CompileAs="0"
    2.47 -			/>
    2.48 -			<Tool
    2.49 -				Name="VCManagedResourceCompilerTool"
    2.50 -			/>
    2.51 -			<Tool
    2.52 -				Name="VCResourceCompilerTool"
    2.53 -				PreprocessorDefinitions="_DEBUG"
    2.54 -				Culture="1033"
    2.55 -			/>
    2.56 -			<Tool
    2.57 -				Name="VCPreLinkEventTool"
    2.58 -			/>
    2.59 -			<Tool
    2.60 -				Name="VCLinkerTool"
    2.61 -				AdditionalDependencies="winmm.lib imm32.lib version.lib"
    2.62 -				OutputFile="$(IntDir)\SDL.dll"
    2.63 -				SuppressStartupBanner="true"
    2.64 -				IgnoreAllDefaultLibraries="true"
    2.65 -				GenerateDebugInformation="true"
    2.66 -				SubSystem="2"
    2.67 -				TargetMachine="17"
    2.68 -			/>
    2.69 -			<Tool
    2.70 -				Name="VCALinkTool"
    2.71 -			/>
    2.72 -			<Tool
    2.73 -				Name="VCManifestTool"
    2.74 -			/>
    2.75 -			<Tool
    2.76 -				Name="VCXDCMakeTool"
    2.77 -			/>
    2.78 -			<Tool
    2.79 -				Name="VCBscMakeTool"
    2.80 -			/>
    2.81 -			<Tool
    2.82 -				Name="VCFxCopTool"
    2.83 -			/>
    2.84 -			<Tool
    2.85 -				Name="VCAppVerifierTool"
    2.86 -			/>
    2.87 -			<Tool
    2.88 -				Name="VCPostBuildEventTool"
    2.89 -			/>
    2.90 -		</Configuration>
    2.91 -		<Configuration
    2.92  			Name="Release|Win32"
    2.93  			OutputDirectory=".\Release"
    2.94  			IntermediateDirectory=".\Release"
    2.95 @@ -275,6 +190,91 @@
    2.96  			/>
    2.97  		</Configuration>
    2.98  		<Configuration
    2.99 +			Name="Debug|x64"
   2.100 +			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
   2.101 +			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
   2.102 +			ConfigurationType="2"
   2.103 +			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
   2.104 +			UseOfMFC="0"
   2.105 +			ATLMinimizesCRunTimeLibraryUsage="false"
   2.106 +			>
   2.107 +			<Tool
   2.108 +				Name="VCPreBuildEventTool"
   2.109 +			/>
   2.110 +			<Tool
   2.111 +				Name="VCCustomBuildTool"
   2.112 +			/>
   2.113 +			<Tool
   2.114 +				Name="VCXMLDataGeneratorTool"
   2.115 +			/>
   2.116 +			<Tool
   2.117 +				Name="VCWebServiceProxyGeneratorTool"
   2.118 +			/>
   2.119 +			<Tool
   2.120 +				Name="VCMIDLTool"
   2.121 +				PreprocessorDefinitions="_DEBUG"
   2.122 +				MkTypLibCompatible="true"
   2.123 +				SuppressStartupBanner="true"
   2.124 +				TargetEnvironment="3"
   2.125 +				TypeLibraryName=".\Debug/SDL.tlb"
   2.126 +			/>
   2.127 +			<Tool
   2.128 +				Name="VCCLCompilerTool"
   2.129 +				Optimization="0"
   2.130 +				AdditionalIncludeDirectories="..\..\include"
   2.131 +				PreprocessorDefinitions="_DEBUG;_WINDOWS"
   2.132 +				RuntimeLibrary="2"
   2.133 +				BufferSecurityCheck="false"
   2.134 +				WarningLevel="3"
   2.135 +				SuppressStartupBanner="true"
   2.136 +				Detect64BitPortabilityProblems="false"
   2.137 +				DebugInformationFormat="3"
   2.138 +				CompileAs="0"
   2.139 +			/>
   2.140 +			<Tool
   2.141 +				Name="VCManagedResourceCompilerTool"
   2.142 +			/>
   2.143 +			<Tool
   2.144 +				Name="VCResourceCompilerTool"
   2.145 +				PreprocessorDefinitions="_DEBUG"
   2.146 +				Culture="1033"
   2.147 +			/>
   2.148 +			<Tool
   2.149 +				Name="VCPreLinkEventTool"
   2.150 +			/>
   2.151 +			<Tool
   2.152 +				Name="VCLinkerTool"
   2.153 +				AdditionalDependencies="winmm.lib imm32.lib version.lib"
   2.154 +				OutputFile="$(IntDir)\SDL.dll"
   2.155 +				SuppressStartupBanner="true"
   2.156 +				IgnoreAllDefaultLibraries="true"
   2.157 +				GenerateDebugInformation="true"
   2.158 +				SubSystem="2"
   2.159 +				TargetMachine="17"
   2.160 +			/>
   2.161 +			<Tool
   2.162 +				Name="VCALinkTool"
   2.163 +			/>
   2.164 +			<Tool
   2.165 +				Name="VCManifestTool"
   2.166 +			/>
   2.167 +			<Tool
   2.168 +				Name="VCXDCMakeTool"
   2.169 +			/>
   2.170 +			<Tool
   2.171 +				Name="VCBscMakeTool"
   2.172 +			/>
   2.173 +			<Tool
   2.174 +				Name="VCFxCopTool"
   2.175 +			/>
   2.176 +			<Tool
   2.177 +				Name="VCAppVerifierTool"
   2.178 +			/>
   2.179 +			<Tool
   2.180 +				Name="VCPostBuildEventTool"
   2.181 +			/>
   2.182 +		</Configuration>
   2.183 +		<Configuration
   2.184  			Name="Release|x64"
   2.185  			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
   2.186  			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
   2.187 @@ -785,11 +785,11 @@
   2.188  			>
   2.189  		</File>
   2.190  		<File
   2.191 -			RelativePath="..\..\src\audio\winmm\SDL_winmm.c"
   2.192 +			RelativePath="..\..\src\audio\directsound\SDL_directsound.c"
   2.193  			>
   2.194  		</File>
   2.195  		<File
   2.196 -			RelativePath="..\..\src\audio\winmm\SDL_winmm.h"
   2.197 +			RelativePath="..\..\src\audio\directsound\SDL_directsound.h"
   2.198  			>
   2.199  		</File>
   2.200  		<File
   2.201 @@ -829,18 +829,6 @@
   2.202  			>
   2.203  		</File>
   2.204  		<File
   2.205 -			RelativePath="..\..\src\audio\directsound\SDL_directsound.c"
   2.206 -			>
   2.207 -		</File>
   2.208 -		<File
   2.209 -			RelativePath="..\..\src\audio\directsound\SDL_directsound.h"
   2.210 -			>
   2.211 -		</File>
   2.212 -		<File
   2.213 -			RelativePath="..\..\src\audio\xaudio2\SDL_xaudio2.c"
   2.214 -			>
   2.215 -		</File>
   2.216 -		<File
   2.217  			RelativePath="..\..\src\joystick\windows\SDL_dxjoystick.c"
   2.218  			>
   2.219  		</File>
   2.220 @@ -1073,6 +1061,10 @@
   2.221  			>
   2.222  		</File>
   2.223  		<File
   2.224 +			RelativePath="..\..\src\thread\generic\SDL_syscond.c"
   2.225 +			>
   2.226 +		</File>
   2.227 +		<File
   2.228  			RelativePath="..\..\src\events\SDL_sysevents.h"
   2.229  			>
   2.230  		</File>
   2.231 @@ -1269,6 +1261,18 @@
   2.232  			>
   2.233  		</File>
   2.234  		<File
   2.235 +			RelativePath="..\..\src\audio\winmm\SDL_winmm.c"
   2.236 +			>
   2.237 +		</File>
   2.238 +		<File
   2.239 +			RelativePath="..\..\src\audio\winmm\SDL_winmm.h"
   2.240 +			>
   2.241 +		</File>
   2.242 +		<File
   2.243 +			RelativePath="..\..\src\audio\xaudio2\SDL_xaudio2.c"
   2.244 +			>
   2.245 +		</File>
   2.246 +		<File
   2.247  			RelativePath="..\..\src\render\SDL_yuv_mmx.c"
   2.248  			>
   2.249  		</File>
     3.1 --- a/VisualC/SDL/SDL_VS2010.vcxproj	Sun Jan 08 01:05:25 2012 -0500
     3.2 +++ b/VisualC/SDL/SDL_VS2010.vcxproj	Sun Jan 08 01:15:20 2012 -0500
     3.3 @@ -413,6 +413,7 @@
     3.4      <ClCompile Include="..\..\src\video\SDL_stretch.c" />
     3.5      <ClCompile Include="..\..\src\stdlib\SDL_string.c" />
     3.6      <ClCompile Include="..\..\src\video\SDL_surface.c" />
     3.7 +    <ClCompile Include="..\..\src\thread\generic\SDL_syscond.c" />
     3.8      <ClCompile Include="..\..\src\haptic\windows\SDL_syshaptic.c" />
     3.9      <ClCompile Include="..\..\src\loadso\windows\SDL_sysloadso.c" />
    3.10      <ClCompile Include="..\..\src\thread\windows\SDL_sysmutex.c" />
    3.11 @@ -442,4 +443,4 @@
    3.12    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    3.13    <ImportGroup Label="ExtensionTargets">
    3.14    </ImportGroup>
    3.15 -</Project>
    3.16 \ No newline at end of file
    3.17 +</Project>