Mercurial > sdl-ios-xcode

view VisualC/SDL/SDL_VS2005.vcproj @ 5080:6d94060d16a9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed bug #1011 Daniel Ellis 2010-06-25 15:20:31 PDT SDL based applications sometimes display the wrong application name in the Sound Preferences dialog when using pulseaudio. I can see from the code that the SDL pulse module is initiating a new pulse audio context and passing an application name using the function get_progname(). The get_progname() function returns the name of the current process. However, the process name is often not a suitable name to use. For example, the OpenShot video editor is a python application, and so "python" is displayed in the Sound Preferences window (see Bug #596504), when it should be displaying "OpenShot". PulseAudio allows applications to specify the application name, either at the time the context is created (as SDL does currently), or by special environment variables (see http://www.pulseaudio.org/wiki/ApplicationProperties). If no name is specified, then pulseaudio will determine the name based on the process. If you specify the application name when initiating the pulseaudio context, then that will override any application name specified using an environment variable. As libsdl is a library, I believe the solution is for libsdl to not specify any application name when initiating a pulseaudio context, which will enable applications to specify the application name using environment variables. In the case that the applications do not specify anything, pulseaudio will fall back to using the process name anyway. The attached patch removes the get_progname() function and passes NULL as the application name when creating the pulseaudio context, which fixes the issue.
author Sam Lantinga <slouken@libsdl.org>
date Sun, 23 Jan 2011 21:55:04 -0800
parents 3c4e0130c9b1
children 719dbb5afce8
line wrap: on
line source

<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
	ProjectType="Visual C++"
<<<<<<< local
	Version="8.00"
=======
	Version="9.00"
>>>>>>> other
	Name="SDL"
	ProjectGUID="{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
	RootNamespace="SDL"
<<<<<<< local
=======
	TargetFrameworkVersion="131072"
>>>>>>> other
	>
	<Platforms>
		<Platform
			Name="Win32"
		/>
	</Platforms>
	<ToolFiles>
	</ToolFiles>
	<Configurations>
		<Configuration
			Name="Debug|Win32"
			OutputDirectory=".\Debug"
			IntermediateDirectory=".\Debug"
			ConfigurationType="2"
			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
			UseOfMFC="0"
			ATLMinimizesCRunTimeLibraryUsage="false"
			>
			<Tool
				Name="VCPreBuildEventTool"
				Description="Making sure basic SDL headers are in place..."
				CommandLine="if exist &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot; goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_win32.h to SDL_config.h...&#x0D;&#x0A;copy &quot;$(ProjectDir)\..\..\include\SDL_config_win32.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;:SDLCONFIGOKAY&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot; goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION 0 &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY&#x0D;&#x0A;"
			/>
			<Tool
				Name="VCCustomBuildTool"
			/>
			<Tool
				Name="VCXMLDataGeneratorTool"
			/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"
			/>
			<Tool
				Name="VCMIDLTool"
				PreprocessorDefinitions="_DEBUG"
				MkTypLibCompatible="true"
				SuppressStartupBanner="true"
				TargetEnvironment="1"
				TypeLibraryName=".\Debug/SDL.tlb"
			/>
			<Tool
				Name="VCCLCompilerTool"
				Optimization="0"
				AdditionalIncludeDirectories="..\..\include"
				PreprocessorDefinitions="_DEBUG;_WINDOWS;_WIN32_WINNT=0x0400;__MMX__;__3dNOW__;__SSE__;__SSE2__"
				RuntimeLibrary="2"
				BufferSecurityCheck="false"
				UsePrecompiledHeader="0"
				PrecompiledHeaderFile=".\Debug/SDL.pch"
				AssemblerListingLocation=".\Debug/"
				ObjectFile=".\Debug/"
				ProgramDataBaseFileName=".\Debug/"
				WarningLevel="3"
				SuppressStartupBanner="true"
				Detect64BitPortabilityProblems="false"
				DebugInformationFormat="4"
				CompileAs="0"
			/>
			<Tool
				Name="VCManagedResourceCompilerTool"
			/>
			<Tool
				Name="VCResourceCompilerTool"
				PreprocessorDefinitions="_DEBUG"
				Culture="1033"
			/>
			<Tool
				Name="VCPreLinkEventTool"
			/>
			<Tool
				Name="VCLinkerTool"
