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

getchar for non win32, so curses isn't req to be setup

This commit is contained in:
David Miller 2018-08-21 12:51:52 -04:00 committed by Ender's Games
parent 2e23ee4628
commit 1722a9abe4
2 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
core/cfg/cl.cpp
View File

@ -9,10 +9,6 @@
#include <ctype.h>
#include <string.h>
#if !defined(linux) && !defined(_ANDROID)
#include <conio.h>
#endif
#include "cfg/cfg.h"
wchar* trim_ws(wchar* str)
@ -103,6 +99,37 @@ int setconfig(wchar** arg,int cl)
return rv;
}
#ifndef _ANDROID
#include "version.h"
#else
#define REICAST_VERSION "r7-android-tmp"
#endif
#if !defined(DEF_CONSOLE)
#if defined(linux) || defined(_ANDROID)
#define DEF_CONSOLE
#elif defined(_WIN32)
#include <conio.h>
#endif
#endif
void cli_pause()
{
#ifdef DEF_CONSOLE
return;
#endif
#if defined(_WIN32)
printf("\nPress a key to exit.\n");
getch();
#else
printf("\nPress enter to exit.\n");
char c = getchar();
#endif
}
int showhelp(wchar** arg,int cl)
{
printf("\nAvailable commands :\n");
@ -111,25 +138,16 @@ int showhelp(wchar** arg,int cl)
printf("\n-help: show help info\n");
printf("\n-version: show current version #\n\n");
#if !defined(DEF_CONSOLE) && !defined(linux)
getch();
#endif
cli_pause();
return 0;
}
#ifndef _ANDROID
#include "version.h"
#else
#define REICAST_VERSION "r7-android-tmp"
#endif
int showversion(wchar** arg,int cl)
{
printf("\nReicast Version: # %s built on %s \n", REICAST_VERSION, __DATE__);
#if !defined(DEF_CONSOLE) && !defined(linux)
getch();
#endif
cli_pause();
return 0;
}

4
shell/reicast.vcxproj
View File

@ -436,7 +436,7 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Full</Optimization>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;X86;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>TARGET_NO_WEBUI;WIN32;NDEBUG;_CONSOLE;X86;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
@ -553,7 +553,7 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>TARGET_NO_WEBUI;WIN32;_DEBUG;_CONSOLE;X86;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>DEF_CONSOLE;TARGET_NO_WEBUI;WIN32;_DEBUG;_CONSOLE;X86;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild>