CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-02-02 09:42:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(MSVC) Builds again

Browse Source
This commit is contained in:
twinaphex 2013-12-31 22:10:58 +01:00
parent c5cbec6fdc
commit 4fa7580dea
8 changed files with 195 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -96,7 +96,7 @@ ifeq ($(HAVE_RGUI), 1)
endif
ifeq ($(HAVE_THREADS), 1)
OBJ += autosave.o thread.o gfx/thread_wrapper.o audio/thread_wrapper.o
OBJ += autosave.o thread.o gfx/video_thread_wrapper.o audio/thread_wrapper.o
ifeq ($(findstring Haiku,$(OS)),)
LIBS += -lpthread
endif

2
Makefile.win
View File

@ -116,7 +116,7 @@ ifeq ($(HAVE_SDL), 1)
endif
ifeq ($(HAVE_THREADS), 1)
OBJ += autosave.o thread.o gfx/thread_wrapper.o audio/thread_wrapper.o
OBJ += autosave.o thread.o gfx/video_thread_wrapper.o audio/thread_wrapper.o
DEFINES += -DHAVE_THREADS
endif

1
gfx/glsym/rglgen.c
View File

@ -1,3 +1,4 @@
#include <stdint.h>
#include "rglgen.h"
#include "glsym.h"
#include <string.h>

4
gfx/glsym/rglgen.h
View File

@ -33,6 +33,10 @@
#include <GLES/gl.h>
#include <GLES/glext.h>
#else
#if defined(_WIN32) && !defined(_XBOX)
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#endif
#include <GL/gl.h>
#include <GL/glext.h>
#endif

0
gfx/thread_wrapper.c → gfx/video_thread_wrapper.c
View File

2
griffin/griffin.c
View File

@ -535,7 +535,7 @@ THREAD
#include "../thread/xenon_sdl_threads.c"
#elif defined(HAVE_THREADS)
#include "../thread.c"
#include "../gfx/thread_wrapper.c"
#include "../gfx/video_thread_wrapper.c"
#include "../audio/thread_wrapper.c"
#include "../autosave.c"
#endif

10
msvc/msvc-2010/RetroArch-msvc2010.vcxproj
View File

@ -187,6 +187,7 @@
</ClCompile>
<ClCompile Include="..\..\audio\resampler.c" />
<ClCompile Include="..\..\audio\sinc.c" />
<ClCompile Include="..\..\audio\thread_wrapper.c" />
<ClCompile Include="..\..\audio\utils.c">
</ClCompile>
<ClCompile Include="..\..\audio\xaudio-c\xaudio-c.cpp" />
@ -196,6 +197,7 @@
</ClCompile>
<ClCompile Include="..\..\cheats.c" />
<ClCompile Include="..\..\compat\rxml\rxml.c" />
<ClCompile Include="..\..\core_info.c" />
<ClCompile Include="..\..\core_options.c" />
<ClCompile Include="..\..\deps\miniz\miniz.c" />
<ClCompile Include="..\..\file_extract.c" />
@ -211,11 +213,17 @@
<ClCompile Include="..\..\gfx\fonts\fonts.c" />
<ClCompile Include="..\..\gfx\fonts\gl_font.c" />
<ClCompile Include="..\..\gfx\fonts\gl_raster_font.c" />
<ClCompile Include="..\..\gfx\glsym\glsym_gl.c" />
<ClCompile Include="..\..\gfx\glsym\rglgen.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
</ClCompile>
<ClCompile Include="..\..\gfx\rpng\rpng.c" />
<ClCompile Include="..\..\gfx\shader_cg.c" />
<ClCompile Include="..\..\gfx\shader_glsl.c" />
<ClCompile Include="..\..\gfx\shader_parse.c" />
<ClCompile Include="..\..\gfx\thread_wrapper.c" />
<ClCompile Include="..\..\gfx\video_thread_wrapper.c" />
<ClCompile Include="..\..\input\keyboard_line.c" />
<ClCompile Include="..\..\input\overlay.c" />
<ClCompile Include="..\..\performance.c">
</ClCompile>

177
msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters Normal file
View File

