libretro/NP2kai
1
0
Fork 0
mirror of https://github.com/libretro/NP2kai.git synced 2024-10-07 14:53:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #72 from libretro/master

Browse Source 
Push(Pull) to my repo
This commit is contained in:
AZO 2019-08-16 22:55:18 +09:00 committed by GitHub
commit 9c74ba152c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pccore.c
View File

@ -731,13 +731,7 @@ void pccore_reset(void) {
}
#elif defined(NP2_X11) || defined(__LIBRETRO__)
{
<<<<<<< HEAD
asynccpu_lastclock = asynccpu_clockcount = (UINT64)clock();
=======
struct timespec t;
clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &t);
asynccpu_lastclock = asynccpu_clockcount = (UINT64)t.tv_sec * 1000000000 + t.tv_nsec;
>>>>>>> 6d2b0a232f47d9f3f0fff3496e1ec2a606564962
asynccpu_clockpersec = CLOCKS_PER_SEC;
}
#elif defined(NP2_SDL2)

4
sdl2/Makefile.libretro
View File

@ -114,9 +114,9 @@ else ifneq (,$(findstring ios,$(platform)))
ifeq ($(IOSSDK),)
IOSSDK := $(shell xcodebuild -version -sdk iphoneos Path)
endif
ifeq ($(platform),"ios-arm64")
ifeq ($(platform), ios-arm64)
CC = cc -arch arm64 -isysroot $(IOSSDK)
CCX = c++ -arch arm64 -isysroot $(IOSSDK) -stdlib=libc++
CXX = c++ -arch arm64 -isysroot $(IOSSDK) -stdlib=libc++
LDFLAGS = -stdlib=libc++
else
CC = cc -arch armv7 -isysroot $(IOSSDK)