<<<<<<< local
				AdditionalOptions="/MACHINE:I386"
=======
				AdditionalOptions="/MACHINE:I386&#x0D;&#x0A;msvcrt.lib"
>>>>>>> other
				AdditionalDependencies="msimg32.lib winmm.lib"
				OutputFile=".\Debug/SDL.dll"
				LinkIncremental="2"
				SuppressStartupBanner="true"
<<<<<<< local
				IgnoreAllDefaultLibraries="true"
=======
				IgnoreAllDefaultLibraries="false"
				IgnoreDefaultLibraryNames=""
>>>>>>> other
				GenerateDebugInformation="true"
				ProgramDatabaseFile=".\Debug/SDL.pdb"
<<<<<<< local
				SubSystem="2"
=======
				SubSystem="0"
				RandomizedBaseAddress="1"
				DataExecutionPrevention="0"
>>>>>>> other
				ImportLibrary=".\Debug/SDL.lib"
<<<<<<< local
=======
				Profile="true"
				CLRThreadAttribute="0"
>>>>>>> other
				CLRUnmanagedCodeCheck="false"
			/>
			<Tool
				Name="VCALinkTool"
			/>
			<Tool
				Name="VCManifestTool"
			/>
			<Tool
				Name="VCXDCMakeTool"
			/>
			<Tool
				Name="VCBscMakeTool"
			/>
			<Tool
				Name="VCFxCopTool"
			/>
			<Tool
				Name="VCAppVerifierTool"
			/>
			<Tool
<<<<<<< local
				Name="VCWebDeploymentTool"
			/>
			<Tool
=======
>>>>>>> other
				Name="VCPostBuildEventTool"
			/>
		</Configuration>
		<Configuration
			Name="Release|Win32"
			OutputDirectory=".\Release"
			IntermediateDirectory=".\Release"
			ConfigurationType="2"
			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
			UseOfMFC="0"
			ATLMinimizesCRunTimeLibraryUsage="false"
			>
			<Tool
				Name="VCPreBuildEventTool"
				Description="Making sure basic SDL headers are in place..."
				CommandLine="if exist &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot; goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_win32.h to SDL_config.h...&#x0D;&#x0A;copy &quot;$(ProjectDir)\..\..\include\SDL_config_win32.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;:SDLCONFIGOKAY&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot; goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION 0 &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY&#x0D;&#x0A;"
			/>
			<Tool
				Name="VCCustomBuildTool"
			/>
			<Tool
				Name="VCXMLDataGeneratorTool"
			/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"
			/>
			<Tool
				Name="VCMIDLTool"
				PreprocessorDefinitions="NDEBUG"
				MkTypLibCompatible="true"
				SuppressStartupBanner="true"
				TargetEnvironment="1"
				TypeLibraryName=".\Release/SDL.tlb"
			/>
			<Tool
				Name="VCCLCompilerTool"
				InlineFunctionExpansion="1"
				EnableIntrinsicFunctions="false"
				AdditionalIncludeDirectories="..\..\include"
				PreprocessorDefinitions="NDEBUG;_WINDOWS;_WIN32_WINNT=0x0400;__MMX__;__3dNOW__;__SSE__;__SSE2__"
				StringPooling="true"
				RuntimeLibrary="2"
				BufferSecurityCheck="false"
				EnableFunctionLevelLinking="true"
				UsePrecompiledHeader="0"
				PrecompiledHeaderFile=".\Release/SDL.pch"
				AssemblerListingLocation=".\Release/"
				ObjectFile=".\Release/"
				ProgramDataBaseFileName=".\Release/"
				WarningLevel="3"
				SuppressStartupBanner="true"
				Detect64BitPortabilityProblems="false"
				CompileAs="0"
			/>
			<Tool
				Name="VCManagedResourceCompilerTool"
			/>
			<Tool
				Name="VCResourceCompilerTool"
				PreprocessorDefinitions="NDEBUG"
				Culture="1033"
			/>
			<Tool
				Name="VCPreLinkEventTool"
			/>
			<Tool
				Name="VCLinkerTool"
				AdditionalOptions="/MACHINE:I386"
				AdditionalDependencies="msimg32.lib winmm.lib"
				OutputFile=".\Release/SDL.dll"
				LinkIncremental="1"
				SuppressStartupBanner="true"
				IgnoreAllDefaultLibraries="true"
				ProgramDatabaseFile=".\Release/SDL.pdb"
				SubSystem="2"
