visual studio compatibility

no modem support
no zip or 7z support so no naomi for now
hacked a .asm file as vs doesn't support inline assembly -> code dup
This commit is contained in:
flyinghead 2019-03-30 19:26:05 +01:00
parent 3c3165999b
commit 7f0489ff28
18 changed files with 1870 additions and 1256 deletions

View File

@ -21,12 +21,15 @@
#include "archive.h"
#include "7zArchive.h"
#ifndef _MSC_VER
#include "ZipArchive.h"
#endif
Archive *OpenArchive(const char *path)
{
std::string base_path(path);
#ifndef _MSC_VER
Archive *sz_archive = new SzArchive();
if (sz_archive->Open(base_path.c_str()) || sz_archive->Open((base_path + ".7z").c_str()) || sz_archive->Open((base_path + ".7Z").c_str()))
return sz_archive;
@ -36,6 +39,7 @@ Archive *OpenArchive(const char *path)
if (zip_archive->Open(base_path.c_str()) || zip_archive->Open((base_path + ".zip").c_str()) || zip_archive->Open((base_path + ".ZIP").c_str()))
return zip_archive;
delete zip_archive;
#endif
return NULL;
}

148
core/deps/dirent/dirent.c Normal file
View File

@ -0,0 +1,148 @@
/*
Implementation of POSIX directory browsing functions and types for Win32.
Author: Kevlin Henney (kevlin@acm.org, kevlin@curbralan.com)
History: Created March 1997. Updated June 2003 and July 2012.
Rights: See end of file.
*/
#include "dirent.h"
#include <errno.h>
#include <io.h> /* _findfirst and _findnext set errno iff they return -1 */
#include <stdlib.h>
#include <string.h>
#ifdef __cplusplus
extern "C"
{
#endif
typedef ptrdiff_t handle_type; /* C99's intptr_t not sufficiently portable */
struct DIR
{
handle_type handle; /* -1 for failed rewind */
struct _finddata_t info;
struct dirent result; /* d_name null iff first time */
char *name; /* null-terminated char string */
};
DIR *opendir(const char *name)
{
DIR *dir = 0;
if (name && name[0])
{
size_t base_length = strlen(name);
const char *all = /* search pattern must end with suitable wildcard */
strchr("/\\", name[base_length - 1]) ? "*" : "/*";
if ((dir = (DIR *)malloc(sizeof *dir)) != 0 &&
(dir->name = (char *)malloc(base_length + strlen(all) + 1)) != 0)
{
strcat(strcpy(dir->name, name), all);
if ((dir->handle =
(handle_type)_findfirst(dir->name, &dir->info)) != -1)
{
dir->result.d_name = 0;
}
else /* rollback */
{
free(dir->name);
free(dir);
dir = 0;
}
}
else /* rollback */
{
free(dir);
dir = 0;
errno = ENOMEM;
}
}
else
{
errno = EINVAL;
}
return dir;
}
int closedir(DIR *dir)
{
int result = -1;
if (dir)
{
if (dir->handle != -1)
{
result = _findclose(dir->handle);
}
free(dir->name);
free(dir);
}
if (result == -1) /* map all errors to EBADF */
{
errno = EBADF;
}
return result;
}
struct dirent *readdir(DIR *dir)
{
struct dirent *result = 0;
if (dir && dir->handle != -1)
{
if (!dir->result.d_name || _findnext(dir->handle, &dir->info) != -1)
{
result = &dir->result;
result->d_name = dir->info.name;
}
}
else
{
errno = EBADF;
}
return result;
}
void rewinddir(DIR *dir)
{
if (dir && dir->handle != -1)
{
_findclose(dir->handle);
dir->handle = (handle_type)_findfirst(dir->name, &dir->info);
dir->result.d_name = 0;
}
else
{
errno = EBADF;
}
}
#ifdef __cplusplus
}
#endif
/*
Copyright Kevlin Henney, 1997, 2003, 2012. All rights reserved.
Permission to use, copy, modify, and distribute this software and its
documentation for any purpose is hereby granted without fee, provided
that this copyright and permissions notice appear in all copies and
derivatives.
This software is supplied "as is" without express or implied warranty.
But that said, if there are any problems please get in touch.
*/

50
core/deps/dirent/dirent.h Normal file
View File

