Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-01-17 22:55:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(Windows) Fixed the broken build for this OS.

Browse source 
Also some other minor cosmetic code changes.
This commit is contained in:
Leon Styhre 2020-08-23 21:27:01 +02:00
parent b7678007fa
commit 46ab60ad4e
3 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
es-app/CMakeLists.txt
View file

@ -119,7 +119,7 @@ endif()
# Setup for installation and package generation.
if(WIN32)
install(TARGETS emulationstation RUNTIME DESTINATION .)
install(TARGETS EmulationStation RUNTIME DESTINATION .)
install(FILES ../FreeImage.dll ../libcrypto-1_1-x64.dll ../libcurl-x64.dll ../libfreetype.dll
../libgcc_s_seh-1.dll ../libpugixml.dll ../libssl-1_1-x64.dll ../libstdc++-6.dll
../libvlc.dll ../libvlccore.dll ../libwinpthread-1.dll ../SDL2.dll DESTINATION .)

22
es-app/src/main.cpp
View file

@ -49,13 +49,13 @@
bool forceInputConfig = false;
enum returnCode {
NO_ERROR,
NO_LOADING_ERROR,
NO_SYSTEMS_FILE,
NO_ROMS
};
#if defined(_WIN64)
enum eConsoleType {
enum win64ConsoleType {
NO_CONSOLE,
PARENT_CONSOLE,
ALLOCATED_CONSOLE
@ -70,11 +70,11 @@ enum eConsoleType {
// console type and PowerShell behaves quite strange. Still, it works well enough to be
// somewhat usable, at least for the moment. If the allocConsole argument is set to true
// and there is no console available, a new console window will be spawned.
eConsoleType outputToConsole(bool allocConsole)
win64ConsoleType outputToConsole(bool allocConsole)
{
HANDLE outputHandle = nullptr;
HWND consoleWindow = nullptr;
eConsoleType ConsoleType = NO_CONSOLE;
win64ConsoleType consoleType = NO_CONSOLE;
// Try to attach to a parent console process.
if (AttachConsole(ATTACH_PARENT_PROCESS))
@ -83,18 +83,18 @@ eConsoleType outputToConsole(bool allocConsole)
// If there is a parent console process, then attempt to retrieve its handle.
if (outputHandle != INVALID_HANDLE_VALUE && outputHandle != nullptr) {
consoleWindow = GetConsoleWindow();
ConsoleType = PARENT_CONSOLE;
consoleType = PARENT_CONSOLE;
}
// If we couldn't retrieve the handle, it means we need to allocate a new console window.
if (!consoleWindow && allocConsole) {
AllocConsole();
ConsoleType = ALLOCATED_CONSOLE;
consoleType = ALLOCATED_CONSOLE;
}
// If we are attached to the parent console or we have opened a new console window,
// then redirect stdin, stdout and stderr accordingly.
if (ConsoleType == PARENT_CONSOLE || ConsoleType == ALLOCATED_CONSOLE) {
if (consoleType == PARENT_CONSOLE || consoleType == ALLOCATED_CONSOLE) {
FILE* fp = nullptr;
freopen_s(&fp, "CONIN$", "rb", stdin);
@ -117,7 +117,7 @@ eConsoleType outputToConsole(bool allocConsole)
std::cout << "\n";
}
return ConsoleType;
return consoleType;
}
void closeConsole()
@ -140,7 +140,7 @@ bool parseArgs(int argc, char* argv[])
#if defined(_WIN64)
// Print any command line output to the console.
if (argc > 1)
eConsoleType ConsoleType = outputToConsole(false);
win64ConsoleType consoleType = outputToConsole(false);
#endif
// We need to process --home before any call to Settings::getInstance(),
@ -353,7 +353,7 @@ bool verifyHomeFolderExists()
return true;
}
// Returns NO_ERRORS if everything is OK.
// Returns NO_LOADING_ERROR if everything is OK.
// Otherwise returns either NO_SYSTEMS_FILE or NO_ROMS.
returnCode loadSystemConfigFile(std::string& errorMsg)
{
@ -387,7 +387,7 @@ returnCode loadSystemConfigFile(std::string& errorMsg)
return NO_ROMS;
}
return NO_ERROR;
return NO_LOADING_ERROR;
}
// Called on exit, assuming we get far enough to have the log initialized.

4
es-app/src/views/SystemView.cpp
View file

@ -16,6 +16,10 @@
#include "SystemData.h"
#include "Window.h"
#if defined(_WIN64)
#include <cmath>
#endif
// Buffer values for scrolling velocity (left, stopped, right).
const int logoBuffersLeft[] = { -5, -2, -1 };
const int logoBuffersRight[] = { 1, 2, 5 };