@ -0,0 +1,177 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="..\..\autosave.c" />
<ClCompile Include="..\..\cheats.c" />
<ClCompile Include="..\..\compat\rxml\rxml.c" />
<ClCompile Include="..\..\core_info.c" />
<ClCompile Include="..\..\core_options.c" />
<ClCompile Include="..\..\deps\miniz\miniz.c" />
<ClCompile Include="..\..\file_extract.c" />
<ClCompile Include="..\..\frontend\menu\history.c" />
<ClCompile Include="..\..\file_list.c" />
<ClCompile Include="..\..\gfx\d3d9\render_chain.cpp" />
<ClCompile Include="..\..\gfx\fonts\bitmapfont.c" />
<ClCompile Include="..\..\gfx\fonts\fonts.c" />
<ClCompile Include="..\..\gfx\rpng\rpng.c" />
<ClCompile Include="..\..\input\overlay.c" />
<ClCompile Include="..\..\performance.c" />
<ClCompile Include="..\..\command.c" />
<ClCompile Include="..\..\compat\compat.c" />
<ClCompile Include="..\..\conf\config_file.c" />
<ClCompile Include="..\..\driver.c" />
<ClCompile Include="..\..\dynamic.c" />
<ClCompile Include="..\..\dynamic_dummy.c" />
<ClCompile Include="..\..\fifo_buffer.c" />
<ClCompile Include="..\..\file.c" />
<ClCompile Include="..\..\file_path.c" />
<ClCompile Include="..\..\gfx\context\win32_common.c" />
<ClCompile Include="..\..\gfx\image.c" />
<ClCompile Include="..\..\gfx\scaler\filter.c" />
<ClCompile Include="..\..\gfx\scaler\pixconv.c" />
<ClCompile Include="..\..\gfx\scaler\scaler.c" />
<ClCompile Include="..\..\gfx\scaler\scaler_int.c" />
<ClCompile Include="..\..\hash.c" />
<ClCompile Include="..\..\input\input_common.c" />
<ClCompile Include="..\..\input\autoconf\builtin_win.c" />
<ClCompile Include="..\..\message_queue.c" />
<ClCompile Include="..\..\movie.c" />
<ClCompile Include="..\..\netplay.c" />
<ClCompile Include="..\..\patch.c" />
<ClCompile Include="..\..\frontend\frontend.c" />
<ClCompile Include="..\..\frontend\frontend_context.c" />
<ClCompile Include="..\..\retroarch.c" />
<ClCompile Include="..\..\rewind.c" />
<ClCompile Include="..\..\screenshot.c" />
<ClCompile Include="..\..\settings.c" />
<ClCompile Include="..\..\thread.c" />
<ClCompile Include="..\..\gfx\gfx_common.c">
<Filter>gfx</Filter>
</ClCompile>
<ClCompile Include="..\..\gfx\gfx_context.c">
<Filter>gfx</Filter>
</ClCompile>
<ClCompile Include="..\..\gfx\gl.c">
<Filter>gfx</Filter>
</ClCompile>
<ClCompile Include="..\..\gfx\fonts\gl_raster_font.c">
<Filter>gfx</Filter>
</ClCompile>
<ClCompile Include="..\..\gfx\fonts\gl_font.c">
<Filter>gfx</Filter>
</ClCompile>
<ClCompile Include="..\..\frontend\menu\menu_common.c">
<Filter>frontend\menu</Filter>
</ClCompile>
<ClCompile Include="..\..\frontend\menu\menu_context.c">
<Filter>frontend\menu</Filter>
</ClCompile>
<ClCompile Include="..\..\frontend\menu\menu_settings.c">
<Filter>frontend\menu</Filter>
</ClCompile>
<ClCompile Include="..\..\frontend\menu\disp\rgui.c">
<Filter>frontend\menu\disp</Filter>
</ClCompile>
<ClCompile Include="..\..\gfx\glsym\rglgen.c">
<Filter>gfx\glsym</Filter>
</ClCompile>
<ClCompile Include="..\..\gfx\glsym\glsym_gl.c">
<Filter>gfx\glsym</Filter>
</ClCompile>
<ClCompile Include="..\..\audio\sinc.c">
<Filter>audio</Filter>
</ClCompile>
<ClCompile Include="..\..\audio\utils.c">
<Filter>audio</Filter>
</ClCompile>
<ClCompile Include="..\..\audio\resampler.c">
<Filter>audio</Filter>
</ClCompile>
<ClCompile Include="..\..\gfx\d3d9\d3d9.cpp">
<Filter>gfx\d3d9</Filter>
</ClCompile>
<ClCompile Include="..\..\gfx\math\matrix.c">
<Filter>gfx\math</Filter>
</ClCompile>
<ClCompile Include="..\..\gfx\math\matrix_3x3.c">
<Filter>gfx\math</Filter>
</ClCompile>
<ClCompile Include="..\..\gfx\shader_cg.c">
<Filter>gfx</Filter>
</ClCompile>
<ClCompile Include="..\..\gfx\shader_glsl.c">
<Filter>gfx</Filter>
</ClCompile>
<ClCompile Include="..\..\gfx\state_tracker.c">
<Filter>gfx</Filter>
</ClCompile>
<ClCompile Include="..\..\gfx\shader_parse.c">
<Filter>gfx</Filter>
</ClCompile>
<ClCompile Include="..\..\gfx\context\wgl_ctx.c">
<Filter>gfx\context</Filter>
</ClCompile>
<ClCompile Include="..\..\audio\dsound.c">
<Filter>audio</Filter>
</ClCompile>
<ClCompile Include="..\..\audio\xaudio-c\xaudio-c.cpp">
<Filter>audio</Filter>
</ClCompile>
<ClCompile Include="..\..\audio\xaudio.c">
<Filter>audio</Filter>
</ClCompile>
<ClCompile Include="..\..\input\dinput.c">
<Filter>input</Filter>
</ClCompile>
<ClCompile Include="..\..\input\winxinput_joypad.c">
<Filter>input</Filter>
</ClCompile>
<ClCompile Include="..\..\input\keyboard_line.c">
<Filter>input</Filter>
</ClCompile>
<ClCompile Include="..\..\audio\thread_wrapper.c">
<Filter>audio</Filter>
</ClCompile>
<ClCompile Include="..\..\gfx\video_thread_wrapper.c">
<Filter>gfx</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="resource.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\media\rarch.rc" />
</ItemGroup>
<ItemGroup>
<Filter Include="gfx">
<UniqueIdentifier>{8e47cc2f-ec74-4943-b7b7-156705b5d06e}</UniqueIdentifier>
</Filter>
<Filter Include="frontend">
<UniqueIdentifier>{70d71fcb-ca47-4008-a027-26ed3eaa1f16}</UniqueIdentifier>
</Filter>
<Filter Include="frontend\menu">
<UniqueIdentifier>{6a00f197-1398-4044-bbf1-ee767df7a2ee}</UniqueIdentifier>
</Filter>
<Filter Include="frontend\menu\disp">
<UniqueIdentifier>{45fc4432-da59-4c73-a194-1fd2155489bc}</UniqueIdentifier>
</Filter>
<Filter Include="gfx\glsym">
<UniqueIdentifier>{98e75d1b-5c77-4e09-ba68-248974772850}</UniqueIdentifier>
</Filter>
<Filter Include="audio">
<UniqueIdentifier>{a4e2c91e-3109-4ef9-a5ae-a42dc713c499}</UniqueIdentifier>
</Filter>
<Filter Include="gfx\d3d9">
<UniqueIdentifier>{f2f1e12e-ac10-4b0e-aa95-7a4b6a555d44}</UniqueIdentifier>
</Filter>
<Filter Include="gfx\math">
<UniqueIdentifier>{c5041859-b61d-41bb-8f3a-f596248b1132}</UniqueIdentifier>
</Filter>
<Filter Include="gfx\context">
<UniqueIdentifier>{46e89489-2413-4645-aef3-66c7d9dd9dca}</UniqueIdentifier>
</Filter>
<Filter Include="input">
<UniqueIdentifier>{c7cbb180-c629-4897-89f0-a4298eaf5f27}</UniqueIdentifier>
</Filter>
</ItemGroup>
</Project>