mirror of
https://github.com/libsdl-org/SDL.git
synced 2025-10-15 14:26:01 +00:00
Fixed bug 2802 - [patch] Fix android build compiling in wrong filesystem implementation
Jonas Kulla The configure script didn't differentiate between Linux and Android, unconditionally compiling in the unix implementation of SDL_sysfilesystem.c. I'm probably one of the very few people building SDL for android using classic configure + standalone toolchain, so this has gone undetected all along.
This commit is contained in:
Philipp Wiesemann
159
premake/VisualC/VS2012/SDL2test/SDL2test.vcxproj
Executable file
159
premake/VisualC/VS2012/SDL2test/SDL2test.vcxproj
Executable file
@@ -0,0 +1,159 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup Label="ProjectConfigurations">
|
||||
<ProjectConfiguration Include="Debug|Win32">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|Win32">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
</ItemGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{E544B08A-C532-884E-A0BE-0F6F7F700067}</ProjectGuid>
|
||||
<RootNamespace>SDL2test</RootNamespace>
|
||||
<Keyword>Win32Proj</Keyword>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<CharacterSet>MultiByte</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<CharacterSet>MultiByte</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="ExtensionSettings">
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<OutDir>Win32\Debug\</OutDir>
|
||||
<IntDir>obj\Debug\</IntDir>
|
||||
<TargetName>SDL2test</TargetName>
|
||||
<TargetExt>.lib</TargetExt>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<OutDir>Win32\Release\</OutDir>
|
||||
<IntDir>obj\Release\</IntDir>
|
||||
<TargetName>SDL2test</TargetName>
|
||||
<TargetExt>.lib</TargetExt>
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..;..\..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>USING_PREMAKE_CONFIG_H;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<PrecompiledHeader></PrecompiledHeader>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<ExceptionHandling>false</ExceptionHandling>
|
||||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
||||
<ProgramDataBaseFileName>$(OutDir)SDL2test.pdb</ProgramDataBaseFileName>
|
||||
<CompileAs>CompileAsC</CompileAs>
|
||||
</ClCompile>
|
||||
<ResourceCompile>
|
||||
<PreprocessorDefinitions>USING_PREMAKE_CONFIG_H;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<AdditionalIncludeDirectories>..;..\..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
</ResourceCompile>
|
||||
<Lib>
|
||||
<OutputFile>$(OutDir)SDL2test.lib</OutputFile>
|
||||
</Lib>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
</Link>
|
||||
<PostBuildEvent>
|
||||
<Command>if not exist ".\Win32\Debug" ( mkdir ".\Win32\Debug" )
copy ".\..\SDL2\Win32\Debug\SDL2.dll" ".\Win32\Debug\SDL2.dll"</Command>
|
||||
</PostBuildEvent>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<ClCompile>
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<AdditionalIncludeDirectories>..;..\..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>USING_PREMAKE_CONFIG_H;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>false</MinimalRebuild>
|
||||
<StringPooling>true</StringPooling>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<PrecompiledHeader></PrecompiledHeader>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<ExceptionHandling>false</ExceptionHandling>
|
||||
<DebugInformationFormat></DebugInformationFormat>
|
||||
<CompileAs>CompileAsC</CompileAs>
|
||||
</ClCompile>
|
||||
<ResourceCompile>
|
||||
<PreprocessorDefinitions>USING_PREMAKE_CONFIG_H;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<AdditionalIncludeDirectories>..;..\..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
</ResourceCompile>
|
||||
<Lib>
|
||||
<OutputFile>$(OutDir)SDL2test.lib</OutputFile>
|
||||
</Lib>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
</Link>
|
||||
<PostBuildEvent>
|
||||
<Command>if not exist ".\Win32\Release" ( mkdir ".\Win32\Release" )
copy ".\..\SDL2\Win32\Release\SDL2.dll" ".\Win32\Release\SDL2.dll"</Command>
|
||||
</PostBuildEvent>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\..\..\..\src\test\SDL_test_assert.c">
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\src\test\SDL_test_common.c">
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\src\test\SDL_test_compare.c">
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\src\test\SDL_test_crc32.c">
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\src\test\SDL_test_font.c">
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\src\test\SDL_test_fuzzer.c">
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\src\test\SDL_test_harness.c">
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\src\test\SDL_test_imageBlit.c">
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\src\test\SDL_test_imageBlitBlend.c">
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\src\test\SDL_test_imageFace.c">
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\src\test\SDL_test_imagePrimitives.c">
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\src\test\SDL_test_imagePrimitivesBlend.c">
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\src\test\SDL_test_log.c">
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\src\test\SDL_test_md5.c">
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\src\test\SDL_test_random.c">
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\SDL2main\SDL2main.vcxproj">
|
||||
<Project>{47B50335-DB5D-B948-B80C-E361ED5793F5}</Project>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\SDL2\SDL2.vcxproj">
|
||||
<Project>{7F1E020B-52F6-584E-B841-8B390015238B}</Project>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
58
premake/VisualC/VS2012/SDL2test/SDL2test.vcxproj.filters
Executable file
58
premake/VisualC/VS2012/SDL2test/SDL2test.vcxproj.filters
Executable file
@@ -0,0 +1,58 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup>
|
||||
<Filter Include="src">
|
||||
<UniqueIdentifier>{225F6BF5-1223-DE4D-AE58-119A06816C3F}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="src\test">
|
||||
<UniqueIdentifier>{50B2248A-623E-474D-B912-19B250D06132}</UniqueIdentifier>
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\..\..\..\src\test\SDL_test_assert.c">
|
||||
<Filter>src\test</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\src\test\SDL_test_common.c">
|
||||
<Filter>src\test</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\src\test\SDL_test_compare.c">
|
||||
<Filter>src\test</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\src\test\SDL_test_crc32.c">
|
||||
<Filter>src\test</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\src\test\SDL_test_font.c">
|
||||
<Filter>src\test</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\src\test\SDL_test_fuzzer.c">
|
||||
<Filter>src\test</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\src\test\SDL_test_harness.c">
|
||||
<Filter>src\test</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\src\test\SDL_test_imageBlit.c">
|
||||
<Filter>src\test</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\src\test\SDL_test_imageBlitBlend.c">
|
||||
<Filter>src\test</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\src\test\SDL_test_imageFace.c">
|
||||
<Filter>src\test</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\src\test\SDL_test_imagePrimitives.c">
|
||||
<Filter>src\test</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\src\test\SDL_test_imagePrimitivesBlend.c">
|
||||
<Filter>src\test</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\src\test\SDL_test_log.c">
|
||||
<Filter>src\test</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\src\test\SDL_test_md5.c">
|
||||
<Filter>src\test</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\src\test\SDL_test_random.c">
|
||||
<Filter>src\test</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
Reference in New Issue
Block a user