<<<<<<< local
=======
				RandomizedBaseAddress="1"
				DataExecutionPrevention="0"
>>>>>>> other
				ImportLibrary=".\Release/SDL.lib"
			/>
			<Tool
				Name="VCALinkTool"
			/>
			<Tool
				Name="VCManifestTool"
			/>
			<Tool
				Name="VCXDCMakeTool"
			/>
			<Tool
				Name="VCBscMakeTool"
			/>
			<Tool
				Name="VCFxCopTool"
			/>
			<Tool
				Name="VCAppVerifierTool"
			/>
			<Tool
<<<<<<< local
				Name="VCWebDeploymentTool"
			/>
			<Tool
=======
>>>>>>> other
				Name="VCPostBuildEventTool"
			/>
		</Configuration>
	</Configurations>
	<References>
	</References>
	<Files>
		<Filter
			Name="API Headers"
			>
			<File
				RelativePath="..\..\include\SDL.h"
				>
			</File>
			<File
				RelativePath="..\..\include\SDL_assert.h"
				>
			</File>
			<File
				RelativePath="..\..\include\SDL_atomic.h"
				>
			</File>
			<File
				RelativePath="..\..\include\SDL_audio.h"
				>
			</File>
			<File
				RelativePath="..\..\include\SDL_clipboard.h"
				>
			</File>
			<File
				RelativePath="..\..\include\SDL_compat.h"
				>
			</File>
			<File
				RelativePath="..\..\include\SDL_config_win32.h"
				>
			</File>
			<File
				RelativePath="..\..\include\SDL_copying.h"
				>
			</File>
			<File
				RelativePath="..\..\include\SDL_cpuinfo.h"
				>
			</File>
			<File
				RelativePath="..\..\include\SDL_endian.h"
				>
			</File>
			<File
				RelativePath="..\..\include\SDL_error.h"
				>
			</File>
			<File
				RelativePath="..\..\include\SDL_events.h"
				>
			</File>
			<File
				RelativePath="..\..\include\SDL_haptic.h"
				>
			</File>
			<File
				RelativePath="..\..\include\SDL_joystick.h"
				>
			</File>
			<File
				RelativePath="..\..\include\SDL_keyboard.h"
				>
			</File>
			<File
				RelativePath="..\..\include\SDL_keysym.h"
				>
			</File>
			<File
				RelativePath="..\..\include\SDL_loadso.h"
				>
			</File>
			<File
				RelativePath="..\..\include\SDL_main.h"
				>
			</File>
			<File
				RelativePath="..\..\include\SDL_mouse.h"
				>
			</File>
			<File
				RelativePath="..\..\include\SDL_mutex.h"
				>
			</File>
			<File
				RelativePath="..\..\include\SDL_name.h"
				>
			</File>
			<File
				RelativePath="..\..\include\SDL_opengl.h"
				>
			</File>
			<File
				RelativePath="..\..\include\SDL_opengles.h"
				>
			</File>
			<File
				RelativePath="..\..\include\SDL_pixels.h"
				>
			</File>
			<File
				RelativePath="..\..\include\SDL_platform.h"
				>
			</File>
			<File
				RelativePath="..\..\include\SDL_power.h"
				>
			</File>
			<File
				RelativePath="..\..\include\SDL_quit.h"
				>
			</File>
			<File
				RelativePath="..\..\include\SDL_rect.h"
				>
			</File>
			<File
				RelativePath="..\..\include\SDL_rwops.h"
				>
			</File>
			<File
				RelativePath="..\..\include\SDL_scancode.h"
				>
			</File>
			<File
				RelativePath="..\..\include\SDL_stdinc.h"
				>
			</File>
			<File
				RelativePath="..\..\include\SDL_surface.h"
				>
			</File>
			<File
				RelativePath="..\..\include\SDL_syswm.h"
				>
			</File>
			<File
				RelativePath="..\..\include\SDL_thread.h"
				>
			</File>
			<File
				RelativePath="..\..\include\SDL_timer.h"
				>
			</File>
			<File
				RelativePath="..\..\include\SDL_types.h"
				>
			</File>
			<File
				RelativePath="..\..\include\SDL_version.h"
				>
			</File>
			<File
				RelativePath="..\..\include\SDL_video.h"
				>
			</File>
		</Filter>
		<File
			RelativePath="..\..\src\events\blank_cursor.h"
			>
		</File>
		<File
			RelativePath="..\..\src\events\default_cursor.h"
			>
		</File>
		<File
			RelativePath="..\..\src\audio\windx5\directx.h"
			>
		</File>
		<File
			RelativePath="..\..\src\libm\e_log.c"
			>
		</File>
		<File
			RelativePath="..\..\src\libm\e_pow.c"
			>
		</File>
		<File
			RelativePath="..\..\src\libm\e_rem_pio2.c"
			>
		</File>
		<File
			RelativePath="..\..\src\libm\e_sqrt.c"
			>
		</File>
		<File
			RelativePath="..\..\src\libm\k_cos.c"
			>
		</File>
		<File
			RelativePath="..\..\src\libm\k_rem_pio2.c"
			>
		</File>
		<File
			RelativePath="..\..\src\libm\k_sin.c"
			>
		</File>
		<File
			RelativePath="..\..\src\libm\math.h"
			>
		</File>
		<File
			RelativePath="..\..\src\libm\math_private.h"
			>
		</File>
		<File
			RelativePath="..\..\src\video\mmx.h"
			>
		</File>
		<File
			RelativePath="..\..\src\libm\s_copysign.c"
			>
		</File>
		<File
			RelativePath="..\..\src\libm\s_cos.c"
			>
		</File>
		<File
			RelativePath="..\..\src\libm\s_fabs.c"
			>
		</File>
		<File
			RelativePath="..\..\src\libm\s_floor.c"
			>
		</File>
		<File
			RelativePath="..\..\src\libm\s_scalbn.c"
			>
		</File>
		<File
			RelativePath="..\..\src\libm\s_sin.c"
			>
		</File>
		<File
			RelativePath="..\..\src\SDL.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\SDL_alphamult.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\SDL_alphamult.h"
			>
		</File>
		<File
			RelativePath="..\..\src\SDL_assert.c"
			>
		</File>
		<File
			RelativePath="..\..\src\atomic\win32\SDL_atomic.c"
			>
		</File>
		<File
			RelativePath="..\..\src\audio\SDL_audio.c"
			>
		</File>
		<File
			RelativePath="..\..\src\audio\SDL_audio_c.h"
			>
		</File>
		<File
			RelativePath="..\..\src\audio\SDL_audiocvt.c"
			>
		</File>
		<File
			RelativePath="..\..\src\audio\SDL_audiodev.c"
			>
		</File>
		<File
			RelativePath="..\..\src\audio\SDL_audiodev_c.h"
			>
		</File>
		<File
			RelativePath="..\..\src\audio\SDL_audiomem.h"
			>
		</File>
		<File
			RelativePath="..\..\src\audio\SDL_audiotypecvt.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\SDL_blendfillrect.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\SDL_blendline.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\SDL_blendpoint.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\SDL_blendrect.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\SDL_blit.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\SDL_blit.h"
			>
		</File>
		<File
			RelativePath="..\..\src\video\SDL_blit_0.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\SDL_blit_1.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\SDL_blit_A.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\SDL_blit_auto.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\SDL_blit_auto.h"
			>
		</File>
		<File
			RelativePath="..\..\src\video\SDL_blit_copy.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\SDL_blit_copy.h"
			>
		</File>
		<File
			RelativePath="..\..\src\video\SDL_blit_N.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\SDL_blit_slow.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\SDL_blit_slow.h"
			>
		</File>
		<File
			RelativePath="..\..\src\video\SDL_bmp.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\SDL_clipboard.c"
			>
		</File>
		<File
			RelativePath="..\..\src\events\SDL_clipboardevents.c"
			>
		</File>
		<File
			RelativePath="..\..\src\events\SDL_clipboardevents_c.h"
			>
		</File>
		<File
			RelativePath="..\..\src\SDL_compat.c"
			>
		</File>
		<File
			RelativePath="..\..\src\cpuinfo\SDL_cpuinfo.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\win32\SDL_d3drender.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\win32\SDL_d3drender.h"
			>
		</File>
		<File
			RelativePath="..\..\src\audio\windib\SDL_dibaudio.c"
			>
		</File>
		<File
			RelativePath="..\..\src\audio\windib\SDL_dibaudio.h"
			>
		</File>
		<File
			RelativePath="..\..\src\audio\disk\SDL_diskaudio.c"
			>
		</File>
		<File
			RelativePath="..\..\src\audio\disk\SDL_diskaudio.h"
			>
		</File>
		<File
			RelativePath="..\..\src\video\SDL_draw.h"
			>
		</File>
		<File
			RelativePath="..\..\src\video\SDL_drawline.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\SDL_drawpoint.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\SDL_drawrect.c"
			>
		</File>
		<File
			RelativePath="..\..\src\audio\dummy\SDL_dummyaudio.c"
			>
		</File>
		<File
			RelativePath="..\..\src\audio\dummy\SDL_dummyaudio.h"
			>
		</File>
		<File
			RelativePath="..\..\src\audio\windx5\SDL_dx5audio.c"
			>
		</File>
		<File
			RelativePath="..\..\src\audio\windx5\SDL_dx5audio.h"
			>
		</File>
		<File
			RelativePath="..\..\src\joystick\win32\SDL_dxjoystick.c"
			>
		</File>
		<File
			RelativePath="..\..\src\SDL_error.c"
			>
		</File>
		<File
			RelativePath="..\..\src\SDL_error_c.h"
			>
		</File>
		<File
			RelativePath="..\..\src\events\SDL_events.c"
			>
		</File>
		<File
			RelativePath="..\..\src\events\SDL_events_c.h"
			>
		</File>
		<File
			RelativePath="..\..\src\SDL_fatal.c"
			>
		</File>
		<File
			RelativePath="..\..\src\SDL_fatal.h"
			>
		</File>
		<File
			RelativePath="..\..\src\video\SDL_fillrect.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\SDL_gamma.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\win32\SDL_gdirender.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\win32\SDL_gdirender.h"
			>
		</File>
		<File
			RelativePath="..\..\src\stdlib\SDL_getenv.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\SDL_glesfuncs.h"
			>
		</File>
		<File
			RelativePath="..\..\src\video\SDL_glfuncs.h"
			>
		</File>
		<File
			RelativePath="..\..\src\haptic\SDL_haptic.c"
			>
		</File>
		<File
			RelativePath="..\..\src\stdlib\SDL_iconv.c"
			>
		</File>
		<File
			RelativePath="..\..\src\joystick\SDL_joystick.c"
			>
		</File>
		<File
			RelativePath="..\..\src\joystick\SDL_joystick_c.h"
			>
		</File>
		<File
			RelativePath="..\..\src\events\SDL_keyboard.c"
			>
		</File>
		<File
			RelativePath="..\..\src\events\SDL_keyboard_c.h"
			>
		</File>
		<File
			RelativePath="..\..\src\video\SDL_leaks.h"
			>
		</File>
		<File
			RelativePath="..\..\src\stdlib\SDL_malloc.c"
			>
		</File>
		<File
			RelativePath="..\..\src\audio\SDL_mixer.c"
			>
		</File>
		<File
			RelativePath="..\..\src\audio\SDL_mixer_m68k.c"
			>
		</File>
		<File
			RelativePath="..\..\src\audio\SDL_mixer_m68k.h"
			>
		</File>
		<File
			RelativePath="..\..\src\audio\SDL_mixer_MMX.c"
			>
		</File>
		<File
			RelativePath="..\..\src\audio\SDL_mixer_MMX.h"
			>
		</File>
		<File
			RelativePath="..\..\src\audio\SDL_mixer_MMX_VC.c"
			>
		</File>
		<File
			RelativePath="..\..\src\audio\SDL_mixer_MMX_VC.h"
			>
		</File>
		<File
			RelativePath="..\..\src\joystick\win32\SDL_mmjoystick.c"
			>
		</File>
		<File
			RelativePath="..\..\src\events\SDL_mouse.c"
			>
		</File>
		<File
			RelativePath="..\..\src\events\SDL_mouse_c.h"
			>
		</File>
		<File
			RelativePath="..\..\src\video\dummy\SDL_nullevents.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\dummy\SDL_nullevents_c.h"
			>
		</File>
		<File
			RelativePath="..\..\src\video\dummy\SDL_nullrender.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\dummy\SDL_nullrender_c.h"
			>
		</File>
		<File
			RelativePath="..\..\src\video\dummy\SDL_nullvideo.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\dummy\SDL_nullvideo.h"
			>
		</File>
		<File
			RelativePath="..\..\src\video\SDL_pixels.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\SDL_pixels_c.h"
			>
		</File>
		<File
			RelativePath="..\..\src\power\SDL_power.c"
			>
		</File>
		<File
			RelativePath="..\..\src\stdlib\SDL_qsort.c"
			>
		</File>
		<File
			RelativePath="..\..\src\events\SDL_quit.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\SDL_rect.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\SDL_rect_c.h"
			>
		</File>
		<File
			RelativePath="..\..\src\video\SDL_renderer_gl.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\SDL_renderer_gl.h"
			>
		</File>
		<File
			RelativePath="..\..\src\video\SDL_renderer_sw.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\SDL_renderer_sw.h"
			>
		</File>
		<File
			RelativePath="..\..\src\video\SDL_RLEaccel.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\SDL_RLEaccel_c.h"
			>
		</File>
		<File
			RelativePath="..\..\src\file\SDL_rwops.c"
			>
		</File>
		<File
			RelativePath="..\..\src\stdlib\SDL_stdlib.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\SDL_stretch.c"
			>
		</File>
		<File
			RelativePath="..\..\src\stdlib\SDL_string.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\SDL_surface.c"
			>
		</File>
		<File
			RelativePath="..\..\src\audio\SDL_sysaudio.h"
			>
		</File>
		<File
			RelativePath="..\..\src\events\SDL_sysevents.h"
			>
		</File>
		<File
			RelativePath="..\..\src\haptic\win32\SDL_syshaptic.c"
			>
		</File>
		<File
			RelativePath="..\..\src\haptic\SDL_syshaptic.h"
			>
		</File>
		<File
			RelativePath="..\..\src\joystick\SDL_sysjoystick.h"
			>
		</File>
		<File
			RelativePath="..\..\src\loadso\win32\SDL_sysloadso.c"
			>
		</File>
		<File
			RelativePath="..\..\src\thread\win32\SDL_sysmutex.c"
			>
		</File>
		<File
			RelativePath="..\..\src\power\windows\SDL_syspower.c"
			>
		</File>
		<File
			RelativePath="..\..\src\thread\win32\SDL_syssem.c"
			>
		</File>
		<File
			RelativePath="..\..\src\thread\win32\SDL_systhread.c"
			>
		</File>
		<File
			RelativePath="..\..\src\thread\SDL_systhread.h"
			>
		</File>
		<File
			RelativePath="..\..\src\thread\win32\SDL_systhread_c.h"
			>
		</File>
		<File
			RelativePath="..\..\src\timer\win32\SDL_systimer.c"
			>
		</File>
		<File
			RelativePath="..\..\src\timer\SDL_systimer.h"
			>
		</File>
		<File
			RelativePath="..\..\src\video\SDL_sysvideo.h"
			>
		</File>
		<File
			RelativePath="..\..\src\thread\SDL_thread.c"
			>
		</File>
		<File
			RelativePath="..\..\src\thread\SDL_thread_c.h"
			>
		</File>
		<File
			RelativePath="..\..\src\timer\SDL_timer.c"
			>
		</File>
		<File
			RelativePath="..\..\src\timer\SDL_timer_c.h"
			>
		</File>
		<File
