Skip to content

Commit b46f5ca

Browse files
ccawley2011ccawley2011
committed
Add testpalette
1 parent bb5bd00 commit b46f5ca

File tree

8 files changed

+653
-1
lines changed

8 files changed

+653
-1
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ test/testmouse
150150
test/testmultiaudio
151151
test/testnative
152152
test/testoverlay2
153+
test/testpalette
153154
test/testplatform
154155
test/testpower
155156
test/testqsort

‎VisualC/SDL.sln‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsensor", "tests\testsen
5858
EndProject
5959
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsurround", "tests\testsurround\testsurround.vcxproj", "{70B894A9-E306-49E8-ABC2-932A952A5E5F}"
6060
EndProject
61+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testpalette", "tests\testpalette\testpalette.vcxproj", "{9841402F-74DA-4139-BA3C-4C5B2360C136}"
62+
EndProject
6163
Global
6264
GlobalSection(SolutionConfigurationPlatforms) = preSolution
6365
Debug|Win32 = Debug|Win32
@@ -290,6 +292,12 @@ Global
290292
{70B894A9-E306-49E8-ABC2-932A952A5E5F}.Release|Win32.Build.0 = Release|Win32
291293
{70B894A9-E306-49E8-ABC2-932A952A5E5F}.Release|x64.ActiveCfg = Release|x64
292294
{70B894A9-E306-49E8-ABC2-932A952A5E5F}.Release|x64.Build.0 = Release|x64
295+
{9841402F-74DA-4139-BA3C-4C5B2360C136}.Debug|Win32.ActiveCfg = Debug|Win32
296+
{9841402F-74DA-4139-BA3C-4C5B2360C136}.Debug|Win32.Build.0 = Debug|Win32
297+
{9841402F-74DA-4139-BA3C-4C5B2360C136}.Debug|x64.ActiveCfg = Debug|Win32
298+
{9841402F-74DA-4139-BA3C-4C5B2360C136}.Release|Win32.ActiveCfg = Release|Win32
299+
{9841402F-74DA-4139-BA3C-4C5B2360C136}.Release|Win32.Build.0 = Release|Win32
300+
{9841402F-74DA-4139-BA3C-4C5B2360C136}.Release|x64.ActiveCfg = Release|Win32
293301
EndGlobalSection
294302
GlobalSection(SolutionProperties) = preSolution
295303
HideSolutionNode = FALSE
@@ -320,6 +328,7 @@ Global
320328
{40FB7794-D3C3-4CFE-BCF4-A80C97635682} = {D69D5741-611F-4E14-8541-1FEE94F50B5A}
321329
{C4E04D18-EF76-4B42-B4C2-16A1BACDC0A4} = {D69D5741-611F-4E14-8541-1FEE94F50B5A}
322330
{70B894A9-E306-49E8-ABC2-932A952A5E5F} = {D69D5741-611F-4E14-8541-1FEE94F50B5A}
331+
{9841402F-74DA-4139-BA3C-4C5B2360C136} = {D69D5741-611F-4E14-8541-1FEE94F50B5A}
323332
EndGlobalSection
324333
GlobalSection(ExtensibilityGlobals) = postSolution
325334
SolutionGuid = {C320C9F2-1A8F-41D7-B02B-6338F872BCAD}

‎VisualC/tests/testpalette/testpalette.vcxproj‎

