[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[824] trunk/fuse
Brought to you by:
fredm
Menu
▾
▴
[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[824] trunk/fuse
|
From: <fr...@us...> - 2016-09-30 12:06:55
|
Revision: 824
http://sourceforge.net/p/fuse-for-macosx/code/824
Author: fredm
Date: 2016-09-30 12:06:54 +0000 (Fri, 30 Sep 2016)
Log Message:
-----------
Compilation fixes for Xcode 8.
Modified Paths:
--------------
trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
trunk/fuse/ui/cocoa/cocoaui.m
Modified: trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
===================================================================
--- trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2016-08-23 04:28:56 UTC (rev 823)
+++ trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2016-09-30 12:06:54 UTC (rev 824)
@@ -274,6 +274,7 @@
B6DCBC97114FA67200DC9A11 /* snap_accessors.txt in Sources */ = {isa = PBXBuildFile; fileRef = B6DCBC16114FA1AF00DC9A11 /* snap_accessors.txt */; };
B6DDE53C0D67963600D6F905 /* ui.c in Sources */ = {isa = PBXBuildFile; fileRef = B6DDE53B0D67963600D6F905 /* ui.c */; };
B6E0252C0B38AFE500E23A0F /* keysyms.m in Sources */ = {isa = PBXBuildFile; fileRef = B6E0252B0B38AFE500E23A0F /* keysyms.m */; };
+ B6E0CBA41D9E809000426949 /* unittests.c in Sources */ = {isa = PBXBuildFile; fileRef = B6E0CBA21D9E809000426949 /* unittests.c */; };
B6E1F19C14F6527300600EB0 /* pzx_read.c in Sources */ = {isa = PBXBuildFile; fileRef = B6E1F19B14F6527300600EB0 /* pzx_read.c */; };
B6E1F19E14F6528A00600EB0 /* utilities.c in Sources */ = {isa = PBXBuildFile; fileRef = B6E1F19D14F6528A00600EB0 /* utilities.c */; };
B6E1F1A114F652E300600EB0 /* pokemem.c in Sources */ = {isa = PBXBuildFile; fileRef = B6E1F19F14F652E300600EB0 /* pokemem.c */; };
@@ -281,7 +282,6 @@
B6E1F1AB14F653FB00600EB0 /* speccyboot.c in Sources */ = {isa = PBXBuildFile; fileRef = B6E1F1A714F653FB00600EB0 /* speccyboot.c */; };
B6E1F1AD14F653FB00600EB0 /* specdrum.c in Sources */ = {isa = PBXBuildFile; fileRef = B6E1F1A914F653FB00600EB0 /* specdrum.c */; };
B6E1F1B114F6555400600EB0 /* disciple.c in Sources */ = {isa = PBXBuildFile; fileRef = B6E1F1AF14F6555400600EB0 /* disciple.c */; };
- B6E1F24414F7A14200600EB0 /* enc28j60.c in Sources */ = {isa = PBXBuildFile; fileRef = B6E1F24214F7A14200600EB0 /* enc28j60.c */; };
B6E1F26E14F85BD500600EB0 /* speccyboot-1.4.rom in Resources */ = {isa = PBXBuildFile; fileRef = B6E1F26D14F85BD500600EB0 /* speccyboot-1.4.rom */; };
B6F047F60952A6D6006D8005 /* tape_se.szx in CopyFiles */ = {isa = PBXBuildFile; fileRef = B6F047F20952A6BA006D8005 /* tape_se.szx */; };
B6F047F70952A6D6006D8005 /* tape_ts2068.szx in CopyFiles */ = {isa = PBXBuildFile; fileRef = B6F047F30952A6BA006D8005 /* tape_ts2068.szx */; };
@@ -700,6 +700,8 @@
B6DDE5280D64D96E00D6F905 /* pentagon.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = pentagon.h; sourceTree = "<group>"; };
B6DDE53B0D67963600D6F905 /* ui.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = ui.c; sourceTree = "<group>"; };
B6E0252B0B38AFE500E23A0F /* keysyms.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = keysyms.m; sourceTree = "<group>"; };
+ B6E0CBA21D9E809000426949 /* unittests.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = unittests.c; sourceTree = "<group>"; };
+ B6E0CBA31D9E809000426949 /* unittests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unittests.h; sourceTree = "<group>"; };
B6E1F19B14F6527300600EB0 /* pzx_read.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pzx_read.c; sourceTree = "<group>"; };
B6E1F19D14F6528A00600EB0 /* utilities.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = utilities.c; sourceTree = "<group>"; };
B6E1F19F14F652E300600EB0 /* pokemem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pokemem.c; sourceTree = "<group>"; };
@@ -712,8 +714,6 @@
B6E1F1AA14F653FB00600EB0 /* specdrum.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = specdrum.h; sourceTree = "<group>"; };
B6E1F1AF14F6555400600EB0 /* disciple.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = disciple.c; sourceTree = "<group>"; };
B6E1F1B014F6555400600EB0 /* disciple.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = disciple.h; sourceTree = "<group>"; };
- B6E1F24214F7A14200600EB0 /* enc28j60.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = enc28j60.c; sourceTree = "<group>"; };
- B6E1F24314F7A14200600EB0 /* enc28j60.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = enc28j60.h; sourceTree = "<group>"; };
B6E1F26D14F85BD500600EB0 /* speccyboot-1.4.rom */ = {isa = PBXFileReference; lastKnownFileType = file; name = "speccyboot-1.4.rom"; path = "../roms/speccyboot-1.4.rom"; sourceTree = "<group>"; };
B6E811F0084B5117008CF718 /* profile.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = profile.c; path = ../profile.c; sourceTree = SOURCE_ROOT; };
B6E811F1084B5117008CF718 /* profile.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = profile.h; path = ../profile.h; sourceTree = SOURCE_ROOT; };
@@ -902,17 +902,18 @@
29B97315FDCFA39411CA2CEA /* Other Sources */ = {
isa = PBXGroup;
children = (
- B6E1F19A14F6514000600EB0 /* peripherals */,
B6DCBB5D114FA0E700DC9A11 /* libspectrum */,
B63225E50C66B9D500BB081B /* compat */,
B68CB2BC03DD91D800A804BA /* debugger */,
F559859E038921E201A804BA /* fuse */,
B68C32931D3BBEE50082CBD4 /* infrastructure */,
B6AD8FE106221F7200C70D75 /* machines */,
+ B6E1F19A14F6514000600EB0 /* peripherals */,
B64586CE059BC02C00934482 /* pokefinder */,
B678E3E20608FAA600678A33 /* sound */,
B63225EF0C66BA4B00BB081B /* timer */,
F559859A038921CA01A804BA /* ui */,
+ B6E0CBA11D9E805900426949 /* unittests */,
F559859C038921D601A804BA /* z80 */,
F5598598038921C501A804BA /* config.h */,
);
@@ -1361,6 +1362,15 @@
name = "Content Arrays";
sourceTree = "<group>";
};
+ B6E0CBA11D9E805900426949 /* unittests */ = {
+ isa = PBXGroup;
+ children = (
+ B6E0CBA21D9E809000426949 /* unittests.c */,
+ B6E0CBA31D9E809000426949 /* unittests.h */,
+ );
+ path = unittests;
+ sourceTree = "<group>";
+ };
B6E1F19A14F6514000600EB0 /* peripherals */ = {
isa = PBXGroup;
children = (
@@ -1405,8 +1415,6 @@
B6E1F24114F7A11C00600EB0 /* nic */ = {
isa = PBXGroup;
children = (
- B6E1F24214F7A14200600EB0 /* enc28j60.c */,
- B6E1F24314F7A14200600EB0 /* enc28j60.h */,
B69BE53D1660E02500C5D0CE /* w5100_internals.h */,
B69BE53E1660E02500C5D0CE /* w5100_socket.c */,
B69BE53F1660E02500C5D0CE /* w5100.c */,
@@ -1807,6 +1815,7 @@
B61F469309121DF100C8096C /* profile.c in Sources */,
B61F469409121DF100C8096C /* ide.c in Sources */,
B6825549091817F30014B5EE /* divide.c in Sources */,
+ B6E0CBA41D9E809000426949 /* unittests.c in Sources */,
B6403FD80A7E4B1A00E00B11 /* loader.c in Sources */,
B6CE7F420B2830A300EB65B3 /* cocoajoystick.c in Sources */,
B6CE7FCE0B28FBD600EB65B3 /* DisplayOpenGLView.m in Sources */,
@@ -1898,7 +1907,6 @@
B6E1F1AB14F653FB00600EB0 /* speccyboot.c in Sources */,
B6E1F1AD14F653FB00600EB0 /* specdrum.c in Sources */,
B6E1F1B114F6555400600EB0 /* disciple.c in Sources */,
- B6E1F24414F7A14200600EB0 /* enc28j60.c in Sources */,
B61700F7163EAFC600142336 /* PokeMemoryController.m in Sources */,
B69BE5331660DF5300C5D0CE /* socket.c in Sources */,
B69BE5381660DF8B00C5D0CE /* movie.c in Sources */,
Modified: trunk/fuse/ui/cocoa/cocoaui.m
===================================================================
--- trunk/fuse/ui/cocoa/cocoaui.m 2016-08-23 04:28:56 UTC (rev 823)
+++ trunk/fuse/ui/cocoa/cocoaui.m 2016-09-30 12:06:54 UTC (rev 824)
@@ -155,3 +155,9 @@
withObject:nil
waitUntilDone:NO];
}
+
+int
+ui_get_rollback_point( GSList *points )
+{
+ return -1;
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
