Macintosh-Tools
/
macemu
mirror of https://github.com/kanjitalk755/macemu.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

timer symlink ??

This commit is contained in:
jvernet 2017-10-09 22:18:17 +02:00
parent d3fc193d66
commit e6808d6556
7 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BasiliskII/src/MacOSX/BasiliskII.xcodeproj/project.pbxproj
View File

@ -514,7 +514,8 @@
4ECAC2461F8A89FE0013B963 /* udp.h */,
4ECAC25C1F8A8A010013B963 /* VERSION */,
);
path = slirp;
name = slirp;
path = ../slirp;
sourceTree = "<group>";
};
752F26F71F240E51001032B4 /* Frameworks */ = {

2
BasiliskII/src/SDL/video_sdl.cpp
View File

@ -2228,7 +2228,7 @@ static int redraw_func(void *arg)
// Wait
next += VIDEO_REFRESH_DELAY;
int32 delay = int32(next - GetTicks_usec());
uint64 delay = int32(next - GetTicks_usec());
if (delay > 0)
Delay_usec(delay);
else if (delay < -VIDEO_REFRESH_DELAY)

2
BasiliskII/src/SDL/video_sdl2.cpp
View File

@ -2586,7 +2586,7 @@ static int redraw_func(void *arg)
// Wait
next += VIDEO_REFRESH_DELAY;
int32 delay = int32(next - GetTicks_usec());
uint64 delay = int32(next - GetTicks_usec());
if (delay > 0)
Delay_usec(delay);
else if (delay < -VIDEO_REFRESH_DELAY)

14
SheepShaver/src/MacOSX/SheepShaver_Xcode8.xcodeproj/project.pbxproj
View File

@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 44;
objectVersion = 47;
objects = {
/* Begin PBXBuildFile section */
@ -1015,7 +1015,7 @@
LastUpgradeCheck = 0820;
};
buildConfigurationList = 0856CCB114A99DE0000B1711 /* Build configuration list for PBXProject "SheepShaver_Xcode8" */;
compatibilityVersion = "Xcode 3.0";
compatibilityVersion = "Xcode 6.3";
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
@ -1288,7 +1288,6 @@
PREBINDING = NO;
PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
PRODUCT_NAME = lowmem;
SDKROOT = macosx;
};
name = Debug;
};
@ -1308,7 +1307,6 @@
PREBINDING = NO;
PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
PRODUCT_NAME = lowmem;
SDKROOT = macosx;
ZERO_LINK = NO;
};
name = Release;
@ -1431,8 +1429,8 @@
_REENTRANT,
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_WARN_UNUSED_FUNCTION = NO;
GCC_WARN_UNUSED_VARIABLE = NO;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
"$(BUILT_PRODUCTS_DIR)/SDL2.framework/Headers",
./config/,
@ -1489,8 +1487,8 @@
_REENTRANT,
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_WARN_UNUSED_FUNCTION = NO;
GCC_WARN_UNUSED_VARIABLE = NO;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
"$(BUILT_PRODUCTS_DIR)/SDL2.framework/Headers",
./config/,

2
SheepShaver/src/Unix/sysdeps.h
View File

@ -429,7 +429,7 @@ typedef struct timeval tm_time_t;
// Timing functions
extern uint64 GetTicks_usec(void);
extern void Delay_usec(uint32 usec);
extern void Delay_usec(uint64 usec);
#ifdef HAVE_PTHREADS
// Setup pthread attributes

1
SheepShaver/src/Unix/timer_unix.cpp
View File

@ -1 +0,0 @@
../../../BasiliskII/src/Unix/timer_unix.cpp

1
SheepShaver/src/adb.cpp
View File

@ -1 +0,0 @@
../../BasiliskII/src/adb.cpp