@ -0,0 +1,50 @@
#ifndef DIRENT_INCLUDED
#define DIRENT_INCLUDED
/*
Declaration of POSIX directory browsing functions and types for Win32.
Author: Kevlin Henney (kevlin@acm.org, kevlin@curbralan.com)
History: Created March 1997. Updated June 2003.
Rights: See end of file.
*/
#ifdef __cplusplus
extern "C"
{
#endif
typedef struct DIR DIR;
struct dirent
{
char *d_name;
};
DIR *opendir(const char *);
int closedir(DIR *);
struct dirent *readdir(DIR *);
void rewinddir(DIR *);
/*
Copyright Kevlin Henney, 1997, 2003. All rights reserved.
Permission to use, copy, modify, and distribute this software and its
documentation for any purpose is hereby granted without fee, provided
that this copyright and permissions notice appear in all copies and
derivatives.
This software is supplied "as is" without express or implied warranty.
But that said, if there are any problems please get in touch.
*/
#ifdef __cplusplus
}
#endif
#endif

View File

@ -162,6 +162,11 @@ ROM board internal layouts:
*/
#include "awcartridge.h"
#include "awave_regs.h"
#ifdef _MSC_VER
#undef min
#undef max
#include <algorithm>
#endif
u32 AWCartridge::ReadMem(u32 address, u32 size) {
verify(size != 1);

View File

@ -86,7 +86,10 @@ void bm_WriteBlockMap(const string& file);
DynarecCodeEntryPtr DYNACALL bm_GetCode(u32 addr);
extern "C" {
__attribute__((used)) DynarecCodeEntryPtr DYNACALL bm_GetCode2(u32 addr);
#ifndef _MSC_VER
__attribute__((used))
#endif
DynarecCodeEntryPtr DYNACALL bm_GetCode2(u32 addr);
}
RuntimeBlockInfo* bm_GetBlock(void* dynarec_code);

View File

@ -314,7 +314,7 @@ struct Sh4RCB
Sh4Context cntx;
};
extern Sh4RCB* p_sh4rcb;
extern "C" Sh4RCB* p_sh4rcb;
extern u8* sh4_dyna_rcb;
INLINE u32 sh4_sr_GetFull()

View File

@ -61,6 +61,9 @@ void ExecuteDelayslot_RTE();
extern "C" {
int UpdateSystem();
__attribute__((used)) int UpdateSystem_INTC();
#ifndef _MSC_VER
__attribute__((used))
#endif
int UpdateSystem_INTC();
}

61
core/rec-x64/msvc.asm Normal file
View File

@ -0,0 +1,61 @@
_TEXT SEGMENT
SH4_TIMESLICE = 448
CPU_RUNNING = 135266148
PC = 135266120
EXTERN bm_GetCode2: PROC
EXTERN UpdateSystem_INTC: PROC
EXTERN cycle_counter: dword
EXTERN p_sh4rcb: qword
PUBLIC ngen_mainloop
ngen_mainloop PROC
push rbx
push rbp
push rdi
push rsi
push r12
push r13
push r14
push r15
sub rsp, 40 ; 32-byte shadow space + 8 for stack 16-byte alignment
mov dword ptr [cycle_counter], SH4_TIMESLICE
run_loop:
mov rax, qword ptr [p_sh4rcb]
mov edx, dword ptr[CPU_RUNNING + rax]
test edx, edx
je end_run_loop
slice_loop:
mov rax, qword ptr [p_sh4rcb]
mov ecx, dword ptr[PC + rax]
call bm_GetCode2
call rax
mov ecx, dword ptr [cycle_counter]
test ecx, ecx
jg slice_loop
add ecx, SH4_TIMESLICE
mov dword ptr [cycle_counter], ecx
call UpdateSystem_INTC
jmp run_loop
end_run_loop:
add rsp, 40
pop r15
pop r14
pop r13
pop r12
pop rsi
pop rdi
pop rbp
pop rbx
ret
ngen_mainloop ENDP
_TEXT ENDS
END

View File

@ -32,7 +32,9 @@ struct DynaRBI : RuntimeBlockInfo
}
};
int cycle_counter;
extern "C" {
int cycle_counter;
}
double host_cpu_time;
u64 guest_cpu_cycles;
@ -76,6 +78,8 @@ static __attribute((used)) void end_slice()
#error RAM_SIZE_MAX unknown
#endif
#ifndef _MSC_VER
#ifdef _WIN32
// Fully naked function in win32 for proper SEH prologue
__asm__ (
@ -177,6 +181,7 @@ WIN32_ONLY( ".seh_pushreg %r14 \n\t")
}
#endif
#endif // !_MSC_VER
#undef _U
#undef _S

View File

@ -22,7 +22,11 @@
#include <sstream>
#include <sys/types.h>
#include <sys/stat.h>
#ifdef _MSC_VER
#include "dirent/dirent.h"
#else
#include <dirent.h>
#endif
#include "deps/libpng/png.h"
#include "reios/reios.h"

View File

@ -18,7 +18,12 @@
*/
#include <algorithm>
#include <math.h>
#ifdef _MSC_VER
#include "dirent/dirent.h"
#define S_ISDIR(mode) (((mode) & _S_IFMT) == _S_IFDIR)
#else
#include <dirent.h>
#endif
#include <sys/stat.h>
#include "gui.h"