<<<<<<< local
=======
			RelativePath="..\..\src\events\SDL_touch.c"
			>
		</File>
		<File
			RelativePath="..\..\src\events\SDL_touch_c.h"
			>
		</File>
		<File
>>>>>>> other
			RelativePath="..\..\src\video\SDL_video.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\win32\SDL_vkeys.h"
			>
		</File>
		<File
			RelativePath="..\..\src\audio\SDL_wave.c"
			>
		</File>
		<File
			RelativePath="..\..\src\audio\SDL_wave.h"
			>
		</File>
		<File
			RelativePath="..\..\src\video\win32\SDL_win32clipboard.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\win32\SDL_win32clipboard.h"
			>
		</File>
		<File
			RelativePath="..\..\src\video\win32\SDL_win32events.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\win32\SDL_win32events.h"
			>
		</File>
		<File
			RelativePath="..\..\src\video\win32\SDL_win32gamma.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\win32\SDL_win32gamma.h"
			>
		</File>
		<File
			RelativePath="..\..\src\video\win32\SDL_win32keyboard.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\win32\SDL_win32keyboard.h"
			>
		</File>
		<File
			RelativePath="..\..\src\video\win32\SDL_win32modes.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\win32\SDL_win32modes.h"
			>
		</File>
		<File
			RelativePath="..\..\src\video\win32\SDL_win32mouse.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\win32\SDL_win32mouse.h"
			>
		</File>
		<File
			RelativePath="..\..\src\video\win32\SDL_win32opengl.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\win32\SDL_win32opengl.h"
			>
		</File>
		<File
			RelativePath="..\..\src\video\win32\SDL_win32video.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\win32\SDL_win32video.h"
			>
		</File>
		<File
			RelativePath="..\..\src\video\win32\SDL_win32window.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\win32\SDL_win32window.h"
			>
		</File>
		<File
			RelativePath="..\..\src\events\SDL_windowevents.c"
			>
		</File>
		<File
			RelativePath="..\..\src\events\SDL_windowevents_c.h"
			>
		</File>
		<File
			RelativePath="..\..\src\video\SDL_yuv_mmx.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\SDL_yuv_sw.c"
			>
		</File>
		<File
			RelativePath="..\..\src\video\SDL_yuv_sw_c.h"
			>
		</File>
		<File
			RelativePath="..\..\src\video\win32\wmmsg.h"
			>
		</File>
	</Files>
	<Globals>
	</Globals>
</VisualStudioProject>