ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Win32: fix msvc build. removed tick thread

This commit is contained in:
flyinghead 2018-09-25 14:09:07 +02:00
parent 1320ce5949
commit c135ab0e90
4 changed files with 19 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/hw/pvr/spg.cpp
View File

@ -80,11 +80,8 @@ int elapse_time(int tag, int cycl, int jit)
#endif
return min(max(Frame_Cycles,(u32)1*1000*1000),(u32)8*1000*1000);
}
#if HOST_OS==OS_WINDOWS
extern double speed_load_mspdf;
#else
double speed_load_mspdf;
#endif
int mips_counter;
@ -186,8 +183,8 @@ int spg_line_sched(int tag, int cycl, int jit)
mode,res,fullvbs,
spd_fps,fskip/ts);
#else
printf("%s/%c - %4.2f (%4.2f) - %4.2f - V: %4.2f (%.2f, %s%s%4.2f) R: %4.2f+%4.2f VTX: %4.2f%c, MIPS: %.2f\n",
VER_SHORTNAME,'n',mspdf,speed_load_mspdf,spd_cpu*100/200,spd_vbs,
printf("%s/%c - %4.2f - %4.2f - V: %4.2f (%.2f, %s%s%4.2f) R: %4.2f+%4.2f VTX: %4.2f%c, MIPS: %.2f\n",
VER_SHORTNAME,'n',mspdf,spd_cpu*100/200,spd_vbs,
spd_vbs/full_rps,mode,res,fullvbs,
spd_fps,fskip/ts
, mv, mv_c, mips_counter/ 1024.0 / 1024.0);

2
core/hw/sh4/dyna/driver.cpp
View File

@ -425,7 +425,7 @@ void recSh4_Init()
}
#if defined(_WIN64)
#ifdef _MSVC_VER
#ifdef _MSC_VER
for (int i = 10; i < 1300; i++) {

42
core/windows/winmain.cpp
View File

@ -433,46 +433,6 @@ void os_MakeExecutable(void* ptr, u32 sz)
VirtualProtect(ptr,sizeof(sz),PAGE_EXECUTE_READWRITE,&old);
}
u64 cycl_glob;
cResetEvent evt_hld(false,true);
double speed_load_mspdf;
extern double full_rps;
void os_consume(double t)
{
double cyc=t*190*1000*1000;
if ((cycl_glob+cyc)<10*1000*1000)
{
InterlockedExchangeAdd(&cycl_glob,cyc);
}
else
{
cycl_glob=10*1000*1000;
}
evt_hld.Set();
}
void* tick_th(void* p)
{
SetThreadPriority(GetCurrentThread(),THREAD_PRIORITY_TIME_CRITICAL);
double old=os_GetSeconds();
for(;;)
{
Sleep(4);
double newt=os_GetSeconds();
os_consume(newt-old);
old=newt;
}
}
cThread tick_thd(&tick_th,0);
void ReserveBottomMemory()
{
#if defined(_WIN64) && defined(_DEBUG)
@ -673,8 +633,6 @@ int CALLBACK WinMain(HINSTANCE hInstance,HINSTANCE hPrevInstance,LPSTR lpCmdLine
{
ReserveBottomMemory();
tick_thd.Start();
int argc=0;
wchar* cmd_line=GetCommandLineA();
wchar** argv=CommandLineToArgvA(cmd_line,&argc);

30
shell/reicast.vcxproj
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Fast|Win32">
@ -64,7 +64,7 @@
<ClCompile Include="..\core\deps\libwebsocket\server.c" />
<ClCompile Include="..\core\deps\libwebsocket\service.c" />
<ClCompile Include="..\core\deps\libwebsocket\sha-1.c" />
<ClCompile Include="..\core\deps\xbrz\xbrz.cpp" />
<ClCompile Include="..\core\deps\xbrz\xbrz.cpp" />
<ClCompile Include="..\core\deps\zlib\adler32.c" />
<ClCompile Include="..\core\deps\zlib\compress.c" />
<ClCompile Include="..\core\deps\zlib\crc32.c" />
@ -81,7 +81,7 @@
<ClCompile Include="..\core\hw\aica\aica_if.cpp" />
<ClCompile Include="..\core\hw\aica\aica_mem.cpp" />
<ClCompile Include="..\core\hw\aica\dsp.cpp" />
<ClCompile Include="..\core\hw\aica\dsp_interp.cpp" />
<ClCompile Include="..\core\hw\aica\dsp_interp.cpp" />
<ClCompile Include="..\core\hw\aica\sgc_if.cpp" />
<ClCompile Include="..\core\hw\arm7\arm7.cpp" />
<ClCompile Include="..\core\hw\arm7\arm_mem.cpp" />
@ -98,8 +98,8 @@
<ClCompile Include="..\core\hw\maple\maple_helper.cpp" />
<ClCompile Include="..\core\hw\maple\maple_if.cpp" />
<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\modem\modem.cpp" />
<ClCompile Include="..\core\hw\modem\picoppp.cpp" />
<ClCompile Include="..\core\hw\naomi\naomi.cpp" />
<ClCompile Include="..\core\hw\naomi\naomi_cart.cpp" />
<ClCompile Include="..\core\hw\pvr\drkPvr.cpp" />
@ -267,9 +267,9 @@
<ClInclude Include="..\core\hw\maple\maple_helper.h" />
<ClInclude Include="..\core\hw\maple\maple_if.h" />
<ClInclude Include="..\core\hw\mem\_vmem.h" />
<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\modem\modem.h" />
<ClInclude Include="..\core\hw\modem\modem_regs.h" />
<ClInclude Include="..\core\hw\modem\picoppp.h" />
<ClInclude Include="..\core\hw\naomi\naomi.h" />
<ClInclude Include="..\core\hw\naomi\naomi_cart.h" />
<ClInclude Include="..\core\hw\naomi\naomi_regs.h" />
@ -442,8 +442,8 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Full</Optimization>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;X86;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;X86;RELEASE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\core\;$(ProjectDir)..\core\khronos</AdditionalIncludeDirectories>
<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
@ -474,8 +474,8 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Full</Optimization>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;X86;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;X86;RELEASE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\core\;$(ProjectDir)..\core\khronos</AdditionalIncludeDirectories>
<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
@ -509,7 +509,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;X86;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\core\;$(ProjectDir)..\core\khronos</AdditionalIncludeDirectories>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
@ -530,7 +530,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;X86;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\core\;$(ProjectDir)..\core\khronos</AdditionalIncludeDirectories>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
@ -561,4 +561,4 @@
<ImportGroup Label="ExtensionTargets">
<Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
</ImportGroup>
</Project>
</Project>