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

missing changes

This commit is contained in:
flyinghead 2021-11-19 23:29:35 +01:00
parent 8262c9ece7
commit e12912450c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -1367,6 +1367,7 @@ if(NOT LIBRETRO)
${ResourceFiles} ${ResourceFiles}
core/deps/SDL/src/main/winrt/SDL_winrt_main_NonXAML.cpp) core/deps/SDL/src/main/winrt/SDL_winrt_main_NonXAML.cpp)
set_target_properties(${PROJECT_NAME} PROPERTIES RESOURCE "${ResourceFiles}") set_target_properties(${PROJECT_NAME} PROPERTIES RESOURCE "${ResourceFiles}")
else()
target_sources(${PROJECT_NAME} PRIVATE shell/windows/flycast.rc) target_sources(${PROJECT_NAME} PRIVATE shell/windows/flycast.rc)
target_link_libraries(${PROJECT_NAME} PRIVATE dsound opengl32 winmm ws2_32 wsock32 xinput9_1_0) target_link_libraries(${PROJECT_NAME} PRIVATE dsound opengl32 winmm ws2_32 wsock32 xinput9_1_0)
endif() endif()

6
core/deps/ggpo/lib/ggpo/platform_linux.cpp
View File

@ -11,7 +11,7 @@
#include <strings.h> #include <strings.h>
#include <chrono> #include <chrono>
uint32_t Platform::GetCurrentTimeMS() uint32_t GGPOPlatform::GetCurrentTimeMS()
{ {
using namespace std::chrono; using namespace std::chrono;
static steady_clock::time_point startTime = steady_clock::now(); static steady_clock::time_point startTime = steady_clock::now();
@ -19,7 +19,7 @@ uint32_t Platform::GetCurrentTimeMS()
return (uint32_t)duration_cast<milliseconds>(steady_clock::now() - startTime).count(); return (uint32_t)duration_cast<milliseconds>(steady_clock::now() - startTime).count();
} }
int Platform::GetConfigInt(const char* name) int GGPOPlatform::GetConfigInt(const char* name)
{ {
char *buf = getenv(name); char *buf = getenv(name);
if (buf == nullptr) if (buf == nullptr)
@ -27,7 +27,7 @@ int Platform::GetConfigInt(const char* name)
return atoi(buf); return atoi(buf);
} }
bool Platform::GetConfigBool(const char* name) bool GGPOPlatform::GetConfigBool(const char* name)
{ {
char *buf = getenv(name); char *buf = getenv(name);
if (buf == nullptr) if (buf == nullptr)