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

use enum for cli arg exit and android build ndef

This commit is contained in:
David Miller 2018-08-21 12:19:38 -04:00 committed by Ender's Games
parent 3dc16faa73
commit 2e23ee4628
5 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/cfg/cl.cpp
View File

@ -9,7 +9,7 @@
#include <ctype.h>
#include <string.h>
#ifndef linux
#if !defined(linux) && !defined(_ANDROID)
#include <conio.h>
#endif

2
core/linux-dist/main.cpp
View File

@ -383,7 +383,7 @@ int main(int argc, wchar* argv[])
if(ParseCommandLine(argc,argv)) {
return 69;
return rv_cli_finish;
}
/* Set directories */

7
core/types.h
View File

@ -302,10 +302,11 @@ struct vram_block
enum ndc_error_codes
{
rv_ok = 0, //no error
rv_ok = 0, //no error
rv_cli_finish=69, //clean exit after -help or -version , should we just use rv_ok?
rv_error=-2, //error
rv_serror=-1, //silent error , it has been reported to the user
rv_error=-2, //error
rv_serror=-1, //silent error , it has been reported to the user
};
//Simple struct to store window rect ;)

2
core/windows/winmain.cpp
View File

@ -704,7 +704,7 @@ int CALLBACK WinMain(HINSTANCE hInstance,HINSTANCE hPrevInstance,LPSTR lpCmdLine
if(ParseCommandLine(argc,argv)) {
return 69;
return rv_cli_finish;
}
ReserveBottomMemory();

8
shell/reicast.vcxproj
View File

@ -469,7 +469,7 @@
<Command>for /f "delims=" %%i in ('git describe') do echo #define REICAST_VERSION "%%i" &gt;$(ProjectDir)\..\core\version.h</Command>
</PreBuildEvent>
<PreBuildEvent>
<Message>Setting Version git describe &gt;$(ProjectDir)\version.txt &amp;&amp; set r_ver=%%i &amp;&amp; </Message>
<Message>Setting Version # in header</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Fast|x64'">
@ -513,7 +513,7 @@
<Command>for /f "delims=" %%i in ('git describe') do echo #define REICAST_VERSION "%%i" &gt;$(ProjectDir)\..\core\version.h</Command>
</PreBuildEvent>
<PreBuildEvent>
<Message>Setting Version git describe &gt;$(ProjectDir)\version.txt &amp;&amp; set r_ver=%%i &amp;&amp; </Message>
<Message>Setting Version # in header</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Slow|Win32'">
@ -544,7 +544,7 @@
<Command>for /f "delims=" %%i in ('git describe') do echo #define REICAST_VERSION "%%i" &gt;$(ProjectDir)\..\core\version.h</Command>
</PreBuildEvent>
<PreBuildEvent>
<Message>Setting Version git describe &gt;$(ProjectDir)\version.txt &amp;&amp; set r_ver=%%i &amp;&amp; </Message>
<Message>Setting Version # in header</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Slow|x64'">
@ -580,7 +580,7 @@
<Command>for /f "delims=" %%i in ('git describe') do echo #define REICAST_VERSION "%%i" &gt;$(ProjectDir)\..\core\version.h</Command>
</PreBuildEvent>
<PreBuildEvent>
<Message>Setting Version git describe &gt;$(ProjectDir)\version.txt &amp;&amp; set r_ver=%%i &amp;&amp; </Message>
<Message>Setting Version # in header</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">