Lines changed: 204 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,204 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|Win32">
5+
<Configuration>Debug</Configuration>
6+
<Platform>Win32</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|x64">
9+
<Configuration>Debug</Configuration>
10+
<Platform>x64</Platform>
11+
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Release|Win32">
13+
<Configuration>Release</Configuration>
14+
<Platform>Win32</Platform>
15+
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|x64">
17+
<Configuration>Release</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
20+
</ItemGroup>
21+
<PropertyGroup Label="Globals">
22+
<ProjectGuid>{9841402F-74DA-4139-BA3C-4C5B2360C136}</ProjectGuid>
23+
<RootNamespace>testpalette</RootNamespace>
24+
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
25+
</PropertyGroup>
26+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
27+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
28+
<ConfigurationType>Application</ConfigurationType>
29+
<PlatformToolset Condition="'$(VisualStudioVersion)' != '10.0'">$(DefaultPlatformToolset)</PlatformToolset>
30+
</PropertyGroup>
31+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
32+
<ConfigurationType>Application</ConfigurationType>
33+
<PlatformToolset Condition="'$(VisualStudioVersion)' != '10.0'">$(DefaultPlatformToolset)</PlatformToolset>
34+
</PropertyGroup>
35+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
36+
<ConfigurationType>Application</ConfigurationType>
37+
<PlatformToolset Condition="'$(VisualStudioVersion)' != '10.0'">$(DefaultPlatformToolset)</PlatformToolset>
38+
</PropertyGroup>
39+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
40+
<ConfigurationType>Application</ConfigurationType>
41+
<PlatformToolset Condition="'$(VisualStudioVersion)' != '10.0'">$(DefaultPlatformToolset)</PlatformToolset>
42+
</PropertyGroup>
43+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
44+
<ImportGroup Label="ExtensionSettings">
45+
</ImportGroup>
46+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
47+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
48+
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
49+
</ImportGroup>
50+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
51+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
52+
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
53+
</ImportGroup>
54+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
55+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
56+
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
57+
</ImportGroup>
58+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
59+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
60+
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
61+
</ImportGroup>
62+
<PropertyGroup Label="UserMacros" />
63+
<PropertyGroup>
64+
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
65+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
66+
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
67+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
68+
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
69+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
70+
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
71+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
72+
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
73+
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
74+
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
75+
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
76+
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
77+
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
78+
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
79+
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
80+
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
81+
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
82+
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
83+
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
84+
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
85+
</PropertyGroup>
86+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
87+
<Midl>
88+
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
89+
<MkTypLibCompatible>true</MkTypLibCompatible>
90+
<SuppressStartupBanner>true</SuppressStartupBanner>
91+
<TargetEnvironment>Win32</TargetEnvironment>
92+
<TypeLibraryName>.\Debug/testpalette.tlb</TypeLibraryName>
93+
</Midl>
94+
<ClCompile>
95+
<Optimization>Disabled</Optimization>
96+
<AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
97+
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
98+
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
99+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
100+
<WarningLevel>Level3</WarningLevel>
101+
<DebugInformationFormat>OldStyle</DebugInformationFormat>
102+
</ClCompile>
103+
<ResourceCompile>
104+
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
105+
<Culture>0x0409</Culture>
106+
</ResourceCompile>
107+
<Link>
108+
<GenerateDebugInformation>true</GenerateDebugInformation>
109+
<SubSystem>Windows</SubSystem>
110+
</Link>
111+
</ItemDefinitionGroup>
112+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
113+
<Midl>
114+
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
115+
<MkTypLibCompatible>true</MkTypLibCompatible>
116+
<SuppressStartupBanner>true</SuppressStartupBanner>
117+
<TargetEnvironment>X64</TargetEnvironment>
118+
<TypeLibraryName>.\Debug/testpalette.tlb</TypeLibraryName>
119+
</Midl>
120+
<ClCompile>
121+
<Optimization>Disabled</Optimization>
122+
<AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
123+
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
124+
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
125+
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
126+
<WarningLevel>Level3</WarningLevel>
127+
<DebugInformationFormat>OldStyle</DebugInformationFormat>
128+
</ClCompile>
129+
<ResourceCompile>
130+
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
131+
<Culture>0x0409</Culture>
132+
</ResourceCompile>
133+
<Link>
134+
<GenerateDebugInformation>true</GenerateDebugInformation>
135+
<SubSystem>Windows</SubSystem>
136+
</Link>
137+
</ItemDefinitionGroup>
138+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
139+
<Midl>
140+
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
141+
<MkTypLibCompatible>true</MkTypLibCompatible>
142+
<SuppressStartupBanner>true</SuppressStartupBanner>
143+
<TargetEnvironment>Win32</TargetEnvironment>
144+
<TypeLibraryName>.\Release/testpalette.tlb</TypeLibraryName>
145+
</Midl>
146+
<ClCompile>
147+
<AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
148+
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
149+
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
150+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
151+
<WarningLevel>Level3</WarningLevel>
152+
</ClCompile>
153+
<ResourceCompile>
154+
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
155+
<Culture>0x0409</Culture>
156+
</ResourceCompile>
157+
<Link>
158+
<SubSystem>Windows</SubSystem>
159+
</Link>
160+
</ItemDefinitionGroup>
161+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
162+
<Midl>
163+
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
164+
<MkTypLibCompatible>true</MkTypLibCompatible>
165+
<SuppressStartupBanner>true</SuppressStartupBanner>
166+
<TargetEnvironment>X64</TargetEnvironment>
167+
<TypeLibraryName>.\Release/testpalette.tlb</TypeLibraryName>
168+
</Midl>
169+
<ClCompile>
170+
<AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
171+
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
172+
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
173+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
174+
<WarningLevel>Level3</WarningLevel>
175+
</ClCompile>
176+
<ResourceCompile>
177+
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
178+
<Culture>0x0409</Culture>
179+
</ResourceCompile>
180+
<Link>
181+
<SubSystem>Windows</SubSystem>
182+
</Link>
183+
</ItemDefinitionGroup>
184+
<ItemGroup>
185+
<ProjectReference Include="..\..\SDL\SDL.vcxproj">
186+
<Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
187+
<Private>false</Private>
188+
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
189+
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
190+
</ProjectReference>
191+
<ProjectReference Include="..\..\SDLmain\SDLmain.vcxproj">
192+
<Project>{da956fd3-e142-46f2-9dd5-c78bebb56b7a}</Project>
193+
<Private>false</Private>
194+
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
195+
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
196+
</ProjectReference>
197+
</ItemGroup>
198+
<ItemGroup>
199+
<ClCompile Include="..\..\..\test\testpalette.c" />
200+
</ItemGroup>
201+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
202+
<ImportGroup Label="ExtensionTargets">
203+
</ImportGroup>
204+
</Project>