View File

@ -21,8 +21,16 @@
#include <vector>
#include <algorithm>
#include <stdlib.h>
#ifdef _MSC_VER
#include <io.h>
#include "dirent/dirent.h"
#define S_ISDIR(mode) (((mode) & _S_IFMT) == _S_IFDIR)
#define access _access
#define R_OK 4
#else
#include <dirent.h>
#include <unistd.h>
#endif
#include <sys/stat.h>
#include "types.h"

View File

@ -5,6 +5,10 @@
#include "types.h"
#include "cfg/cfg.h"
#ifdef WIN32
#include <direct.h>
#endif
#if BUILD_COMPILER==COMPILER_VC
#include <io.h>
#define access _access
@ -140,11 +144,11 @@ string get_game_dir()
bool make_directory(const string& path)
{
return mkdir(path.c_str()
#ifndef _WIN32
, 0755
#ifdef WIN32
return _mkdir(path.c_str()) == 0;
#else
return mkdir(path.c_str(), 0755) == 0;
#endif
) == 0;
}
#if 0

View File

@ -646,15 +646,31 @@ int CALLBACK WinMain(HINSTANCE hInstance,HINSTANCE hPrevInstance,LPSTR lpCmdLine
int argc=0;
wchar* cmd_line=GetCommandLineA();
wchar** argv=CommandLineToArgvA(cmd_line,&argc);
if(strstr(cmd_line,"NoConsole")==0)
for (int i = 0; i < argc; i++)
{
if (AllocConsole())
if (!stricmp(argv[i], "-console"))
{
freopen("CON","w",stdout);
freopen("CON","w",stderr);
freopen("CON","r",stdin);
if (AllocConsole())
{
freopen("CON", "w", stdout);
freopen("CON", "w", stderr);
freopen("CON", "r", stdin);
}
SetConsoleCtrlHandler((PHANDLER_ROUTINE)CtrlHandler, TRUE);
}
else if (!stricmp(argv[i], "-log"))
{
const char *logfile;
if (i < argc - 1)
{
logfile = argv[i + 1];
i++;
}
else
logfile = "reicast-log.txt";
freopen(logfile, "w", stdout);
freopen(logfile, "w", stderr);
}
SetConsoleCtrlHandler( (PHANDLER_ROUTINE) CtrlHandler, TRUE );
}
#endif
@ -662,14 +678,13 @@ int CALLBACK WinMain(HINSTANCE hInstance,HINSTANCE hPrevInstance,LPSTR lpCmdLine
ReserveBottomMemory();
SetupPath();
#ifndef __GNUC__
__try
#else
#ifdef _WIN64
AddVectoredExceptionHandler(1, ExeptionHandler);
#else
SetUnhandledExceptionFilter(&ExeptionHandler);
#endif
#ifndef __GNUC__
__try
#endif
{
int reicast_init(int argc, char* argv[]);

View File

@ -181,7 +181,6 @@ protected:
private:
void do_rumble(float power)
{
printf("do_rumble %f\n", power);
XINPUT_VIBRATION vib;
vib.wLeftMotorSpeed = (u16)(65535 * power);

View File

@ -240,7 +240,7 @@ else ifneq (,$(findstring vero4k,$(platform)))
else ifneq (,$(findstring win32,$(platform)))
NOT_ARM := 1
CFLAGS += -DTARGET_NO_WEBUI -fno-builtin-sqrtf -funroll-loops -DHAVE_FSEEKO -D TARGET_NO_AREC
LDFLAGS += -static-libgcc -static-libstdc++
LDFLAGS += -static-libgcc -static-libstdc++ -Wl,-subsystem,windows
LIBS := -lopengl32 -lwinmm -lgdi32 -lwsock32 -ldsound -lcomctl32 -lcomdlg32 -lxinput -liphlpapi
PLATFORM_EXT := exe
CC = gcc
@ -289,7 +289,7 @@ INCS += -I$(RZDCY_SRC_DIR) -I$(RZDCY_SRC_DIR)/deps -I$(RZDCY_SRC_DIR)/khronos
LIBS += -lm -lpthread
ifdef FOR_LINUX
LIBS += -lrt -ldl
LIBS += -lrt
endif
PREFIX ?= /usr/local

View File

@ -35,6 +35,27 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\core\archive\7zArchive.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Naomi Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Fast|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Slow|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Naomi Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Naomi Release|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Fast|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Slow|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Naomi Debug|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\core\archive\archive.cpp" />
<ClCompile Include="..\core\archive\ZipArchive.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Naomi Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Fast|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Slow|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Naomi Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Naomi Release|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Fast|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Slow|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Naomi Debug|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\core\cfg\cl.cpp" />
<ClCompile Include="..\core\cfg\cfg.cpp" />
<ClCompile Include="..\core\cfg\ini.cpp" />
@ -47,6 +68,7 @@
<ClCompile Include="..\core\deps\coreio\coreio.cpp" />
<ClCompile Include="..\core\deps\crypto\md5.cpp" />
<ClCompile Include="..\core\deps\crypto\sha1.cpp" />
<ClCompile Include="..\core\deps\dirent\dirent.c" />
<ClCompile Include="..\core\deps\flac\src\libFLAC\bitmath.c" />
<ClCompile Include="..\core\deps\flac\src\libFLAC\bitreader.c" />
<ClCompile Include="..\core\deps\flac\src\libFLAC\cpu.c" />
@ -68,6 +90,10 @@
<ClCompile Include="..\core\deps\flac\src\libFLAC\stream_decoder.c" />
<ClCompile Include="..\core\deps\flac\src\libFLAC\window.c" />
<ClCompile Include="..\core\deps\flac\src\libFLAC\windows_unicode_filenames.c" />
<ClCompile Include="..\core\deps\imgui\imgui.cpp" />
<ClCompile Include="..\core\deps\imgui\imgui_demo.cpp" />
<ClCompile Include="..\core\deps\imgui\imgui_draw.cpp" />
<ClCompile Include="..\core\deps\imgui\imgui_widgets.cpp" />
<ClCompile Include="..\core\deps\libelf\elf.cpp" />
<ClCompile Include="..\core\deps\libelf\elf32.cpp" />
<ClCompile Include="..\core\deps\libelf\elf64.cpp" />
@ -154,6 +180,11 @@
<ClCompile Include="..\core\hw\mem\_vmem.cpp" />
<ClCompile Include="..\core\hw\modem\modem.cpp" />
<ClCompile Include="..\core\hw\modem\picoppp.cpp" />
<ClCompile Include="..\core\hw\naomi\awcartridge.cpp" />
<ClCompile Include="..\core\hw\naomi\decrypt.cpp" />
<ClCompile Include="..\core\hw\naomi\gdcartridge.cpp" />
<ClCompile Include="..\core\hw\naomi\m1cartridge.cpp" />
<ClCompile Include="..\core\hw\naomi\m4cartridge.cpp" />
<ClCompile Include="..\core\hw\naomi\naomi.cpp" />
<ClCompile Include="..\core\hw\naomi\naomi_cart.cpp" />
<ClCompile Include="..\core\hw\pvr\drkPvr.cpp" />
@ -192,9 +223,13 @@
<ClCompile Include="..\core\imgread\cdi.cpp" />
<ClCompile Include="..\core\imgread\chd.cpp" />
<ClCompile Include="..\core\imgread\common.cpp" />
<ClCompile Include="..\core\imgread\cue.cpp" />
<ClCompile Include="..\core\imgread\gdi.cpp" />
<ClCompile Include="..\core\imgread\ImgReader.cpp" />
<ClCompile Include="..\core\imgread\ioctl.cpp" />
<ClCompile Include="..\core\input\gamepad_device.cpp" />
<ClCompile Include="..\core\input\keyboard_device.cpp" />
<ClCompile Include="..\core\input\mapping.cpp" />
<ClCompile Include="..\core\linux\common.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Slow|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Naomi Debug|Win32'">true</ExcludedFromBuild>
@ -269,6 +304,8 @@
<ClCompile Include="..\core\reios\reios.cpp" />
<ClCompile Include="..\core\reios\reios_elf.cpp" />
<ClCompile Include="..\core\rend\d3d11\d3d11.cpp" />
<ClCompile Include="..\core\rend\gles\CustomTexture.cpp" />
<ClCompile Include="..\core\rend\gles\gl32funcs.c" />
<ClCompile Include="..\core\rend\gles\gldraw.cpp" />
<ClCompile Include="..\core\rend\gles\gles.cpp" />
<ClCompile Include="..\core\rend\gles\gltex.cpp" />
@ -276,6 +313,9 @@
<ClCompile Include="..\core\rend\gl4\gldraw.cpp" />
<ClCompile Include="..\core\rend\gl4\gles.cpp" />
<ClCompile Include="..\core\rend\gl4\gltex.cpp" />
<ClCompile Include="..\core\rend\gles\imgui_impl_opengl3.cpp" />
<ClCompile Include="..\core\rend\gui.cpp" />
<ClCompile Include="..\core\rend\gui_util.cpp" />
<ClCompile Include="..\core\rend\soft\softrend.cpp" />
<ClCompile Include="..\core\rend\TexCache.cpp" />
<ClCompile Include="..\core\serialize.cpp" />
@ -284,6 +324,9 @@
<ClCompile Include="..\core\windows\winmain.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\core\archive\7zArchive.h" />
<ClInclude Include="..\core\archive\archive.h" />
<ClInclude Include="..\core\archive\ZipArchive.h" />
<ClInclude Include="..\core\build.h" />
<ClInclude Include="..\core\cfg\cfg.h" />
<ClInclude Include="..\core\cfg\ini.h" />
@ -297,6 +340,7 @@
<ClInclude Include="..\core\deps\coreio\coreio.h" />
<ClInclude Include="..\core\deps\crypto\md5.h" />
<ClInclude Include="..\core\deps\crypto\sha1.h" />
<ClInclude Include="..\core\deps\dirent\dirent.h" />
<ClInclude Include="..\core\deps\flac\include\FLAC\all.h" />
<ClInclude Include="..\core\deps\flac\include\FLAC\assert.h" />
<ClInclude Include="..\core\deps\flac\include\FLAC\callback.h" />
@ -313,6 +357,13 @@
<ClInclude Include="..\core\deps\flac\include\share\safe_str.h" />
<ClInclude Include="..\core\deps\flac\include\share\windows_unicode_filenames.h" />
<ClInclude Include="..\core\deps\flac\include\share\win_utf8_io.h" />
<ClInclude Include="..\core\deps\imgui\imconfig.h" />
<ClInclude Include="..\core\deps\imgui\imgui.h" />
<ClInclude Include="..\core\deps\imgui\imgui_internal.h" />
<ClInclude Include="..\core\deps\imgui\imstb_rectpack.h" />
<ClInclude Include="..\core\deps\imgui\imstb_textedit.h" />
<ClInclude Include="..\core\deps\imgui\imstb_truetype.h" />
<ClInclude Include="..\core\deps\imgui\roboto_medium.h" />
<ClInclude Include="..\core\deps\libelf\debug.h" />
<ClInclude Include="..\core\deps\libelf\elf.h" />
<ClInclude Include="..\core\deps\libelf\elf32.h" />
@ -384,9 +435,17 @@
<ClInclude Include="..\core\hw\modem\modem.h" />
<ClInclude Include="..\core\hw\modem\modem_regs.h" />
<ClInclude Include="..\core\hw\modem\picoppp.h" />
<ClInclude Include="..\core\hw\naomi\awave_regs.h" />
<ClInclude Include="..\core\hw\naomi\awcartridge.h" />
<ClInclude Include="..\core\hw\naomi\decrypt.h" />
<ClInclude Include="..\core\hw\naomi\gdcartridge.h" />
<ClInclude Include="..\core\hw\naomi\m1cartridge.h" />
<ClInclude Include="..\core\hw\naomi\m4cartridge.h" />
<ClInclude Include="..\core\hw\naomi\naomi.h" />
<ClInclude Include="..\core\hw\naomi\naomi_cart.h" />
<ClInclude Include="..\core\hw\naomi\naomi_regs.h" />
<ClInclude Include="..\core\hw\naomi\naomi_roms.h" />
<ClInclude Include="..\core\hw\naomi\naomi_roms_input.h" />
<ClInclude Include="..\core\hw\pvr\config.h" />
<ClInclude Include="..\core\hw\pvr\drkPvr.h" />
<ClInclude Include="..\core\hw\pvr\helper_classes.h" />
@ -430,6 +489,10 @@
<ClInclude Include="..\core\imgread\pfctoc.h" />
<ClInclude Include="..\core\imgread\resource.h" />
<ClInclude Include="..\core\imgread\SCSIDEFS.H" />
<ClInclude Include="..\core\input\gamepad.h" />
<ClInclude Include="..\core\input\gamepad_device.h" />
<ClInclude Include="..\core\input\keyboard_device.h" />
<ClInclude Include="..\core\input\mapping.h" />
<ClInclude Include="..\core\linux\context.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Fast|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Naomi Release|Win32'">true</ExcludedFromBuild>
@ -454,6 +517,11 @@
<ClInclude Include="..\core\oslib\audiostream.h" />
<ClInclude Include="..\core\oslib\oslib.h" />
<ClInclude Include="..\core\profiler\profiler.h" />
<ClInclude Include="..\core\windows\win_keyboard.h" />
<ClInclude Include="..\core\windows\xinput_gamepad.h" />
<MASM Include="..\core\rec-x64\msvc.asm">
<FileType>Document</FileType>
</MASM>
<ClInclude Include="..\core\rec-x86\rec_x86_ngen.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Fast|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Naomi Release|x64'">true</ExcludedFromBuild>
@ -464,9 +532,14 @@
<ClInclude Include="..\core\reios\gdrom_hle.h" />
<ClInclude Include="..\core\reios\reios.h" />
<ClInclude Include="..\core\reios\reios_elf.h" />
<ClInclude Include="..\core\rend\gles\CustomTexture.h" />
<ClInclude Include="..\core\rend\gles\gl32funcs.h" />
<ClInclude Include="..\core\rend\gles\gles.h" />
<ClInclude Include="..\core\rend\gles\glcache.h" />
<ClInclude Include="..\core\rend\gl4\gl4.h" />
<ClInclude Include="..\core\rend\gles\imgui_impl_opengl3.h" />
<ClInclude Include="..\core\rend\gui.h" />
<ClInclude Include="..\core\rend\gui_util.h" />
<ClInclude Include="..\core\rend\rend.h" />
<ClInclude Include="..\core\rend\TexCache.h" />
<ClInclude Include="..\core\stdclass.h" />
@ -640,7 +713,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Full</Optimization>
<PreprocessorDefinitions>WIN32;CHD5_FLAC;PACKAGE_VERSION="1.3.2";FLAC__HAS_OGG=0;FLAC__NO_DLL;HAVE_LROUND;HAVE_STDINT_H;HAVE_STDLIB_H;CHD5_LZMA;_7ZIP_ST;NDEBUG;_CONSOLE;X86;RELEASE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;$(ProjectDir)..\core\rend\gles;$(ProjectDir)..\core\deps\flac\src\libflac\include;$(ProjectDir)..\core\deps\flac\include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;$(ProjectDir)..\core\rend\gles;$(ProjectDir)..\core\deps;$(ProjectDir)..\core\deps\flac\src\libflac\include;$(ProjectDir)..\core\deps\flac\include</AdditionalIncludeDirectories>
<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
@ -664,6 +737,13 @@
<AdditionalLibraryDirectories>$(SolutionDir)..\pvrframe</AdditionalLibraryDirectories>
<AdditionalDependencies>Dsound.lib;winmm.lib;wsock32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PreBuildEvent>
<Command>for /f "delims=" %%i in ('git describe') do echo #define REICAST_VERSION "%%i" &gt;$(ProjectDir)\..\core\version.h
for /f "delims=" %%i in ('git rev-parse --short HEAD') do echo #define GIT_HASH "%%i" &gt;&gt;$(ProjectDir)\..\core\version.h
for /f "delims=" %%i in ('date /T') do echo #define BUILD_DATE "%%i" &gt;&gt;$(ProjectDir)\..\core\version.h
</Command>
<Message>Create version.h</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Naomi Release|Win32'">
<ClCompile>
@ -672,7 +752,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Full</Optimization>
<PreprocessorDefinitions>WIN32;CHD5_FLAC;PACKAGE_VERSION="1.3.2";FLAC__HAS_OGG=0;FLAC__NO_DLL;HAVE_LROUND;HAVE_STDINT_H;HAVE_STDLIB_H;CHD5_LZMA;_7ZIP_ST;NDEBUG;_CONSOLE;X86;RELEASE;TARGET_NAOMI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;$(ProjectDir)..\core\rend\gles;$(ProjectDir)..\core\deps\flac\src\libflac\include;$(ProjectDir)..\core\deps\flac\include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;$(ProjectDir)..\core\rend\gles;$(ProjectDir)..\core\deps;$(ProjectDir)..\core\deps\flac\src\libflac\include;$(ProjectDir)..\core\deps\flac\include</AdditionalIncludeDirectories>
<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
@ -696,6 +776,13 @@
<AdditionalLibraryDirectories>$(SolutionDir)..\pvrframe</AdditionalLibraryDirectories>
<AdditionalDependencies>Dsound.lib;winmm.lib;wsock32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PreBuildEvent>
<Command>for /f "delims=" %%i in ('git describe') do echo #define REICAST_VERSION "%%i" &gt;$(ProjectDir)\..\core\version.h
for /f "delims=" %%i in ('git rev-parse --short HEAD') do echo #define GIT_HASH "%%i" &gt;&gt;$(ProjectDir)\..\core\version.h
for /f "delims=" %%i in ('date /T') do echo #define BUILD_DATE "%%i" &gt;&gt;$(ProjectDir)\..\core\version.h
</Command>
<Message>Create version.h</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Fast|x64'">
<ClCompile>
@ -704,7 +791,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Full</Optimization>
<PreprocessorDefinitions>WIN32;CHD5_FLAC;PACKAGE_VERSION="1.3.2";FLAC__HAS_OGG=0;FLAC__NO_DLL;HAVE_LROUND;HAVE_STDINT_H;HAVE_STDLIB_H;CHD5_LZMA;_7ZIP_ST;NDEBUG;_CONSOLE;X86;RELEASE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;$(ProjectDir)..\core\rend\gles;$(ProjectDir)..\core\deps\flac\src\libflac\include;$(ProjectDir)..\core\deps\flac\include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;$(ProjectDir)..\core\rend\gles;$(ProjectDir)..\core\deps;$(ProjectDir)..\core\deps\flac\src\libflac\include;$(ProjectDir)..\core\deps\flac\include</AdditionalIncludeDirectories>
<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
@ -730,6 +817,13 @@
<AdditionalLibraryDirectories>$(SolutionDir)..\pvrframe</AdditionalLibraryDirectories>
<AdditionalDependencies>Dsound.lib;winmm.lib;wsock32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PreBuildEvent>
<Command>for /f "delims=" %%i in ('git describe') do echo #define REICAST_VERSION "%%i" &gt;$(ProjectDir)\..\core\version.h
for /f "delims=" %%i in ('git rev-parse --short HEAD') do echo #define GIT_HASH "%%i" &gt;&gt;$(ProjectDir)\..\core\version.h
for /f "delims=" %%i in ('date /T') do echo #define BUILD_DATE "%%i" &gt;&gt;$(ProjectDir)\..\core\version.h
</Command>
<Message>Create version.h</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Naomi Release|x64'">
<ClCompile>
@ -738,7 +832,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Full</Optimization>
<PreprocessorDefinitions>WIN32;CHD5_FLAC;PACKAGE_VERSION="1.3.2";FLAC__HAS_OGG=0;FLAC__NO_DLL;HAVE_LROUND;HAVE_STDINT_H;HAVE_STDLIB_H;CHD5_LZMA;_7ZIP_ST;NDEBUG;_CONSOLE;X86;RELEASE;TARGET_NAOMI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;$(ProjectDir)..\core\rend\gles;$(ProjectDir)..\core\deps\flac\src\libflac\include;$(ProjectDir)..\core\deps\flac\include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;$(ProjectDir)..\core\rend\gles;$(ProjectDir)..\core\deps;$(ProjectDir)..\core\deps\flac\src\libflac\include;$(ProjectDir)..\core\deps\flac\include</AdditionalIncludeDirectories>
<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
@ -764,6 +858,13 @@
<AdditionalLibraryDirectories>$(SolutionDir)..\pvrframe</AdditionalLibraryDirectories>
<AdditionalDependencies>Dsound.lib;winmm.lib;wsock32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PreBuildEvent>
<Command>for /f "delims=" %%i in ('git describe') do echo #define REICAST_VERSION "%%i" &gt;$(ProjectDir)\..\core\version.h
for /f "delims=" %%i in ('git rev-parse --short HEAD') do echo #define GIT_HASH "%%i" &gt;&gt;$(ProjectDir)\..\core\version.h
for /f "delims=" %%i in ('date /T') do echo #define BUILD_DATE "%%i" &gt;&gt;$(ProjectDir)\..\core\version.h
</Command>
<Message>Create version.h</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Slow|Win32'">
<ClCompile>
@ -772,7 +873,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;CHD5_FLAC;PACKAGE_VERSION="1.3.2";FLAC__HAS_OGG=0;FLAC__NO_DLL;HAVE_LROUND;HAVE_STDINT_H;HAVE_STDLIB_H;CHD5_LZMA;_7ZIP_ST;_DEBUG;_CONSOLE;X86;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;$(ProjectDir)..\core\rend\gles;$(ProjectDir)..\core\deps\flac\src\libflac\include;$(ProjectDir)..\core\deps\flac\include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;$(ProjectDir)..\core\rend\gles;$(ProjectDir)..\core\deps;$(ProjectDir)..\core\deps\flac\src\libflac\include;$(ProjectDir)..\core\deps\flac\include</AdditionalIncludeDirectories>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
@ -785,6 +886,13 @@
<AdditionalLibraryDirectories>$(SolutionDir)..\pvrframe</AdditionalLibraryDirectories>
<AdditionalDependencies>Dsound.lib;winmm.lib;wsock32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PreBuildEvent>
<Command>for /f "delims=" %%i in ('git describe') do echo #define REICAST_VERSION "%%i" &gt;$(ProjectDir)\..\core\version.h
for /f "delims=" %%i in ('git rev-parse --short HEAD') do echo #define GIT_HASH "%%i" &gt;&gt;$(ProjectDir)\..\core\version.h
for /f "delims=" %%i in ('date /T') do echo #define BUILD_DATE "%%i" &gt;&gt;$(ProjectDir)\..\core\version.h
</Command>
<Message>Create version.h</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Naomi Debug|Win32'">
<ClCompile>
@ -793,7 +901,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;CHD5_FLAC;PACKAGE_VERSION="1.3.2";FLAC__HAS_OGG=0;FLAC__NO_DLL;HAVE_LROUND;HAVE_STDINT_H;HAVE_STDLIB_H;CHD5_LZMA;_7ZIP_ST;_DEBUG;_CONSOLE;X86;TARGET_NAOMI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;$(ProjectDir)..\core\rend\gles;$(ProjectDir)..\core\deps\flac\src\libflac\include;$(ProjectDir)..\core\deps\flac\include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;$(ProjectDir)..\core\rend\gles;$(ProjectDir)..\core\deps;$(ProjectDir)..\core\deps\flac\src\libflac\include;$(ProjectDir)..\core\deps\flac\include</AdditionalIncludeDirectories>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
@ -806,6 +914,13 @@
<AdditionalLibraryDirectories>$(SolutionDir)..\pvrframe</AdditionalLibraryDirectories>
<AdditionalDependencies>Dsound.lib;winmm.lib;wsock32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PreBuildEvent>
<Command>for /f "delims=" %%i in ('git describe') do echo #define REICAST_VERSION "%%i" &gt;$(ProjectDir)\..\core\version.h
for /f "delims=" %%i in ('git rev-parse --short HEAD') do echo #define GIT_HASH "%%i" &gt;&gt;$(ProjectDir)\..\core\version.h
for /f "delims=" %%i in ('date /T') do echo #define BUILD_DATE "%%i" &gt;&gt;$(ProjectDir)\..\core\version.h
</Command>
<Message>Create version.h</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Slow|x64'">
<ClCompile>
@ -814,7 +929,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;CHD5_FLAC;PACKAGE_VERSION="1.3.2";FLAC__HAS_OGG=0;FLAC__NO_DLL;HAVE_LROUND;HAVE_STDINT_H;HAVE_STDLIB_H;CHD5_LZMA;_7ZIP_ST;_DEBUG;_CONSOLE;X86;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;$(ProjectDir)..\core\rend\gles;$(ProjectDir)..\core\deps\flac\src\libflac\include;$(ProjectDir)..\core\deps\flac\include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;$(ProjectDir)..\core\rend\gles;$(ProjectDir)..\core\deps;$(ProjectDir)..\core\deps\flac\src\libflac\include;$(ProjectDir)..\core\deps\flac\include</AdditionalIncludeDirectories>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
@ -830,6 +945,13 @@
<AdditionalLibraryDirectories>$(SolutionDir)..\pvrframe</AdditionalLibraryDirectories>
<AdditionalDependencies>Dsound.lib;winmm.lib;wsock32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PreBuildEvent>
<Command>for /f "delims=" %%i in ('git describe') do echo #define REICAST_VERSION "%%i" &gt;$(ProjectDir)\..\core\version.h
for /f "delims=" %%i in ('git rev-parse --short HEAD') do echo #define GIT_HASH "%%i" &gt;&gt;$(ProjectDir)\..\core\version.h
for /f "delims=" %%i in ('date /T') do echo #define BUILD_DATE "%%i" &gt;&gt;$(ProjectDir)\..\core\version.h
</Command>
<Message>Create version.h</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Naomi Debug|x64'">
<ClCompile>
@ -838,7 +960,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;CHD5_FLAC;PACKAGE_VERSION="1.3.2";FLAC__HAS_OGG=0;FLAC__NO_DLL;HAVE_LROUND;HAVE_STDINT_H;HAVE_STDLIB_H;CHD5_LZMA;_7ZIP_ST;_DEBUG;_CONSOLE;X86;TARGET_NAOMI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;$(ProjectDir)..\core\rend\gles;$(ProjectDir)..\core\deps\flac\src\libflac\include;$(ProjectDir)..\core\deps\flac\include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;$(ProjectDir)..\core\rend\gles;$(ProjectDir)..\core\deps;$(ProjectDir)..\core\deps\flac\src\libflac\include;$(ProjectDir)..\core\deps\flac\include</AdditionalIncludeDirectories>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
@ -854,6 +976,13 @@
<AdditionalLibraryDirectories>$(SolutionDir)..\pvrframe</AdditionalLibraryDirectories>
<AdditionalDependencies>Dsound.lib;winmm.lib;wsock32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PreBuildEvent>
<Command>for /f "delims=" %%i in ('git describe') do echo #define REICAST_VERSION "%%i" &gt;$(ProjectDir)\..\core\version.h
for /f "delims=" %%i in ('git rev-parse --short HEAD') do echo #define GIT_HASH "%%i" &gt;&gt;$(ProjectDir)\..\core\version.h
for /f "delims=" %%i in ('date /T') do echo #define BUILD_DATE "%%i" &gt;&gt;$(ProjectDir)\..\core\version.h
</Command>
<Message>Create version.h</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>

File diff suppressed because it is too large Load Diff