libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-23 16:09:47 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

(RARCH_PERF) Rename benchmark.c to perforance.c

Browse Source 
(MSVC2010) Rename incorrectly named MSVC2012 solution which was
really an MSVC 2010 solution
This commit is contained in:
twinaphex 2012-11-01 06:21:18 +01:00
parent 3837a503b7
commit b240cfbc7e
15 changed files with 17 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -143,7 +143,7 @@ endif
ifeq ($(PERF_TEST), 1)
DEFINES += -DPERF_TEST
OBJ += benchmark.o
OBJ += performance.o
endif
ifeq ($(HAVE_SDL), 1)

2
Makefile.win
View File

@ -78,7 +78,7 @@ endif
ifeq ($(PERF_TEST), 1)
DEFINES += -DPERF_TEST
OBJ += benchmark.o
OBJ += performance.o
endif
JLIBS =

2
android/native/jni/Android.mk
View File

@ -58,7 +58,7 @@ LOCAL_SRC_FILES = $(RARCH_PATH)/retroarch.c \
main.c
ifeq ($(PERF_TEST), 1)
LOCAL_SRC_FILES += $(RARCH_PATH)/benchmark.c
LOCAL_SRC_FILES += $(RARCH_PATH)/performance.c
LOCAL_CFLAGS += -DPERF_TEST
endif

2
android/native/jni/input_android.c
View File

@ -17,7 +17,7 @@
#include <android/keycodes.h>
#include <unistd.h>
#include "android_general.h"
#include "../../../benchmark.h"
#include "../../../performance.h"
#include "../../../general.h"
#include "../../../driver.h"
#include "input_android.h"

2
console/griffin/griffin.c
View File

@ -43,7 +43,7 @@ CONSOLE EXTENSIONS
#endif
#ifdef PERF_TEST
#include "../../benchmark.c"
#include "../../performance.c"
#endif
#ifdef HAVE_RSOUND

2
gfx/gl.c
View File

@ -15,7 +15,7 @@
*/
#include "../driver.h"
#include "../benchmark.h"
#include "../performance.h"
#include "scaler/scaler.h"
#include <stdint.h>

2
gfx/scaler/scaler.c
View File

@ -21,7 +21,7 @@
#include <string.h>
#include <stdio.h>
#include <math.h>
#include "../../benchmark.h"
#include "../../performance.h"
// In case aligned allocs are needed later ...
void *scaler_alloc(size_t elem_size, size_t size)

2
gfx/vg.c
View File

@ -24,7 +24,7 @@
#include "../libretro.h"
#include "../general.h"
#include "../driver.h"
#include "../benchmark.h"
#include "../performance.h"
#ifdef HAVE_FREETYPE
#include "fonts/fonts.h"

0
msvc/msvc-2012/GL/glext.h → msvc/msvc-2010/GL/glext.h
View File

6
msvc/msvc-2012/RetroArch-msvc2012.vcxproj → msvc/msvc-2010/RetroArch-msvc2010.vcxproj
View File

@ -13,7 +13,7 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{27FF7CE1-4059-4AA1-8062-FD529560FA54}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>RetroArchmsvc2012</RootNamespace>
<RootNamespace>RetroArchmsvc2010</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@ -114,7 +114,7 @@
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
</ClCompile>
<ClCompile Include="..\..\benchmark.c">
<ClCompile Include="..\..\performance.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
</ClCompile>
@ -269,4 +269,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

4
msvc/msvc-2012/RetroArch-msvc2012.vcxproj.filters → msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters
View File

@ -42,7 +42,7 @@
<ClCompile Include="..\..\autosave.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\benchmark.c">
<ClCompile Include="..\..\performance.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\cheats.c">
@ -175,4 +175,4 @@
<Filter>Source Files\gfx\math</Filter>
</ClCompile>
</ItemGroup>
</Project>
</Project>

20
msvc/msvc-2012/RetroArch-msvc2012.sln
View File

@ -1,20 +0,0 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RetroArch-msvc2012", "RetroArch-msvc2012.vcxproj", "{27FF7CE1-4059-4AA1-8062-FD529560FA54}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug|Win32.ActiveCfg = Debug|Win32
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug|Win32.Build.0 = Debug|Win32
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release|Win32.ActiveCfg = Release|Win32
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

2
benchmark.c → performance.c
View File

@ -14,7 +14,7 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#include "benchmark.h"
#include "performance.h"
#if defined(__CELLOS_LV2__) || defined(GEKKO)
#ifndef _PPU_INTRINSICS_H

4
benchmark.h → performance.h
View File

@ -14,8 +14,8 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _RARCH_BENCHMARK_H
#define _RARCH_BENCHMARK_H
#ifndef _RARCH_PERF_H
#define _RARCH_PERF_H
#include "general.h"

2
retroarch.c
View File

@ -24,7 +24,7 @@
#include "file.h"
#include "general.h"
#include "dynamic.h"
#include "benchmark.h"
#include "performance.h"
#include "audio/utils.h"
#include "record/ffemu.h"
#include "rewind.h"