‎test/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ elseif(HAVE_X11)
163163
endif()
164164

165165
add_sdl_test_executable(testoverlay2 NEEDS_RESOURCES testoverlay2.c testutils.c)
166+
add_sdl_test_executable(testpalette testpalette.c)
166167
add_sdl_test_executable(testplatform NONINTERACTIVE testplatform.c)
167168
add_sdl_test_executable(testpower NONINTERACTIVE testpower.c)
168169
add_sdl_test_executable(testfilesystem NONINTERACTIVE testfilesystem.c)
@@ -269,6 +270,7 @@ if(PSP)
269270
testlock
270271
testmessage
271272
testoverlay2
273+
testpalette
272274
testplatform
273275
testpower
274276
testqsort

‎test/Makefile.in‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ TARGETS = \
5656
testmultiaudio$(EXE) \
5757
testnative$(EXE) \
5858
testoverlay2$(EXE) \
59+
testpalette$(EXE) \
5960
testplatform$(EXE) \
6061
testpower$(EXE) \
6162
testqsort$(EXE) \
@@ -289,6 +290,9 @@ endif
289290
testoverlay2$(EXE): $(srcdir)/testoverlay2.c $(srcdir)/testutils.c
290291
$(CC) -o $@ $^ $(CFLAGS) $(LIBS)
291292

293+
testpalette$(EXE): $(srcdir)/testpalette.c
294+
$(CC) -o $@ $^ $(CFLAGS) $(LIBS)
295+
292296
testplatform$(EXE): $(srcdir)/testplatform.c
293297
$(CC) -o $@ $^ $(CFLAGS) $(LIBS)
294298

‎test/README‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ These are test programs for the SDL library:
1818
testmouse Tests mouse coordinates
1919
testmultiaudio Tests using several audio devices
2020
testoverlay2 Tests the overlay flickering/scaling during playback.
21+
testpalette Tests palette rotation effects.
2122
testplatform Tests types, endianness and cpu capabilities
2223
testsem Tests SDL's semaphore implementation
2324
testshape Tests shaped windows

0 commit comments

Comments
 (0)