fuse-for-macosx-commits Mailing List for Fuse for macOS (Page 2)
Brought to you by:
fredm
Menu
▾
▴
fuse-for-macosx-commits — Tracks commits to the repostiory
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(9) |
Dec
(31) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(24) |
Feb
(11) |
Mar
(6) |
Apr
(48) |
May
(9) |
Jun
(38) |
Jul
(33) |
Aug
(15) |
Sep
|
Oct
(3) |
Nov
(6) |
Dec
(3) |
| 2008 |
Jan
|
Feb
(24) |
Mar
(11) |
Apr
(22) |
May
(7) |
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
(3) |
Nov
(18) |
Dec
(23) |
| 2009 |
Jan
(16) |
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
(7) |
Jul
(4) |
Aug
(11) |
Sep
(9) |
Oct
|
Nov
(3) |
Dec
(2) |
| 2010 |
Jan
(1) |
Feb
|
Mar
(1) |
Apr
(2) |
May
(8) |
Jun
|
Jul
|
Aug
(2) |
Sep
(2) |
Oct
(9) |
Nov
|
Dec
(8) |
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
(7) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(5) |
Nov
(2) |
Dec
|
| 2012 |
Jan
(4) |
Feb
(5) |
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
(10) |
Nov
(13) |
Dec
(11) |
| 2013 |
Jan
(4) |
Feb
(1) |
Mar
(8) |
Apr
(8) |
May
(16) |
Jun
(5) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(4) |
| 2014 |
Jan
|
Feb
(6) |
Mar
(2) |
Apr
(1) |
May
|
Jun
|
Jul
(1) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
(6) |
| 2015 |
Jan
|
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
(5) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
(10) |
Jun
(9) |
Jul
(6) |
Aug
(5) |
Sep
(3) |
Oct
(6) |
Nov
(5) |
Dec
|
|
From: <fr...@us...> - 2016-06-18 13:46:21
|
Revision: 812
http://sourceforge.net/p/fuse-for-macosx/code/812
Author: fredm
Date: 2016-06-18 13:46:18 +0000 (Sat, 18 Jun 2016)
Log Message:
-----------
Fix writing disks (thanks, Tom Collier).
Modified Paths:
--------------
trunk/fuse/fusepb/controllers/FuseController.m
trunk/fuse/uimedia.c
Modified: trunk/fuse/fusepb/controllers/FuseController.m
===================================================================
--- trunk/fuse/fusepb/controllers/FuseController.m 2016-06-08 11:16:43 UTC (rev 811)
+++ trunk/fuse/fusepb/controllers/FuseController.m 2016-06-18 13:46:18 UTC (rev 812)
@@ -2441,6 +2441,10 @@
/* We will be calling this from the Emulator thread */
err = ui_media_drive_save_with_filename( drive_info, filename );
+ /* If we had a filename already it will only have been here - use the filename
+ we have used to write the file */
+ filename = drive_info->fdd->disk.filename;
+
[self addRecentSnapshotWithString:@(filename)];
if( saveas == YES ) free( filename );
Modified: trunk/fuse/uimedia.c
===================================================================
--- trunk/fuse/uimedia.c 2016-06-08 11:16:43 UTC (rev 811)
+++ trunk/fuse/uimedia.c 2016-06-18 13:46:18 UTC (rev 812)
@@ -225,12 +225,7 @@
int
ui_media_drive_save( int which, int saveas )
{
- ui_media_drive_info_t *drive;
-
- drive = ui_media_drive_find( which );
- if( !drive )
- return -1;
- return ui_disk_write( drive, saveas );
+ return ui_disk_write( which, saveas );
}
static int
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2016-06-08 11:16:45
|
Revision: 811
http://sourceforge.net/p/fuse-for-macosx/code/811
Author: fredm
Date: 2016-06-08 11:16:43 +0000 (Wed, 08 Jun 2016)
Log Message:
-----------
Tag release 1.2.0
Added Paths:
-----------
tags/Release-1_2_0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2016-06-08 11:14:04
|
Revision: 810
http://sourceforge.net/p/fuse-for-macosx/code/810
Author: fredm
Date: 2016-06-08 11:14:02 +0000 (Wed, 08 Jun 2016)
Log Message:
-----------
Add references to where to place the Didaktik 80 and ?\194?\181Source ROMs to allow the
interfaces to work.
Modified Paths:
--------------
trunk/fuse/fusepb/resources/Fuse Help/html/didaktik80.html
trunk/fuse/fusepb/resources/Fuse Help/html/peripherals.html
Modified: trunk/fuse/fusepb/resources/Fuse Help/html/didaktik80.html
===================================================================
--- trunk/fuse/fusepb/resources/Fuse Help/html/didaktik80.html 2016-06-07 13:12:34 UTC (rev 809)
+++ trunk/fuse/fusepb/resources/Fuse Help/html/didaktik80.html 2016-06-08 11:14:02 UTC (rev 810)
@@ -1,31 +1,41 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
- <head>
- <meta http-equiv="content-type" content="text/html;
- charset=ISO-8859-1">
- <!-- AppleSegStart="Didaktik 80 Emulation" -->
- <title>Didaktik 80 Emulation</title>
- </head>
- <body>
- <font face="Lucida Grande,Helvetica,Arial"><a name="+D EMULATION"></a><!-- AppleSegDescription="This section describes the Didaktik 80 interface emulation in Fuse." --></font>
- <div class="refsect1" xml:lang="en" lang="en">
- <h2><font face="Lucida Grande,Helvetica,Arial">Didaktik 80 Emulation</font></h2>
- </div>
- <p> <font face="Lucida Grande,Helvetica,Arial">
- Fuse supports Didaktik 80 (and Didaktik 40) emulation. It emulates
- the original version of the Didaktik 80, running MDOS 1 and with a
- WD2797 floppy controller.</font></p>
- <p><font face="Lucida Grande,Helvetica,Arial">See the </font><font face="Lucida
- Grande,Helvetica,Arial"><font face="Lucida
- Grande,Helvetica,Arial"><span class="emphasis"><em><font
- face="Lucida Grande,Helvetica,Arial"><a
- href="formats.html">Disk File Formats</a></font></em></span></font>
- section for more details on supported disk file formats.</font>
- </p>
- <p><font face="Lucida Grande,Helvetica,Arial"> The Didaktik 80 may only be used with 16K, 48K and TC2048 emulation.</p>
- <p><font face="Lucida Grande,Helvetica,Arial">
- To press the Didaktik 80's `SNAP' button, choose the Machine > Didaktik
- SNAP menu option.</font></p>
- <!-- AppleSegEnd -->
- </body>
+ <head>
+ <meta http-equiv="content-type" content="text/html;
+ charset=windows-1252">
+ <!-- AppleSegStart="Didaktik 80 Emulation" -->
+ <title>Didaktik 80 Emulation</title>
+ </head>
+ <body>
+ <font face="Lucida Grande,Helvetica,Arial"><a name="+D EMULATION"></a><!-- AppleSegDescription="This section describes the Didaktik 80 interface emulation in Fuse." --></font>
+ <div class="refsect1" xml:lang="en" lang="en">
+ <h2><font face="Lucida Grande,Helvetica,Arial">Didaktik 80
+ Emulation</font></h2>
+ </div>
+ <p> <font face="Lucida Grande,Helvetica,Arial"> Fuse supports
+ Didaktik 80 (and Didaktik 40) emulation. It emulates the
+ original version of the Didaktik 80, running MDOS 1 and with a
+ WD2797 floppy controller.<br>
+ </font></p>
+ <p><font face="Lucida Grande,Helvetica,Arial">The ROM file is not
+ supplied with Fuse for Mac OS X and so must be installed before
+ the interface can be used. The expected file is a 14KB dump of
+ the Didaktik 40/80 MDOS 1 ROM named didaktik80.rom and placed in
+ the Fuse packages Contents/Resources directory.<br>
+ </font></p>
+ <p><font face="Lucida Grande,Helvetica,Arial">See the </font><font
+ face="Lucida Grande,Helvetica,Arial"><font face="Lucida
+ Grande,Helvetica,Arial"><span class="emphasis"><em><font
+ face="Lucida Grande,Helvetica,Arial"><a
+ href="formats.html">Disk File Formats</a></font></em></span></font>
+ section for more details on supported disk file formats.</font>
+ </p>
+ <p><font face="Lucida Grande,Helvetica,Arial"> The Didaktik 80 may
+ only be used with 16K, 48K and TC2048 emulation.</font></p>
+ <font face="Lucida Grande,Helvetica,Arial">
+ <p><font face="Lucida Grande,Helvetica,Arial"> To press the
+ Didaktik 80's `SNAP' button, choose the Machine > Didaktik
+ SNAP menu option.</font></p>
+ <!-- AppleSegEnd --> </font>
+ </body>
</html>
Modified: trunk/fuse/fusepb/resources/Fuse Help/html/peripherals.html
===================================================================
--- trunk/fuse/fusepb/resources/Fuse Help/html/peripherals.html 2016-06-07 13:12:34 UTC (rev 809)
+++ trunk/fuse/fusepb/resources/Fuse Help/html/peripherals.html 2016-06-08 11:14:02 UTC (rev 810)
@@ -160,6 +160,7 @@
+
Emulation</em></span></a> section for more details.</font></td>
</tr>
<tr>
@@ -171,8 +172,8 @@
Grande,Helvetica,Arial">If this option is selected, Fuse
will emulate the Didaktik 80 (or Didaktik 40)
interface. See the <a href="didaktik80.html"><span
- class="emphasis"><em>Didaktik 80
- Emulation</em></span></a> section for more details.<br>
+ class="emphasis"><em>Didaktik 80 Emulation</em></span></a>
+ section for more details.<br>
</font></td>
</tr>
<tr>
@@ -184,8 +185,13 @@
will emulate a Currah \xB5Source interface. See the World of
Spectrum Infoseek web page at <a
href="http://www.worldofspectrum.org/infoseekid.cgi?id=1000080">http://www.worldofspectrum.org/infoseekid.cgi?id=1000080</a>
- for the manual.<br>
- </font></td>
+ for the manual. </font><br>
+ <font face="Lucida Grande,Helvetica,Arial">The required ROM
+ file is not supplied with Fuse for Mac OS X and so must be
+ installed before the interface can be used. The expected
+ file is an 8KB dump of the interface ROM named usource.rom
+ and placed in the Fuse packages Contents/Resources
+ directory.</font></td>
</tr>
</tbody>
</table>
@@ -321,6 +327,7 @@
+
Emulation</em></span></a></font><font face="Lucida
Grande,Helvetica,Arial"><a href="spectranet.html"><span
class="emphasis"><em></em></span></a></font><font
@@ -517,6 +524,7 @@
+
of Spectrum Infoseek web page</a> for manuals, software
and more. This emulation is only available for<br>
the 48k, 128k and TC2048 machines.</font></td>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2016-06-07 13:12:36
|
Revision: 809
http://sourceforge.net/p/fuse-for-macosx/code/809
Author: fredm
Date: 2016-06-07 13:12:34 +0000 (Tue, 07 Jun 2016)
Log Message:
-----------
Update required OS X version
Modified Paths:
--------------
trunk/README
Modified: trunk/README
===================================================================
--- trunk/README 2016-06-07 13:00:57 UTC (rev 808)
+++ trunk/README 2016-06-07 13:12:34 UTC (rev 809)
@@ -3,7 +3,7 @@
This is the source distribution of the Mac OS X version of Fuse. Full source is
included for fuse and libspectrum.
-Your Mac is expected to be running OS X 10.6 with the Xcode development
+Your Mac is expected to be running OS X 10.11 with the Xcode development
environment.
Full build instructions:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2016-06-07 13:01:00
|
Revision: 808
http://sourceforge.net/p/fuse-for-macosx/code/808
Author: fredm
Date: 2016-06-07 13:00:57 +0000 (Tue, 07 Jun 2016)
Log Message:
-----------
Update helpindex for 1.2.0
Modified Paths:
--------------
trunk/fuse/fusepb/resources/Fuse Help/Fuse Help.helpindex
Modified: trunk/fuse/fusepb/resources/Fuse Help/Fuse Help.helpindex
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2016-06-07 12:51:55
|
Revision: 807
http://sourceforge.net/p/fuse-for-macosx/code/807
Author: fredm
Date: 2016-06-07 12:51:52 +0000 (Tue, 07 Jun 2016)
Log Message:
-----------
Merge up to vendor release 1.2.0 (r5597).
Revision Links:
--------------
http://sourceforge.net/p/fuse-for-macosx/code/5597
Modified Paths:
--------------
trunk/fuse/AUTHORS
trunk/fuse/ChangeLog
trunk/fuse/Makefile.am
trunk/fuse/README
trunk/fuse/configure.ac
trunk/fuse/data/shell-completion/bash/fuse
trunk/fuse/debugger/commandl.l
trunk/fuse/debugger/commandy.y
trunk/fuse/debugger/event.c
trunk/fuse/debugger/expression.c
trunk/fuse/fuse.c
trunk/fuse/fusepb/English.lproj/InfoPlist.strings
trunk/fuse/fusepb/Info-Fuse.plist
trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html
trunk/fuse/fusepb/resources/Fuse Help/html/monitor.html
trunk/fuse/hacking/ChangeLog
trunk/fuse/lib/Makefile.am
trunk/fuse/man/fuse.1
trunk/fuse/menu.c
trunk/fuse/rzx.c
trunk/fuse/svg.c
trunk/fuse/tape.c
trunk/fuse/ui/fb/Makefile.am
trunk/fuse/ui/gtk/Makefile.am
trunk/fuse/ui/sdl/Makefile.am
trunk/fuse/ui/svga/Makefile.am
trunk/fuse/ui/widget/Makefile.am
trunk/fuse/ui/wii/Makefile.am
trunk/fuse/ui/win32/Makefile.am
trunk/fuse/ui/xlib/Makefile.am
trunk/fuse/z80/Makefile.am
trunk/fuse/z80/z80.c
trunk/libspectrum/Info.plist
trunk/libspectrum/libspectrum/ChangeLog
trunk/libspectrum/libspectrum/README
trunk/libspectrum/libspectrum/configure.ac
trunk/libspectrum/libspectrum/doc/libspectrum.3
trunk/libspectrum/libspectrum/doc/libspectrum.txt
trunk/libspectrum/libspectrum/hacking/ChangeLog
trunk/libspectrum/libspectrum.h
trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj
Property Changed:
----------------
trunk/fuse/
trunk/libspectrum/libspectrum/
Index: trunk/fuse
===================================================================
--- trunk/fuse 2016-06-06 13:23:36 UTC (rev 806)
+++ trunk/fuse 2016-06-07 12:51:52 UTC (rev 807)
Property changes on: trunk/fuse
___________________________________________________________________
Modified: svn:mergeinfo
## -1,5 +1,5 ##
/vendor/fuse-emulator/0.10.0/fuse:556-557
/vendor/fuse-emulator/0.10.0-pre1/fuse:545-546
-/vendor/fuse-emulator/current/fuse:530-803
+/vendor/fuse-emulator/current/fuse:530-806
/vendor/fuse-emulator/fuse-1.0.0a/fuse:668-669
/vendor/fuse-emulator/fuse-r4617/fuse:686
\ No newline at end of property
Modified: trunk/fuse/AUTHORS
===================================================================
--- trunk/fuse/AUTHORS 2016-06-06 13:23:36 UTC (rev 806)
+++ trunk/fuse/AUTHORS 2016-06-07 12:51:52 UTC (rev 807)
@@ -42,7 +42,7 @@
* Garry Lancaster: the simple 8-bit IDE, ZXATASP and ZXCF support.
* Gergely Szasz: +3, +D, Opus, Didaktik 80 and Interface 1/Microdrive emulation,
- the 'movie' code and the ALSO and ao sound drivers.
+ the 'movie' code and the ALSA and ao sound drivers.
* Bjoern Giesler: the original Wii port.
@@ -54,4 +54,4 @@
* Philip Kendall: everything else.
-$Id: AUTHORS 5357 2016-02-23 23:43:54Z sbaldovi $
+$Id: AUTHORS 5569 2016-06-01 11:12:38Z fredm $
Modified: trunk/fuse/ChangeLog
===================================================================
--- trunk/fuse/ChangeLog 2016-06-06 13:23:36 UTC (rev 806)
+++ trunk/fuse/ChangeLog 2016-06-07 12:51:52 UTC (rev 807)
@@ -1,4 +1,4 @@
-2016-??-?? Philip Kendall <phi...@sh...>
+2016-06-06 Philip Kendall <phi...@sh...>
* Fuse 1.2.0 released.
@@ -12,46 +12,51 @@
* Allow continuing RZX recordings if there is a final snapshot in the
RZX (Sergio Baldoví).
* Fix the prune function on RZX rollback (Sergio Baldoví).
+ * Use SZX format for the initial snapshot in RZX files (Sergio
+ Baldoví).
* Fix loading of EDSK files with Sector Offset block (Sergio Baldoví).
- * Fix speech in Cobra's Arc - Medium Case.tzx when loaded with tape
- traps enabled (thanks, zx81 and Sergio Baldoví) (Fredrick Meunier).
* Migrate disk "index event" handling to the FDD layer and have the
FDC layer use it for their STATUS registers (Gergely Szasz).
- * Set AF, AF' and SP to 0xffff on reset (Stuart Brady).
- * Leave most registers unchanged on a soft reset (Stuart Brady).
- * Emulate interrupt and NMI timings more precisely (Stuart Brady).
- * Emulate NMOS and CMOS Z80 variants (Stuart Brady).
- * Switch to 2KB page size (Stuart Brady).
* Implement WD2797 emulation (Gergely Szasz).
- * Skip tape traps if VERIFY is requested (UB880D).
- * Fix inaccurate output when AY envelopes are used (Matthew Westcott
- and Fredrick Meunier)
- * Fix some peripherals activation when loading snapshots (Sergio
- Baldoví).
- * Fix loading sound with some custom loaders (Fredrick Meunier).
* Centralise the "Disk icon" update code to the FDD layer (Gergely
Szasz).
- * Check if data blocks are headers for handling PZX files (Fredrick
- Meunier).
- * Correct display of pulses in PZX pulse block for tape browser
- (Fredrick Meunier).
* Fix disk image corruption after saving UDI files (Sergio Baldoví).
* Check ready status after loading a disk into floppy disk drive
(thanks, John Elliott) (Sergio Baldoví).
* Fix overlapped SEEK commands (Sergio Baldoví).
* Fix length of data returned by READ_DIAG (thanks, Fredrick Meunier)
(Sergio Baldoví).
+ * Fix writing .td0 format disk files (Sergio Baldoví).
+ * Fix speech in Cobra's Arc - Medium Case.tzx when loaded with tape
+ traps enabled (thanks, zx81 and Sergio Baldoví) (Fredrick Meunier).
+ * Skip tape traps if VERIFY is requested (UB880D).
+ * Fix loading sound with some custom loaders (Fredrick Meunier).
+ * Check if data blocks are headers for handling PZX files (Fredrick
+ Meunier).
+ * Correct display of pulses in PZX pulse block for tape browser
+ (Fredrick Meunier).
+ * Set AF, AF' and SP to 0xffff on reset (Stuart Brady).
+ * Leave most registers unchanged on a soft reset (Stuart Brady).
+ * Emulate interrupt and NMI timings more precisely (Stuart Brady).
+ * Emulate NMOS and CMOS Z80 variants (Stuart Brady).
+ * Switch to 2KB page size (Stuart Brady).
+ * Fix inaccurate output when AY envelopes are used (Matthew Westcott
+ and Fredrick Meunier).
+ * Fix some peripherals activation when loading snapshots (Sergio
+ Baldoví).
* Machine specific improvements:
- * The Timex SCLD is contended in all of the home, Dock and Exrom banks
- in the 0x4000 - 0x7FFF range (thanks, rga24 from WoS) (Fredrick
- Meunier).
+ * The address range 0x4000 - 0x7FFF is contended on the TS2068 in the
+ home, Dock and Exrom banks (thanks, Richard Atkinson). It is assumed
+ that this is the same for other Timex models (Fredrick Meunier).
* Clear all Opus RAM on hard reset (Stuart Brady).
* Ensure the ZX Printer does not require a hard reset to enable
(thanks, RMartins) (Fredrick Meunier).
* Fix timing of events when emulating Scorpion (Stuart Brady).
* Ensure we have successfully selected a Pentagon or a Timex machine
before inserting their media (Fredrick Meunier).
+ * Prefer Scorpion to Pentagon when loading SCL/TRD disks for better
+ timing compatibility (thanks, windale) (Sergio Baldoví).
* Fix Beta 128 type II commands (thanks, windale and BogDan Vatra)
(Sergio Baldoví).
* Don't enable the Beta 128 interface when loading a snapshot on a
@@ -61,10 +66,7 @@
Meunier).
* Spectranet: fix segfault in error handling when setting SO_REUSEADDR
(Stuart Brady).
- * Prefer Scorpion to Pentagon when loading SCL/TRD disks for better
- timing compatibility (part of feature request #90) (thanks, windale)
- (Sergio Baldoví).
- * Update SE ROMs to v4.07 (thanks, Andrew Owen) (Sergio Baldoví).
+ * Update SE ROMs to v4.07 (thanks, Andrew Owen) (Sergio Baldoví).
* Debugger improvements:
* Fix disassembly of LD (HL), LD (IX) and LD (IY) (BogDan Vatra).
@@ -75,7 +77,6 @@
Baldoví).
* Timex EXROM and Dock text was truncated in the debugger UI (thanks,
Andrew Owen and Sergio Baldoví) (Fredrick Meunier).
- * Don't trap on breakpoints whilst halted (Stuart Brady).
* Win32: relocate halted flag and set monospaced font (Sergio
Baldoví).
* Fix memory issues when removing a matched breakpoint (Tom Seddon).
@@ -85,6 +86,11 @@
* Fix documentation of address syntax used in debugger section
(Sergio Baldoví).
* Allow debugger to dereference memory locations (Philip Kendall).
+ * Allow strings with escaped spaces in the debugger (Sergio Baldoví).
+ * Make wildcard event breakpoints work (thanks, Sergio Baldoví)
+ (Philip Kendall).
+ * Protect divide expression from a divide by zero exception (Fredrick
+ Meunier).
* Miscellaneous improvements:
* Remove warnings in aosound (Rene Ladan).
@@ -107,7 +113,7 @@
* Link to autoload snapshot for NTSC Spectrum (Sergio Baldoví).
* Fix desktop integration rules to cope with VPATH builds (Sergio
Baldoví).
- * Modernise autoconf support (Sergio Baldoví Baldoví).
+ * Modernise autoconf support (Sergio Baldoví).
* Use unzipped tapes for peripheral tests (thanks, Phil Reynolds)
(Sergio Baldoví).
* Fix empty list in pokefinder on GTK+ 3 (Sergio Baldoví).
@@ -121,7 +127,8 @@
* Don't show an error when rewinding an empty tape (Sergio Baldoví).
* GTK UI: clear out row mark in tape browser when selecting another
block (Sergio Baldoví).
- * Add missing const qualifiers and casts (Stuart and Sergio Baldoví).
+ * Add missing const qualifiers and casts (Stuart Brady and Sergio
+ Baldoví).
* Split Select ROMs menu into Machines and Peripherals (Gergely
Szasz).
* Only try to load the fallback ROM if it is different to the standard
@@ -159,11 +166,11 @@
(Fredrick Meunier).
* GTK+ and Win32 UI: add file filters in open/save dialogs (thanks,
Crisis) (Sergio Baldoví).
- * Don't show hidden files/directories in the file selector on Widget
+ * Don't show hidden files/directories in the file selector on Widget
UIs (Sergio Baldoví).
- * Remember filename when saving a recently formatted disk (Sergio
+ * Remember filename when saving a recently formatted disk (Sergio
Baldoví).
- * GTK UI: Change the resizing method for GTK+ UI for better
+ * GTK UI: Change the resizing method for GTK+ UI for better
compatibility with GTK+ 3.20+ (thanks, Alberto Garcia) (Sergio
Baldoví).
@@ -1288,4 +1295,4 @@
* Version 0.1.0 released.
-$Id: ChangeLog 5519 2016-05-23 19:15:02Z pak21 $
+$Id: ChangeLog 5594 2016-06-06 10:46:46Z fredm $
Modified: trunk/fuse/Makefile.am
===================================================================
--- trunk/fuse/Makefile.am 2016-06-06 13:23:36 UTC (rev 806)
+++ trunk/fuse/Makefile.am 2016-06-07 12:51:52 UTC (rev 807)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 1999-2015 Philip Kendall
-## $Id: Makefile.am 5434 2016-05-01 04:22:45Z fredm $
+## $Id: Makefile.am 5537 2016-05-29 06:17:00Z sbaldovi $
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -131,6 +131,7 @@
THANKS \
keysyms.dat \
keysyms.pl \
+ m4/ax_create_stdint_h.m4 \
m4/ax_pthread.m4 \
m4/glib-2.0.m4 \
m4/gtk-2.0.m4 \
Modified: trunk/fuse/README
===================================================================
--- trunk/fuse/README 2016-06-06 13:23:36 UTC (rev 806)
+++ trunk/fuse/README 2016-06-07 12:51:52 UTC (rev 807)
@@ -24,9 +24,11 @@
* Emulation of some of the printers you could attach to a Spectrum.
* Support for the RZX input recording file format, including
rollback and 'competition mode'.
-* Emulation of the DivIDE, Interface 1, Kempston mouse, Spectrum +3e,
- ZXATASP, ZXCF, Beta 128, Opus Discovery, +D, DISCiPLE and Didaktik 80/40
+* Emulation of the Currah µSource, DivIDE, Fuller audio box, Interface 1,
+ Kempston mouse, SpecDrum, Spectrum +3e, ZXATASP and ZXCF interfaces.
+* Emulation of the Beta 128, +D, Didaktik 80/40, DISCiPLE and Opus Discovery
interfaces.
+* Emulation of the Spectranet and SpeccyBoot interfaces.
Help! <xyz> doesn't work
------------------------
@@ -106,6 +108,6 @@
<http://www.worldofspectrum.org/forums/>.
Philip Kendall <phi...@sh...>
-24th May, 2013
+6th June, 2016
-$Id: README 5403 2016-04-25 13:10:53Z fredm $
+$Id: README 5594 2016-06-06 10:46:46Z fredm $
Modified: trunk/fuse/configure.ac
===================================================================
--- trunk/fuse/configure.ac 2016-06-06 13:23:36 UTC (rev 806)
+++ trunk/fuse/configure.ac 2016-06-07 12:51:52 UTC (rev 807)
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.ac 5500 2016-05-21 05:38:43Z fredm $
+dnl $Id: configure.ac 5594 2016-06-06 10:46:46Z fredm $
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
@@ -31,7 +31,7 @@
m4_define([fuse_rc_version], [fuse_major_version,fuse_minor_version,fuse_micro_version,fuse_nano_version])
dnl Package info
-m4_define([fuse_copyright], ["(c) 1999-2013 Philip Kendall and others"])
+m4_define([fuse_copyright], ["(c) 1999-2016 Philip Kendall and others"])
m4_define([fuse_url], [http://fuse-emulator.sourceforge.net/])
m4_define([fuse_bugreport], [http://sourceforge.net/p/fuse-emulator/bugs/])
Modified: trunk/fuse/data/shell-completion/bash/fuse
===================================================================
--- trunk/fuse/data/shell-completion/bash/fuse 2016-06-06 13:23:36 UTC (rev 806)
+++ trunk/fuse/data/shell-completion/bash/fuse 2016-06-07 12:51:52 UTC (rev 807)
@@ -1,6 +1,5 @@
-#!/bin/bash
+# fuse: bash completion for fuse-emulator
-# fuse: bash completion for fuse-emulator
# Copyright (c) 2015 Sergio Baldoví
# This program is free software; you can redistribute it and/or modify
@@ -51,7 +50,7 @@
case $prev in
--betadisk|--discipledisk|--didaktik80disk|--opusdisk| \
--plus3disk|--plusddisk)
- _filedir '@(d40|D40|d80|D80|dsk|DSK|img|IMG|fdi|FDI|mgt|MGT|opd|OPD|opu|OPU|sad|SAD|scl|SCL|td0|TD0|udi|UDI)'
+ _filedir '@(d40|D40|d80|D80|dsk|DSK|img|IMG|fdi|FDI|mgt|MGT|opd|OPD|opu|OPU|sad|SAD|scl|SCL|td0|TD0|trd|TRD|udi|UDI)'
return 0
;;
--disk-try-merge)
@@ -222,7 +221,6 @@
--no-movie-stop-after-rzx --no-opus --no-pal-tv2x
--no-plus3-detect-speedlock --no-plusd --no-printer
--no-raw-s-net --no-rs232-handshake
- --no-rs232-rx --no-rs232-tx
--no-rzx-autosaves --no-simpleide --no-slt --no-sound
--no-sound-force-8bit --no-speccyboot --no-specdrum
--no-spectranet --no-spectranet-disable --no-statusbar
@@ -258,7 +256,7 @@
--zxatasp-write-protect --zxcf --zxcf-cffile --zxcf-upload
--zxprinter' -- "$cur" ) )
else
- _filedir '@(csw|CSW|ltp|LTP|pzx|PZX|spc|SPC|sta|STA|tap|TAP|tzx|TZX|wav|WAV|slt|SLT|sna?(pshot)|SNA?(PSHOT)|?(mgt)snp|?(MGT)SNP|sp|SP|szx|SZX|z80|Z80|zxs|ZXS|d40|D40|d80|D80|dsk|DSK|img|IMG|fdi|FDI|mgt|MGT|opd|OPD|opu|OPU|sad|SAD|scl|SCL|td0|TD0|udi|UDI|rzx|RZX|dck|DCK|hdf|HDF|mdr|MDR)'
+ _filedir '@(csw|CSW|ltp|LTP|pzx|PZX|spc|SPC|sta|STA|tap|TAP|tzx|TZX|wav|WAV|slt|SLT|sna?(pshot)|SNA?(PSHOT)|?(mgt)snp|?(MGT)SNP|sp|SP|szx|SZX|z80|Z80|zxs|ZXS|d40|D40|d80|D80|dsk|DSK|img|IMG|fdi|FDI|mgt|MGT|opd|OPD|opu|OPU|sad|SAD|scl|SCL|td0|TD0|trd|TRD|udi|UDI|rzx|RZX|dck|DCK|hdf|HDF|mdr|MDR)'
fi
} &&
complete -F _fuse -o filenames fuse
Modified: trunk/fuse/debugger/commandl.l
===================================================================
--- trunk/fuse/debugger/commandl.l 2016-06-06 13:23:36 UTC (rev 806)
+++ trunk/fuse/debugger/commandl.l 2016-06-07 12:51:52 UTC (rev 807)
@@ -2,7 +2,7 @@
Copyright (c) 2002-2013 Philip Kendall
Copyright (c) 2015 Sergio Baldoví
- $Id: commandl.l 5518 2016-05-23 19:12:31Z pak21 $
+ $Id: commandl.l 5539 2016-05-29 10:49:51Z fredm $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -47,7 +47,7 @@
%}
-ID [a-z][a-z0-9]+
+ID [a-z]([a-z0-9]|\\[ ])+
%option caseless
@@ -124,8 +124,8 @@
"+" { return '+'; }
"-" { return '-'; }
-"*" { yylval.token = '*'; return TIMES_DIVIDE; }
-"/" { yylval.token = '/'; return TIMES_DIVIDE; }
+"*" { return '*'; }
+"/" { return '/'; }
"&" { return '&'; }
"^" { return '^'; }
@@ -146,7 +146,20 @@
if( YY_START == COMMANDSTATE1 ) BEGIN( COMMANDSTATE2 );
return NUMBER; }
-{ID} { yylval.string = mempool_strdup( debugger_memory_pool, yytext ); return STRING; }
+{ID} { char *dest, *source;
+ yylval.string = mempool_malloc( debugger_memory_pool, strlen( yytext ) + 1 );
+ /* remove escape characters */
+ dest = yylval.string;
+ source = yytext;
+ while( *source ) {
+ if( *source != '\\' ) {
+ *dest++ = *source;
+ }
+ source++;
+ }
+ *dest = '\0';
+ return STRING; }
+
${ID} { yylval.string = mempool_strdup( debugger_memory_pool, yytext + 1 ); return VARIABLE; }
\n { return '\n'; }
Modified: trunk/fuse/debugger/commandy.y
===================================================================
--- trunk/fuse/debugger/commandy.y 2016-06-06 13:23:36 UTC (rev 806)
+++ trunk/fuse/debugger/commandy.y 2016-06-07 12:51:52 UTC (rev 807)
@@ -2,7 +2,7 @@
Copyright (c) 2002-2015 Philip Kendall
Copyright (c) 2015 Sergio Baldoví
- $Id: commandy.y 5518 2016-05-23 19:12:31Z pak21 $
+ $Id: commandy.y 5539 2016-05-29 10:49:51Z fredm $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -72,7 +72,6 @@
%token <token> COMPARISON /* < > <= >= */
%token <token> EQUALITY /* == != */
%token <token> NEGATE /* ! ~ */
-%token <token> TIMES_DIVIDE /* * / */
%token BASE
%token BREAK
@@ -138,7 +137,7 @@
%left EQUALITY
%left COMPARISON
%left '+' '-'
-%left TIMES_DIVIDE
+%left '*' '/'
%right NEGATE /* Unary minus, unary plus, !, ~ */
/* High precedence */
@@ -169,6 +168,10 @@
debugger_breakpoint_add_event( DEBUGGER_BREAKPOINT_TYPE_EVENT,
$3, $5, 0, $1, $6 );
}
+ | breakpointlife EVENT STRING ':' '*' optionalcondition {
+ debugger_breakpoint_add_event( DEBUGGER_BREAKPOINT_TYPE_EVENT,
+ $3, "*", 0, $1, $6 );
+ }
| CLEAR numberorpc { debugger_breakpoint_clear( $2 ); }
| COMMANDS number '\n' debuggercommands DEBUGGER_END { debugger_breakpoint_set_commands( $2, $4 ); }
| CONDITION NUMBER expressionornull {
@@ -268,10 +271,14 @@
$$ = debugger_expression_new_binaryop( '-', $1, $3, debugger_memory_pool );
if( !$$ ) YYABORT;
}
- | expression TIMES_DIVIDE expression {
- $$ = debugger_expression_new_binaryop( $2, $1, $3, debugger_memory_pool );
+ | expression '*' expression {
+ $$ = debugger_expression_new_binaryop( '*', $1, $3, debugger_memory_pool );
if( !$$ ) YYABORT;
}
+ | expression '/' expression {
+ $$ = debugger_expression_new_binaryop( '/', $1, $3, debugger_memory_pool );
+ if( !$$ ) YYABORT;
+ }
| expression EQUALITY expression {
$$ = debugger_expression_new_binaryop( $2, $1, $3, debugger_memory_pool );
if( !$$ ) YYABORT;
Modified: trunk/fuse/debugger/event.c
===================================================================
--- trunk/fuse/debugger/event.c 2016-06-06 13:23:36 UTC (rev 806)
+++ trunk/fuse/debugger/event.c 2016-06-07 12:51:52 UTC (rev 807)
@@ -65,6 +65,7 @@
{
if( strcasecmp( type, event->type ) ) return 0;
if( strcmp( detail, "*" ) == 0 ) return 1;
+ if( strcmp( event->detail, "*" ) == 0 ) return 1;
return strcasecmp( detail, event->detail ) == 0;
}
Modified: trunk/fuse/debugger/expression.c
===================================================================
--- trunk/fuse/debugger/expression.c 2016-06-06 13:23:36 UTC (rev 806)
+++ trunk/fuse/debugger/expression.c 2016-06-07 12:51:52 UTC (rev 807)
@@ -367,8 +367,14 @@
case '*': return debugger_expression_evaluate( binary->op1 ) *
debugger_expression_evaluate( binary->op2 );
- case '/': return debugger_expression_evaluate( binary->op1 ) /
- debugger_expression_evaluate( binary->op2 );
+ case '/': {
+ libspectrum_dword op2 = debugger_expression_evaluate( binary->op2 );
+ if( op2 == 0 ) {
+ ui_error( UI_ERROR_ERROR, "divide by 0" );
+ return 0;
+ }
+ return debugger_expression_evaluate( binary->op1 ) / op2;
+ }
case DEBUGGER_TOKEN_EQUAL_TO:
return debugger_expression_evaluate( binary->op1 ) ==
Modified: trunk/fuse/fuse.c
===================================================================
--- trunk/fuse/fuse.c 2016-06-06 13:23:36 UTC (rev 806)
+++ trunk/fuse/fuse.c 2016-06-07 12:51:52 UTC (rev 807)
@@ -607,13 +607,11 @@
start_files->disk_beta = filename; break;
case LIBSPECTRUM_CLASS_DISK_GENERIC:
- if( machine_current->machine == LIBSPECTRUM_MACHINE_PLUS3 ||
- machine_current->machine == LIBSPECTRUM_MACHINE_PLUS2A )
+ if( machine_current->capabilities &
+ LIBSPECTRUM_MACHINE_CAPABILITY_PLUS3_DISK )
start_files->disk_plus3 = filename;
- else if( machine_current->machine == LIBSPECTRUM_MACHINE_PENT ||
- machine_current->machine == LIBSPECTRUM_MACHINE_PENT512 ||
- machine_current->machine == LIBSPECTRUM_MACHINE_PENT1024 ||
- machine_current->machine == LIBSPECTRUM_MACHINE_SCORP )
+ else if( machine_current->capabilities &
+ LIBSPECTRUM_MACHINE_CAPABILITY_TRDOS_DISK )
start_files->disk_beta = filename;
else {
if( periph_is_active( PERIPH_TYPE_BETA128 ) )
Modified: trunk/fuse/fusepb/English.lproj/InfoPlist.strings
===================================================================
(Binary files differ)
Modified: trunk/fuse/fusepb/Info-Fuse.plist
===================================================================
--- trunk/fuse/fusepb/Info-Fuse.plist 2016-06-06 13:23:36 UTC (rev 806)
+++ trunk/fuse/fusepb/Info-Fuse.plist 2016-06-07 12:51:52 UTC (rev 807)
@@ -582,11 +582,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>1.2.0-pre1</string>
+ <string>1.2.0</string>
<key>CFBundleSignature</key>
<string>FUSE</string>
<key>CFBundleVersion</key>
- <string>1.2.0-pre1</string>
+ <string>1.2.0</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
Modified: trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html
===================================================================
--- trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html 2016-06-06 13:23:36 UTC (rev 806)
+++ trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html 2016-06-07 12:51:52 UTC (rev 807)
@@ -40,15 +40,49 @@
Grande,Helvetica,Arial"><font face="Lucida
Grande,Helvetica,Arial">emulator recording</font>
rollback (Sergio Baldoví).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial"><font
+ face="Lucida Grande,Helvetica,Arial">Use SZX format for
+ the initial snapshot in <font face="Lucida
+ Grande,Helvetica,Arial">emulator recording</font>
+ files (Sergio<font face="Lucida Grande,Helvetica,Arial">
+ </font>Baldoví).</font><br>
+ </font></li>
<li><font face="Lucida Grande,Helvetica,Arial">Fix loading of
EDSK files with Sector Offset block (Sergio Baldoví).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Migrate disk
+ "index event" handling to the FDD layer and have the FDC
+ layer use it for their STATUS registers (Gergely Szasz).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Implement
+ WD2797 emulation (Gergely Szasz).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Centralise the
+ "Disk icon" update code to the FDD layer (Gergely Szasz).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Fix disk image
+ corruption after saving UDI files (Sergio Baldoví).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Check ready
+ status after loading a disk into floppy disk drive
+ (thanks, John Elliott) (Sergio Baldoví).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Fix overlapped
+ SEEK commands (Sergio Baldoví).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Fix length of
+ data returned by READ_DIAG (thanks, Fredrick Meunier)
+ (Sergio Baldoví).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Fix writing
+ .td0 format disk files (Sergio Baldoví).<br>
+ </font></li>
<li><font face="Lucida Grande,Helvetica,Arial">Fix speech in
Cobra's Arc - Medium Case.tzx when loaded with tape traps
enabled (thanks, zx81 and Sergio Baldoví) (Fredrick
Meunier).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Migrate disk
- "index event" handling to the FDD layer and have the FDC
- layer use it for their STATUS registers (Gergely Szasz).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Skip tape traps
+ if VERIFY is requested (UB880D).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Fix loading
+ sound with some custom loaders (Fredrick Meunier).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Check if data
+ blocks are headers for handling PZX files (Fredrick
+ Meunier).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Correct display
+ of pulses in PZX pulse block for tape browser (Fredrick
+ Meunier).</font></li>
<li><font face="Lucida Grande,Helvetica,Arial">Set AF, AF' and
SP to 0xffff on reset (Stuart Brady).</font></li>
<li><font face="Lucida Grande,Helvetica,Arial">Leave most
@@ -59,36 +93,12 @@
and CMOS Z80 variants (Stuart Brady).</font></li>
<li><font face="Lucida Grande,Helvetica,Arial">Switch to 2KB
page size (Stuart Brady).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Implement
- WD2797 emulation (Gergely Szasz).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Skip tape traps
- if VERIFY is requested (UB880D).</font></li>
<li><font face="Lucida Grande,Helvetica,Arial">Fix inaccurate
output when AY envelopes are used (Matthew Westcott and
Fredrick Meunier).</font></li>
<li><font face="Lucida Grande,Helvetica,Arial">Fix some
peripherals activation when loading snapshots (Sergio
Baldoví).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Fix loading
- sound with some custom loaders (Fredrick Meunier).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Centralise the
- "Disk icon" update code to the FDD layer (Gergely Szasz).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Check if data
- blocks are headers for handling PZX files (Fredrick
- Meunier).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Correct display
- of pulses in PZX pulse block for tape browser (Fredrick
- Meunier).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Fix disk image
- corruption after saving UDI files (Sergio Baldoví).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Check ready
- status after loading a disk into floppy disk drive
- (thanks, John Elliott) (Sergio Baldoví).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Fix overlapped
- SEEK commands (Sergio Baldoví).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Fix length of
- data returned by READ_DIAG (thanks, Fredrick Meunier)
- (Sergio Baldoví).</font></li>
</ul>
<br>
</li>
@@ -96,10 +106,11 @@
improvements:</font></li>
<li style="list-style: none outside none;">
<ul>
- <li><font face="Lucida Grande,Helvetica,Arial">The Timex SCLD
- is contended in all of the home, Dock and EXROM banks in
- the 0x4000 - 0x7FFF range (thanks, rga24 from WoS)
- (Fredrick Meunier).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">The address
+ range 0x4000 - 0x7FFF is contended on the TS2068 in
+ the home, Dock and Exrom banks (thanks, Richard
+ Atkinson). It is assumed that this is the same for other
+ Timex models (Fredrick Meunier).</font></li>
<li><font face="Lucida Grande,Helvetica,Arial">Clear all Opus
RAM on hard reset (Stuart Brady).</font></li>
<li><font face="Lucida Grande,Helvetica,Arial">Ensure the ZX
@@ -164,6 +175,15 @@
(Sergio Baldoví).</font></li>
<li><font face="Lucida Grande,Helvetica,Arial">Allow debugger
to dereference memory locations (Philip Kendall).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Allow strings
+ with escaped spaces in the debugger (Sergio Baldoví).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Make wildcard
+ event breakpoints work (thanks, Sergio Baldoví) (Philip
+ Kendall).</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Protect divide
+ expression from a divide by zero exception (Fredrick
+ Meunier).<br>
+ </font></li>
</ul>
<br>
</li>
Modified: trunk/fuse/fusepb/resources/Fuse Help/html/monitor.html
===================================================================
--- trunk/fuse/fusepb/resources/Fuse Help/html/monitor.html 2016-06-06 13:23:36 UTC (rev 806)
+++ trunk/fuse/fusepb/resources/Fuse Help/html/monitor.html 2016-06-07 12:51:52 UTC (rev 807)
@@ -2,7 +2,7 @@
<html>
<head>
<meta http-equiv="content-type" content="text/html;
- charset=ISO-8859-1">
+ charset=windows-1252">
<!-- AppleSegStart="Monitor/Debugger" -->
<title>Monitor/Debugger</title>
</head>
@@ -12,395 +12,262 @@
<div class="refsect1" xml:lang="en" lang="en">
<h2><font face="Lucida Grande,Helvetica,Arial">Monitor/Debugger</font></h2>
</div>
- <p>
- <font face="Lucida Grande,Helvetica,Arial">Fuse features a
- moderately
- powerful, completely transparent
- monitor/debugger, which can be activated via the
- <span class="emphasis"><em>Machine, Debugger...</em></span> menu
- option. A debugger window will appear, showing the current state
- of
- the emulated machine: the top-left `pane' shows the current
- state
- of the Z80 and the last bytes written to any emulated
- peripherals.
- The bottom-left pane lists any active breakpoints. Moving right,
- the next pane shows a disassembly, which by default starts at
- the current program counter, although this can be modified
- either by
- the `disassemble' command (see below) or by dragging the
- scrollbar next
- to it. The next pane shows the current stack, and the next pane
- has any
- `events' which are due to occur and could affect emulation.
- Below the
- events pane is the Spectrum's 64K memory map (the
- <span class="emphasis"><em>W?</em></span> and
- <span class="emphasis"><em>C?</em></span> indicate whether each
- displayed chunk is writable or contended respectively).
- Fuse tracks the memory mapping of the overall address space in 2KB chunks but
- will summarise the mapped pages where they are part of the same page of the
- underlying memory source (e.g. 8KB page sizes in the Spectrum 128K and 4KB
- pages in the Timex clones' DOCK and EXROM banks).
- Below the displays are an entry box for debugger commands, and five buttons
- for controlling the debugger:</font></p>
- <p>
- <span class="emphasis"><font face="Lucida Grande,Helvetica,Arial"><em>Evaluate</em></font></span>
- <font face="Lucida Grande,Helvetica,Arial">Evaluate the command
- currently in the entry
- box.</font></p>
- <p>
- <span class="emphasis"><font face="Lucida Grande,Helvetica,Arial"><em>Single
- Step</em></font></span>
- <font face="Lucida Grande,Helvetica,Arial">Run precisely one Z80
- opcode
- and then stop emulation
- again.</font></p>
- <p>
- <span class="emphasis"><font face="Lucida Grande,Helvetica,Arial"><em>Continue</em></font></span>
- <font face="Lucida Grande,Helvetica,Arial">Restart emulation, but
- leave
- the debugger window open. Note that
- the debugger window will not be updated while emulation is
- running.</font></p>
- <p>
- <span class="emphasis"><font face="Lucida Grande,Helvetica,Arial"><em>Break</em></font></span>
- <font face="Lucida Grande,Helvetica,Arial">Stop emulation and
- return to
- the
- debugger.</font></p>
- <p>
- <span class="emphasis"><font face="Lucida Grande,Helvetica,Arial"><em>Close</em></font></span>
- <font face="Lucida Grande,Helvetica,Arial">Close the debugger
- window
- and restart
- emulation.</font></p>
- <p>
- <font face="Lucida Grande,Helvetica,Arial">Double-clicking on an
- entry
- in the stack pane will cause emulation
- to run until the program counter reaches the value stored at
- that
- address, while double-clicking on an entry in the `events' pane
- will cause emulation to run until that time is
- reached.</font></p>
- <p>
- <font face="Lucida Grande,Helvetica,Arial">The main power of the
- debugger is via the commands entered into the
- entry box, which are similar in nature (but definitely not
- identical to or as powerful as) to those in the
- <em><span class="citerefentry">gdb</span></em> debugger. In
- general, the debugger is case-insensitive, and numbers will be
- interpreted as decimal, unless prefixed by either
- `<span class="emphasis"><em>0x</em></span>' or
- `<span class="emphasis"><em>$</em></span>' when they will be
+ <p> <font face="Lucida Grande,Helvetica,Arial">Fuse features a
+ moderately powerful, completely transparent monitor/debugger,
+ which can be activated via the <span class="emphasis"><em>Machine,
+ Debugger...</em></span> menu option. A debugger window will
+ appear, showing the current state of the emulated machine: the
+ top-left `pane' shows the current state of the Z80 and the last
+ bytes written to any emulated peripherals. The bottom-left pane
+ lists any active breakpoints. Moving right, the next pane shows
+ a disassembly, which by default starts at the current program
+ counter, although this can be modified either by the
+ `disassemble' command (see below) or by dragging the scrollbar
+ next to it. The next pane shows the current stack, and the next
+ pane has any `events' which are due to occur and could affect
+ emulation. Below the events pane is the Spectrum's 64K memory
+ map (the <span class="emphasis"><em>W?</em></span> and <span
+ class="emphasis"><em>C?</em></span> indicate whether each
+ displayed chunk is writable or contended respectively). Fuse
+ tracks the memory mapping of the overall address space in 2KB
+ chunks but will summarise the mapped pages where they are part
+ of the same page of the underlying memory source (e.g. 8KB page
+ sizes in the Spectrum 128K and 4KB pages in the Timex clones'
+ DOCK and EXROM banks). Below the displays are an entry box for
+ debugger commands, and five buttons for controlling the
+ debugger:</font></p>
+ <p> <span class="emphasis"><font face="Lucida
+ Grande,Helvetica,Arial"><em>Evaluate</em></font></span> <font
+ face="Lucida Grande,Helvetica,Arial">Evaluate the command
+ currently in the entry box.</font></p>
+ <p> <span class="emphasis"><font face="Lucida
+ Grande,Helvetica,Arial"><em>Single Step</em></font></span> <font
+ face="Lucida Grande,Helvetica,Arial">Run precisely one Z80
+ opcode and then stop emulation again.</font></p>
+ <p> <span class="emphasis"><font face="Lucida
+ Grande,Helvetica,Arial"><em>Continue</em></font></span> <font
+ face="Lucida Grande,Helvetica,Arial">Restart emulation, but
+ leave the debugger window open. Note that the debugger window
+ will not be updated while emulation is running.</font></p>
+ <p> <span class="emphasis"><font face="Lucida
+ Grande,Helvetica,Arial"><em>Break</em></font></span> <font
+ face="Lucida Grande,Helvetica,Arial">Stop emulation and return
+ to the debugger.</font></p>
+ <p> <span class="emphasis"><font face="Lucida
+ Grande,Helvetica,Arial"><em>Close</em></font></span> <font
+ face="Lucida Grande,Helvetica,Arial">Close the debugger window
+ and restart emulation.</font></p>
+ <p> <font face="Lucida Grande,Helvetica,Arial">Double-clicking on
+ an entry in the stack pane will cause emulation to run until the
+ program counter reaches the value stored at that address, while
+ double-clicking on an entry in the `events' pane will cause
+ emulation to run until that time is reached.</font></p>
+ <p> <font face="Lucida Grande,Helvetica,Arial">The main power of
+ the debugger is via the commands entered into the entry box,
+ which are similar in nature (but definitely not identical to or
+ as powerful as) to those in the <em><span class="citerefentry">gdb</span></em>
+ debugger. In general, the debugger is case-insensitive, and
+ numbers will be interpreted as decimal, unless prefixed by
+ either `<span class="emphasis"><em>0x</em></span>' or `<span
+ class="emphasis"><em>$</em></span>' when they will be
interpreted as hex. Each command can be abbreviated to the
- portion
- not in curly
- braces.</font></p>
- <p>
- <font face="Lucida Grande,Helvetica,Arial">ba{se} <span
- class="emphasis"><em>number</em></span> Change the
- debugger window to displaying output in base
- <span class="emphasis"><em>number</em></span>. Available values
- are
- 10 (decimal) or 16
- (hex).</font></p>
- <p>
- <font face="Lucida Grande,Helvetica,Arial">br{eakpoint} [<span
- class="emphasis"><em>address</em></span>]
- [if <span class="emphasis"><em>condition</em></span>] Set a
- breakpoint
+ portion not in curly braces.</font></p>
+ <p> <font face="Lucida Grande,Helvetica,Arial">ba{se} <span
+ class="emphasis"><em>number</em></span> Change the debugger
+ window to displaying output in base <span class="emphasis"><em>number</em></span>.
+ Available values are 10 (decimal) or 16 (hex).</font></p>
+ <p> <font face="Lucida Grande,Helvetica,Arial">br{eakpoint} [<span
+ class="emphasis"><em>address</em></span>] [if <span
+ class="emphasis"><em>condition</em></span>] Set a breakpoint
to stop emulation and return to the debugger whenever an opcode
- is
- executed at <span class="emphasis"><em>address</em></span> and
- <span class="emphasis"><em>condition</em></span> evaluates true.
- If
- <span class="emphasis"><em>address</em></span> is omitted, it
- defaults to the current value of
- PC.</font></p>
- <p>
- <font face="Lucida Grande,Helvetica,Arial">br{eakpoint} p{ort}
- (r{ead}|w{rite})
- <span class="emphasis"><em>port</em></span>
+ is executed at <span class="emphasis"><em>address</em></span>
+ and <span class="emphasis"><em>condition</em></span> evaluates
+ true. If <span class="emphasis"><em>address</em></span> is
+ omitted, it defaults to the current value of PC.</font></p>
+ <p> <font face="Lucida Grande,Helvetica,Arial">br{eakpoint} p{ort}
+ (r{ead}|w{rite}) <span class="emphasis"><em>port</em></span>
[if <span class="emphasis"><em>condition</em></span>] Set a
- breakpoint
- to trigger whenever IO port
- <span class="emphasis"><em>port</em></span> is read from or
- written
- to and <span class="emphasis"><em>condition</em></span>
- evaluates
- true.</font></p>
- <p>
- <font face="Lucida Grande,Helvetica,Arial">br{eakpoint}
- (r{ead}|w{rite})
- [<span class="emphasis"><em>address</em></span>]
+ breakpoint to trigger whenever IO port <span class="emphasis"><em>port</em></span>
+ is read from or written to and <span class="emphasis"><em>condition</em></span>
+ evaluates true.</font></p>
+ <p> <font face="Lucida Grande,Helvetica,Arial">br{eakpoint}
+ (r{ead}|w{rite}) [<span class="emphasis"><em>address</em></span>]
[if <span class="emphasis"><em>condition</em></span>] Set a
- breakpoint
- to trigger whenever memory location
- <span class="emphasis"><em>address</em></span> is read from
- (other
- than via an opcode fetch) or written to and
- <span class="emphasis"><em>condition</em></span> evaluates true.
- <span class="emphasis"><em>Address</em></span> again defaults to
- the current value of PC if
- omitted.</font></p>
- <p>
- <font face="Lucida Grande,Helvetica,Arial">br{eakpoint} ti{me} <span
- class="emphasis"><em>time</em></span>
- [if <span class="emphasis"><em>condition</em></span>] Set a
- breakpoint
+ breakpoint to trigger whenever memory location <span
+ class="emphasis"><em>address</em></span> is read from (other
+ than via an opcode fetch) or written to and <span
+ class="emphasis"><em>condition</em></span> evaluates true. <span
+ class="emphasis"><em>Address</em></span> again defaults to the
+ current value of PC if omitted.</font></p>
+ <p> <font face="Lucida Grande,Helvetica,Arial">br{eakpoint} ti{me}
+ <span class="emphasis"><em>time</em></span> [if <span
+ class="emphasis"><em>condition</em></span>] Set a breakpoint
to occur <span class="emphasis"><em>time</em></span> tstates
- after
- the start of every frame, assuming
- <span class="emphasis"><em>condition</em></span> evaluates true
- (if
- one is
- given).</font></p>
+ after the start of every frame, assuming <span class="emphasis"><em>condition</em></span>
+ evaluates true (if one is given).</font></p>
<p><font face="Lucida Grande,Helvetica,Arial">br{eakpoint} ev{ent} <span
class="emphasis"><em>area</em></span>:<span class="emphasis"><em>detail</em></span>
[if <span class="emphasis"><em>condition</em></span>] Set a
- breakpoint
- to occur when the event specified by <span class="emphasis"><em>area</em></span>
- <span class="emphasis"><em>detail</em></span> occurs and <span
- class="emphasis"><em>condition</em></span> evaluates to true.
- The
- events which can be caught are:</font></p>
+ breakpoint to occur when the event specified by <span
+ class="emphasis"><em>area</em></span> <span class="emphasis"><em>detail</em></span>
+ occurs and <span class="emphasis"><em>condition</em></span>
+ evaluates to true. The events which can be caught are:</font></p>
<p style="margin-left: 40px;"><font face="Lucida
- Grande,Helvetica,Arial">divide:page
- <br>
+ Grande,Helvetica,Arial">divide:page <br>
divide:unpage</font></p>
<p style="margin-left: 80px;"><font face="Lucida
- Grande,Helvetica,Arial">The
- DivIDE
- interface is paged
- into or out of memory respectively</font></p>
+ Grande,Helvetica,Arial">The DivIDE interface is paged into or
+ out of memory respectively</font></p>
<p style="margin-left: 40px;"><font face="Lucida
- Grande,Helvetica,Arial">if1:page
- <br>
+ Grande,Helvetica,Arial">if1:page <br>
if1:unpage</font></p>
<p style="margin-left: 80px;"><font face="Lucida
- Grande,Helvetica,Arial">The
- Interface
- 1 shadow ROM is
- paged into or out of memory</font></p>
+ Grande,Helvetica,Arial">The Interface 1 shadow ROM is paged into
+ or out of memory</font></p>
<p style="margin-left: 40px;"><font face="Lucida
Grande,Helvetica,Arial">rzx:end</font></p>
<p style="margin-left: 80px;"><font face="Lucida
- Grande,Helvetica,Arial">An
- RZX
- recording finishes
- playing</font></p>
+ Grande,Helvetica,Arial">An RZX recording finishes playing</font></p>
<p style="margin-left: 40px;"><font face="Lucida
- Grande,Helvetica,Arial">tape:play
- <br>
+ Grande,Helvetica,Arial">tape:play <br>
tape:stop</font></p>
<p style="margin-left: 80px;"><font face="Lucida
- Grande,Helvetica,Arial">The
- emulated
- tape starts or
- stops playing</font></p>
+ Grande,Helvetica,Arial">The emulated tape starts or stops
+ playing</font></p>
<p style="margin-left: 40px;"><font face="Lucida
- Grande,Helvetica,Arial">zxcf:page
- <br>
+ Grande,Helvetica,Arial">zxcf:page <br>
zxcf:unpage</font></p>
<p style="margin-left: 80px;"><font face="Lucida
- Grande,Helvetica,Arial">The
- ZXCF
- interface is paged
- into or out of memory</font></p>
+ Grande,Helvetica,Arial">The ZXCF interface is paged into or out
+ of memory</font></p>
<p style="margin-left: 40px;"><font face="Lucida
- Grande,Helvetica,Arial">zxatasp:page
- <br>
+ Grande,Helvetica,Arial">zxatasp:page <br>
zxatasp:unpage</font></p>
<p style="margin-left: 80px;"><font face="Lucida
- Grande,Helvetica,Arial">The
- ZXATASP
- interface is paged
- into or out of memory</font></p>
- <p><font face="Lucida Grande,Helvetica,Arial">In all cases,
- the event can be specified as <i>area</i>:* to catch all
- events from that area.</font></p>
- <p>
- <font face="Lucida Grande,Helvetica,Arial">cl{ear} [<span
+ Grande,Helvetica,Arial">The ZXATASP interface is paged into or
+ out of memory</font></p>
+ <p><font face="Lucida Grande,Helvetica,Arial">In all cases, the
+ event can be specified as <i>area</i>:* to catch all events
+ from that area.</font></p>
+ <p> <font face="Lucida Grande,Helvetica,Arial">cl{ear} [<span
class="emphasis"><em>address</em></span>] Remove all
breakpoints at <span class="emphasis"><em>address</em></span>
- or
- the current value of PC if
- <span class="emphasis"><em>address</em></span> is omitted. Port
- read/write breakpoints are
- unaffected.</font></p>
- <p>
- <font face="Lucida Grande,Helvetica,Arial">cond{ition} <span
- class="emphasis"><em>id</em></span>
- [<span class="emphasis"><em>condition</em></span>] Set
- breakpoint
- <span class="emphasis"><em>id</em></span> to trigger only when
- <span class="emphasis"><em>condition</em></span> is true, or
- unconditionally if <span class="emphasis"><em>condition</em></span>
- is
- omitted.</font></p>
- <p>
- <font face="Lucida Grande,Helvetica,Arial">co{ntinue} Equivalent
- to the
- <span class="emphasis"><em>Continue</em></span>
+ or the current value of PC if <span class="emphasis"><em>address</em></span>
+ is omitted. Port read/write breakpoints are unaffected.</font></p>
+ <p> <font face="Lucida Grande,Helvetica,Arial">cond{ition} <span
+ class="emphasis"><em>id</em></span> [<span class="emphasis"><em>condition</em></span>]
+ Set breakpoint <span class="emphasis"><em>id</em></span> to
+ trigger only when <span class="emphasis"><em>condition</em></span>
+ is true, or unconditionally if <span class="emphasis"><em>condition</em></span>
+ is omitted.</font></p>
+ <p> <font face="Lucida Grande,Helvetica,Arial">co{ntinue}
+ Equivalent to the <span class="emphasis"><em>Continue</em></span>
button.</font></p>
- <p>
- <font face="Lucida Grande,Helvetica,Arial">del{ete} [<span
- class="emphasis"><em>id</em></span>] Remove
- breakpoint <span class="emphasis"><em>id</em></span>, or all
- breakpoints if <span class="emphasis"><em>id</em></span> is
- omitted.</font></p>
- <p>
- <font face="Lucida Grande,Helvetica,Arial">di{sassemble} <span
- class="emphasis"><em>address</em></span> Set
- the centre panel disassembly to begin at
- <span class="emphasis"><em>address</em></span>.</font></p>
- <p>
- <font face="Lucida Grande,Helvetica,Arial">fi{nish} Exit from the
- current CALL or equivalent. This isn't
- infallible: it works by setting a temporary breakpoint at the
- current contents of the stack pointer, so will not function
- correctly if the code returns to some other point or plays with
- its
- stack in other ways. Also, setting this breakpoint doesn't
- disable
- other breakpoints, which may trigger before this one. In that
- case,
+ <p> <font face="Lucida Grande,Helvetica,Arial">del{ete} [<span
+ class="emphasis"><em>id</em></span>] Remove breakpoint <span
+ class="emphasis"><em>id</em></span>, or all breakpoints if <span
+ class="emphasis"><em>id</em></span> is omitted.</font></p>
+ <p> <font face="Lucida Grande,Helvetica,Arial">di{sassemble} <span
+ class="emphasis"><em>address</em></span> Set the centre panel
+ disassembly to begin at <span class="emphasis"><em>address</em></span>.</font></p>
+ <p> <font face="Lucida Grande,Helvetica,Arial">fi{nish} Exit from
+ the current CALL or equivalent. This isn't infallible: it works
+ by setting a temporary breakpoint at the current contents of the
+ stack pointer, so will not function correctly if the code
+ returns to some other point or plays with its stack in other
+ ways. Also, setting this breakpoint doesn't disable other
+ breakpoints, which may trigger before this one. In that case,
the temporary breakpoint remains, and the `continue' command can
- be
- used to return to
- it.</font></p>
- <p>
- <font face="Lucida Grande,Helvetica,Arial">i{gnore} <span
- class="emphasis"><em>id count</em></span> Do not
- trigger the next <span class="emphasis"><em>count</em></span>
- times
- that breakpoint <span class="emphasis"><em>id</em></span> would
- have
+ be used to return to it.</font></p>
+ <p> <font face="Lucida Grande,Helvetica,Arial">i{gnore} <span
+ class="emphasis"><em>id count</em></span> Do not trigger the
+ next <span class="emphasis"><em>count</em></span> times that
+ breakpoint <span class="emphasis"><em>id</em></span> would have
triggered.</font></p>
- <p>
- <font face="Lucida Grande,Helvetica,Arial">n{ext} Step to the
- opcode
- following the current one. As with the
- `finish' command, this works by setting a temporary breakpoint
- at
- the next opcode, so is not
- infalliable.</font></p>
- <p>
- <font face="Lucida Grande,Helvetica,Arial">o{ut} <span
- class="emphasis"><em>port
- value</em></span> Write
- <span class="emphasis"><em>value</em></span> to IO port
- <span class="emphasis"><em>port</em></span>.</font></p>
- <p>
- <font face="Lucida Grande,Helvetica,Arial">se{t} <span
- class="emphasis"><em>address
- value</em></span> Poke
- <span class="emphasis"><em>value</em></span> into memory at
- <span class="emphasis"><em>address</em></span>.</font></p>
- <p>
- <font face="Lucida Grande,Helvetica,Arial">se{t} <span
- class="emphasis"><em>register
- value</em></span> Set the
- value of the Z80 register
- <span class="emphasis"><em>register</em></span> to
- <span class="emphasis"><em>value</em></span>.</font></p>
- <p>
- <font face="Lucida Grande,Helvetica,Arial">se{t} <span
+ <p> <font face="Lucida Grande,Helvetica,Arial">n{ext} Step to the
+ opcode following the current one. As with the `finish' command,
+ this works by setting a temporary breakpoint at the next opcode,
+ so is not infalliable.</font></p>
+ <p> <font face="Lucida Grande,Helvetica,Arial">o{ut} <span
+ class="emphasis"><em>port value</em></span> Write <span
+ class="emphasis"><em>value</em></span> to IO port <span
+ class="emphasis"><em>port</em></span>.</font></p>
+ <p> <font face="Lucida Grande,Helvetica,Arial">se{t} <span
+ class="emphasis"><em>address value</em></span> Poke <span
+ class="emphasis"><em>value</em></span> into memory at <span
+ class="emphasis"><em>address</em></span>.</font></p>
+ <p> <font face="Lucida Grande,Helvetica,Arial">se{t} <span
+ class="emphasis"><em>register value</em></span> Set the value
+ of the Z80 register <span class="emphasis"><em>register</em></span>
+ to <span class="emphasis"><em>value</em></span>.</font></p>
+ <p> <font face="Lucida Grande,Helvetica,Arial">se{t} <span
style="font-style: italic;">mode</span><span class="emphasis"><em>
value</em></span> Set the interrupt mode or interrupt flip
flops (im, iff1 or iff2)</font><font face="Lucida
- Grande,Helvetica,Arial"> to
- <span class="emphasis"><em>value</em></span>.</font><font
+ Grande,Helvetica,Arial"> to <span class="emphasis"><em>value</em></span>.</font><font
face="Lucida Grande,Helvetica,Arial"> If the im mode is not 0, 1
or 2 it will be ignored, while non-zero iff values will be
converted to one.</font></p>
<p><font face="Lucida Grande,Helvetica,Arial">se{t} <span
- class="emphasis"><em>$variable
- value</em></span> Set the value of the debugger variable
- <span class="emphasis"><em>variable</em></span> to <span
- class="emphasis"><em>value</em></span>.</font></p>
+ class="emphasis"><em>$variable value</em></span> Set the value
+ of the debugger variable <span class="emphasis"><em>variable</em></span>
+ to <span class="emphasis"><em>value</em></span>.</font></p>
<p><font face="Lucida Grande,Helvetica,Arial">s{tep} Equivalent to
- the <span class="emphasis"><em>Single
- Step</em></span>
- button.</font></p>
- <p>
- <font face="Lucida Grande,Helvetica,Arial">t{breakpoint} [<span
- class="emphasis"><em>options</em></span>] This
- is the same as the `breakpoint' command in its various forms,
- except that the breakpoint is temporary: it will trigger once
- and
- once only, and then be
- removed.</font></p>
- <p>
- <font face="Lucida Grande,Helvetica,Arial">Addresses can be
- specified
- in one of two forms: either an absolute
- addresses, specifed by an integer in the range 0x0000 to 0xFFFF
- or
- as a
- `<span class="emphasis"><em>source</em></span>:<span class="emphasis"><em>page</em></span>:<span
- class="emphasis">
- <em>offset</em></span> ' combination, which refers to a
- location
- <span class="emphasis"><em>offset</em></span> bytes into the
- memory bank <span class="emphasis"><em>page</em></span>,
- independent
- of where that bank is currently paged into memory. RAM
- and ROM pages are indicated, respectively, by
- `<span style="font-style: italic;">RAM</span>'
- and
- `<span style="font-style: italic;">ROM</span>'
- sources (e.g. offset 0x1234 in ROM 1 is specified as
- `<span style="font-style: italic;">ROM:1:0x1234</span>').
- Other available sources are:
- `<span style="font-style: italic;">Betadisk</span>',
- `<span style="font-style: italic;">"Didaktik RAM"</span>',
- `<span style="font-style: italic;">"Didaktik ROM"</span>',
- `<span style="font-style: italic;">"DISCiPLE RAM"</span>',
- `<span style="font-style: italic;">"DISCiPLE ROM"</span>',
- `<span style="font-style: italic;">"DivIDE EPROM"</span>',
- `<span style="font-style: italic;">"DivIDE RAM"</span>',
- `<span style="font-style: italic;">If1</span>',
- `<span style="font-style: italic;">If2</span>',
- `<span style="font-style: italic;">"Opus RAM"</span>',
- `<span style="font-style: italic;">"Opus ROM"</span>',
- `<span style="font-style: italic;">PlusD</span>',
- `<span style="font-style: italic;">SpeccyBoot</span>',
- `<span style="font-style: italic;">Spectranet</span>',
- `<span style="font-style: italic;">"Timex Dock"</span>',
- `<span style="font-style: italic;">"Timex EXROM"</span>',
- `<span style="font-style: italic;">ZXATASP</span>'
- and
- `<span style="font-style: italic;">ZXCF</span>'.
- The 48K machines are treated as having a permanent
- mapping of page 5 at 0x4000, page 2
- at 0x8000 and page 0 at 0xC000; the 16K Spectrum is treated as
- having
- page 5 at 0x4000 and no page at 0x8000 and 0xC000.</font></p>
- <p>
- <font face="Lucida Grande,Helvetica,Arial">Anywhere the debugger
- is
- expecting a numeric value, except where it
- expects a breakpoint id, you can instead use a numeric
- expression,
- which uses a restricted version of C's syntax; exactly the same
- syntax is used for conditional breakpoints, with `0' being false
- and any other value being true. In numeric expressions, you can
- use
+ the <span class...
[truncated message content] |
|
From: <fr...@us...> - 2016-06-06 13:23:38
|
Revision: 806
http://sourceforge.net/p/fuse-for-macosx/code/806
Author: fredm
Date: 2016-06-06 13:23:36 +0000 (Mon, 06 Jun 2016)
Log Message:
-----------
Tag vendor/fuse-emulator/current as
vendor/fuse-emulator/fuse-1.2.0-r5597.
Revision Links:
--------------
http://sourceforge.net/p/fuse-for-macosx/code/5597
Added Paths:
-----------
vendor/fuse-emulator/fuse-1.2.0-r5597/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2016-06-06 13:23:21
|
Revision: 805
http://sourceforge.net/p/fuse-for-macosx/code/805
Author: fredm
Date: 2016-06-06 13:23:18 +0000 (Mon, 06 Jun 2016)
Log Message:
-----------
Load . into vendor/fuse-emulator/current.
Modified Paths:
--------------
vendor/fuse-emulator/current/fuse/AUTHORS
vendor/fuse-emulator/current/fuse/ChangeLog
vendor/fuse-emulator/current/fuse/Makefile.am
vendor/fuse-emulator/current/fuse/README
vendor/fuse-emulator/current/fuse/configure.ac
vendor/fuse-emulator/current/fuse/data/shell-completion/bash/fuse
vendor/fuse-emulator/current/fuse/debugger/commandl.l
vendor/fuse-emulator/current/fuse/debugger/commandy.y
vendor/fuse-emulator/current/fuse/debugger/event.c
vendor/fuse-emulator/current/fuse/debugger/expression.c
vendor/fuse-emulator/current/fuse/fuse.c
vendor/fuse-emulator/current/fuse/hacking/ChangeLog
vendor/fuse-emulator/current/fuse/lib/Makefile.am
vendor/fuse-emulator/current/fuse/man/fuse.1
vendor/fuse-emulator/current/fuse/menu.c
vendor/fuse-emulator/current/fuse/rzx.c
vendor/fuse-emulator/current/fuse/svg.c
vendor/fuse-emulator/current/fuse/svg.h
vendor/fuse-emulator/current/fuse/tape.c
vendor/fuse-emulator/current/fuse/ui/fb/Makefile.am
vendor/fuse-emulator/current/fuse/ui/gtk/Makefile.am
vendor/fuse-emulator/current/fuse/ui/sdl/Makefile.am
vendor/fuse-emulator/current/fuse/ui/svga/Makefile.am
vendor/fuse-emulator/current/fuse/ui/ui.h
vendor/fuse-emulator/current/fuse/ui/widget/Makefile.am
vendor/fuse-emulator/current/fuse/ui/wii/Makefile.am
vendor/fuse-emulator/current/fuse/ui/win32/Makefile.am
vendor/fuse-emulator/current/fuse/ui/xlib/Makefile.am
vendor/fuse-emulator/current/fuse/z80/Makefile.am
vendor/fuse-emulator/current/fuse/z80/z80.c
vendor/fuse-emulator/current/fuse/z80/z80_ops.c
vendor/fuse-emulator/current/libspectrum/ChangeLog
vendor/fuse-emulator/current/libspectrum/README
vendor/fuse-emulator/current/libspectrum/configure.ac
vendor/fuse-emulator/current/libspectrum/doc/libspectrum.3
vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt
vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog
Modified: vendor/fuse-emulator/current/fuse/AUTHORS
===================================================================
--- vendor/fuse-emulator/current/fuse/AUTHORS 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/AUTHORS 2016-06-06 13:23:18 UTC (rev 805)
@@ -42,7 +42,7 @@
* Garry Lancaster: the simple 8-bit IDE, ZXATASP and ZXCF support.
* Gergely Szasz: +3, +D, Opus, Didaktik 80 and Interface 1/Microdrive emulation,
- the 'movie' code and the ALSO and ao sound drivers.
+ the 'movie' code and the ALSA and ao sound drivers.
* Bjoern Giesler: the original Wii port.
@@ -54,4 +54,4 @@
* Philip Kendall: everything else.
-$Id: AUTHORS 5357 2016-02-23 23:43:54Z sbaldovi $
+$Id: AUTHORS 5569 2016-06-01 11:12:38Z fredm $
Modified: vendor/fuse-emulator/current/fuse/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/ChangeLog 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/ChangeLog 2016-06-06 13:23:18 UTC (rev 805)
@@ -1,4 +1,4 @@
-2016-??-?? Philip Kendall <phi...@sh...>
+2016-06-06 Philip Kendall <phi...@sh...>
* Fuse 1.2.0 released.
@@ -12,46 +12,51 @@
* Allow continuing RZX recordings if there is a final snapshot in the
RZX (Sergio Baldoví).
* Fix the prune function on RZX rollback (Sergio Baldoví).
+ * Use SZX format for the initial snapshot in RZX files (Sergio
+ Baldoví).
* Fix loading of EDSK files with Sector Offset block (Sergio Baldoví).
- * Fix speech in Cobra's Arc - Medium Case.tzx when loaded with tape
- traps enabled (thanks, zx81 and Sergio Baldoví) (Fredrick Meunier).
* Migrate disk "index event" handling to the FDD layer and have the
FDC layer use it for their STATUS registers (Gergely Szasz).
- * Set AF, AF' and SP to 0xffff on reset (Stuart Brady).
- * Leave most registers unchanged on a soft reset (Stuart Brady).
- * Emulate interrupt and NMI timings more precisely (Stuart Brady).
- * Emulate NMOS and CMOS Z80 variants (Stuart Brady).
- * Switch to 2KB page size (Stuart Brady).
* Implement WD2797 emulation (Gergely Szasz).
- * Skip tape traps if VERIFY is requested (UB880D).
- * Fix inaccurate output when AY envelopes are used (Matthew Westcott
- and Fredrick Meunier)
- * Fix some peripherals activation when loading snapshots (Sergio
- Baldoví).
- * Fix loading sound with some custom loaders (Fredrick Meunier).
* Centralise the "Disk icon" update code to the FDD layer (Gergely
Szasz).
- * Check if data blocks are headers for handling PZX files (Fredrick
- Meunier).
- * Correct display of pulses in PZX pulse block for tape browser
- (Fredrick Meunier).
* Fix disk image corruption after saving UDI files (Sergio Baldoví).
* Check ready status after loading a disk into floppy disk drive
(thanks, John Elliott) (Sergio Baldoví).
* Fix overlapped SEEK commands (Sergio Baldoví).
* Fix length of data returned by READ_DIAG (thanks, Fredrick Meunier)
(Sergio Baldoví).
+ * Fix writing .td0 format disk files (Sergio Baldoví).
+ * Fix speech in Cobra's Arc - Medium Case.tzx when loaded with tape
+ traps enabled (thanks, zx81 and Sergio Baldoví) (Fredrick Meunier).
+ * Skip tape traps if VERIFY is requested (UB880D).
+ * Fix loading sound with some custom loaders (Fredrick Meunier).
+ * Check if data blocks are headers for handling PZX files (Fredrick
+ Meunier).
+ * Correct display of pulses in PZX pulse block for tape browser
+ (Fredrick Meunier).
+ * Set AF, AF' and SP to 0xffff on reset (Stuart Brady).
+ * Leave most registers unchanged on a soft reset (Stuart Brady).
+ * Emulate interrupt and NMI timings more precisely (Stuart Brady).
+ * Emulate NMOS and CMOS Z80 variants (Stuart Brady).
+ * Switch to 2KB page size (Stuart Brady).
+ * Fix inaccurate output when AY envelopes are used (Matthew Westcott
+ and Fredrick Meunier).
+ * Fix some peripherals activation when loading snapshots (Sergio
+ Baldoví).
* Machine specific improvements:
- * The Timex SCLD is contended in all of the home, Dock and Exrom banks
- in the 0x4000 - 0x7FFF range (thanks, rga24 from WoS) (Fredrick
- Meunier).
+ * The address range 0x4000 - 0x7FFF is contended on the TS2068 in the
+ home, Dock and Exrom banks (thanks, Richard Atkinson). It is assumed
+ that this is the same for other Timex models (Fredrick Meunier).
* Clear all Opus RAM on hard reset (Stuart Brady).
* Ensure the ZX Printer does not require a hard reset to enable
(thanks, RMartins) (Fredrick Meunier).
* Fix timing of events when emulating Scorpion (Stuart Brady).
* Ensure we have successfully selected a Pentagon or a Timex machine
before inserting their media (Fredrick Meunier).
+ * Prefer Scorpion to Pentagon when loading SCL/TRD disks for better
+ timing compatibility (thanks, windale) (Sergio Baldoví).
* Fix Beta 128 type II commands (thanks, windale and BogDan Vatra)
(Sergio Baldoví).
* Don't enable the Beta 128 interface when loading a snapshot on a
@@ -61,10 +66,7 @@
Meunier).
* Spectranet: fix segfault in error handling when setting SO_REUSEADDR
(Stuart Brady).
- * Prefer Scorpion to Pentagon when loading SCL/TRD disks for better
- timing compatibility (part of feature request #90) (thanks, windale)
- (Sergio Baldoví).
- * Update SE ROMs to v4.07 (thanks, Andrew Owen) (Sergio Baldoví).
+ * Update SE ROMs to v4.07 (thanks, Andrew Owen) (Sergio Baldoví).
* Debugger improvements:
* Fix disassembly of LD (HL), LD (IX) and LD (IY) (BogDan Vatra).
@@ -75,7 +77,6 @@
Baldoví).
* Timex EXROM and Dock text was truncated in the debugger UI (thanks,
Andrew Owen and Sergio Baldoví) (Fredrick Meunier).
- * Don't trap on breakpoints whilst halted (Stuart Brady).
* Win32: relocate halted flag and set monospaced font (Sergio
Baldoví).
* Fix memory issues when removing a matched breakpoint (Tom Seddon).
@@ -85,6 +86,11 @@
* Fix documentation of address syntax used in debugger section
(Sergio Baldoví).
* Allow debugger to dereference memory locations (Philip Kendall).
+ * Allow strings with escaped spaces in the debugger (Sergio Baldoví).
+ * Make wildcard event breakpoints work (thanks, Sergio Baldoví)
+ (Philip Kendall).
+ * Protect divide expression from a divide by zero exception (Fredrick
+ Meunier).
* Miscellaneous improvements:
* Remove warnings in aosound (Rene Ladan).
@@ -107,7 +113,7 @@
* Link to autoload snapshot for NTSC Spectrum (Sergio Baldoví).
* Fix desktop integration rules to cope with VPATH builds (Sergio
Baldoví).
- * Modernise autoconf support (Sergio Baldoví Baldoví).
+ * Modernise autoconf support (Sergio Baldoví).
* Use unzipped tapes for peripheral tests (thanks, Phil Reynolds)
(Sergio Baldoví).
* Fix empty list in pokefinder on GTK+ 3 (Sergio Baldoví).
@@ -121,7 +127,8 @@
* Don't show an error when rewinding an empty tape (Sergio Baldoví).
* GTK UI: clear out row mark in tape browser when selecting another
block (Sergio Baldoví).
- * Add missing const qualifiers and casts (Stuart and Sergio Baldoví).
+ * Add missing const qualifiers and casts (Stuart Brady and Sergio
+ Baldoví).
* Split Select ROMs menu into Machines and Peripherals (Gergely
Szasz).
* Only try to load the fallback ROM if it is different to the standard
@@ -159,11 +166,11 @@
(Fredrick Meunier).
* GTK+ and Win32 UI: add file filters in open/save dialogs (thanks,
Crisis) (Sergio Baldoví).
- * Don't show hidden files/directories in the file selector on Widget
+ * Don't show hidden files/directories in the file selector on Widget
UIs (Sergio Baldoví).
- * Remember filename when saving a recently formatted disk (Sergio
+ * Remember filename when saving a recently formatted disk (Sergio
Baldoví).
- * GTK UI: Change the resizing method for GTK+ UI for better
+ * GTK UI: Change the resizing method for GTK+ UI for better
compatibility with GTK+ 3.20+ (thanks, Alberto Garcia) (Sergio
Baldoví).
@@ -1288,4 +1295,4 @@
* Version 0.1.0 released.
-$Id: ChangeLog 5519 2016-05-23 19:15:02Z pak21 $
+$Id: ChangeLog 5594 2016-06-06 10:46:46Z fredm $
Modified: vendor/fuse-emulator/current/fuse/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/Makefile.am 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/Makefile.am 2016-06-06 13:23:18 UTC (rev 805)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Copyright (c) 1999-2015 Philip Kendall
-## $Id: Makefile.am 5434 2016-05-01 04:22:45Z fredm $
+## $Id: Makefile.am 5537 2016-05-29 06:17:00Z sbaldovi $
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -131,6 +131,7 @@
THANKS \
keysyms.dat \
keysyms.pl \
+ m4/ax_create_stdint_h.m4 \
m4/ax_pthread.m4 \
m4/glib-2.0.m4 \
m4/gtk-2.0.m4 \
Modified: vendor/fuse-emulator/current/fuse/README
===================================================================
--- vendor/fuse-emulator/current/fuse/README 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/README 2016-06-06 13:23:18 UTC (rev 805)
@@ -24,9 +24,11 @@
* Emulation of some of the printers you could attach to a Spectrum.
* Support for the RZX input recording file format, including
rollback and 'competition mode'.
-* Emulation of the DivIDE, Interface 1, Kempston mouse, Spectrum +3e,
- ZXATASP, ZXCF, Beta 128, Opus Discovery, +D, DISCiPLE and Didaktik 80/40
+* Emulation of the Currah µSource, DivIDE, Fuller audio box, Interface 1,
+ Kempston mouse, SpecDrum, Spectrum +3e, ZXATASP and ZXCF interfaces.
+* Emulation of the Beta 128, +D, Didaktik 80/40, DISCiPLE and Opus Discovery
interfaces.
+* Emulation of the Spectranet and SpeccyBoot interfaces.
Help! <xyz> doesn't work
------------------------
@@ -106,6 +108,6 @@
<http://www.worldofspectrum.org/forums/>.
Philip Kendall <phi...@sh...>
-24th May, 2013
+6th June, 2016
-$Id: README 5403 2016-04-25 13:10:53Z fredm $
+$Id: README 5594 2016-06-06 10:46:46Z fredm $
Modified: vendor/fuse-emulator/current/fuse/configure.ac
===================================================================
--- vendor/fuse-emulator/current/fuse/configure.ac 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/configure.ac 2016-06-06 13:23:18 UTC (rev 805)
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.ac 5500 2016-05-21 05:38:43Z fredm $
+dnl $Id: configure.ac 5594 2016-06-06 10:46:46Z fredm $
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
@@ -31,7 +31,7 @@
m4_define([fuse_rc_version], [fuse_major_version,fuse_minor_version,fuse_micro_version,fuse_nano_version])
dnl Package info
-m4_define([fuse_copyright], ["(c) 1999-2013 Philip Kendall and others"])
+m4_define([fuse_copyright], ["(c) 1999-2016 Philip Kendall and others"])
m4_define([fuse_url], [http://fuse-emulator.sourceforge.net/])
m4_define([fuse_bugreport], [http://sourceforge.net/p/fuse-emulator/bugs/])
Modified: vendor/fuse-emulator/current/fuse/data/shell-completion/bash/fuse
===================================================================
--- vendor/fuse-emulator/current/fuse/data/shell-completion/bash/fuse 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/data/shell-completion/bash/fuse 2016-06-06 13:23:18 UTC (rev 805)
@@ -1,6 +1,5 @@
-#!/bin/bash
+# fuse: bash completion for fuse-emulator
-# fuse: bash completion for fuse-emulator
# Copyright (c) 2015 Sergio Baldoví
# This program is free software; you can redistribute it and/or modify
@@ -51,7 +50,7 @@
case $prev in
--betadisk|--discipledisk|--didaktik80disk|--opusdisk| \
--plus3disk|--plusddisk)
- _filedir '@(d40|D40|d80|D80|dsk|DSK|img|IMG|fdi|FDI|mgt|MGT|opd|OPD|opu|OPU|sad|SAD|scl|SCL|td0|TD0|udi|UDI)'
+ _filedir '@(d40|D40|d80|D80|dsk|DSK|img|IMG|fdi|FDI|mgt|MGT|opd|OPD|opu|OPU|sad|SAD|scl|SCL|td0|TD0|trd|TRD|udi|UDI)'
return 0
;;
--disk-try-merge)
@@ -222,7 +221,6 @@
--no-movie-stop-after-rzx --no-opus --no-pal-tv2x
--no-plus3-detect-speedlock --no-plusd --no-printer
--no-raw-s-net --no-rs232-handshake
- --no-rs232-rx --no-rs232-tx
--no-rzx-autosaves --no-simpleide --no-slt --no-sound
--no-sound-force-8bit --no-speccyboot --no-specdrum
--no-spectranet --no-spectranet-disable --no-statusbar
@@ -258,7 +256,7 @@
--zxatasp-write-protect --zxcf --zxcf-cffile --zxcf-upload
--zxprinter' -- "$cur" ) )
else
- _filedir '@(csw|CSW|ltp|LTP|pzx|PZX|spc|SPC|sta|STA|tap|TAP|tzx|TZX|wav|WAV|slt|SLT|sna?(pshot)|SNA?(PSHOT)|?(mgt)snp|?(MGT)SNP|sp|SP|szx|SZX|z80|Z80|zxs|ZXS|d40|D40|d80|D80|dsk|DSK|img|IMG|fdi|FDI|mgt|MGT|opd|OPD|opu|OPU|sad|SAD|scl|SCL|td0|TD0|udi|UDI|rzx|RZX|dck|DCK|hdf|HDF|mdr|MDR)'
+ _filedir '@(csw|CSW|ltp|LTP|pzx|PZX|spc|SPC|sta|STA|tap|TAP|tzx|TZX|wav|WAV|slt|SLT|sna?(pshot)|SNA?(PSHOT)|?(mgt)snp|?(MGT)SNP|sp|SP|szx|SZX|z80|Z80|zxs|ZXS|d40|D40|d80|D80|dsk|DSK|img|IMG|fdi|FDI|mgt|MGT|opd|OPD|opu|OPU|sad|SAD|scl|SCL|td0|TD0|trd|TRD|udi|UDI|rzx|RZX|dck|DCK|hdf|HDF|mdr|MDR)'
fi
} &&
complete -F _fuse -o filenames fuse
Modified: vendor/fuse-emulator/current/fuse/debugger/commandl.l
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/commandl.l 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/debugger/commandl.l 2016-06-06 13:23:18 UTC (rev 805)
@@ -2,7 +2,7 @@
Copyright (c) 2002-2013 Philip Kendall
Copyright (c) 2015 Sergio Baldoví
- $Id: commandl.l 5518 2016-05-23 19:12:31Z pak21 $
+ $Id: commandl.l 5539 2016-05-29 10:49:51Z fredm $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -47,7 +47,7 @@
%}
-ID [a-z][a-z0-9]+
+ID [a-z]([a-z0-9]|\\[ ])+
%option caseless
@@ -124,8 +124,8 @@
"+" { return '+'; }
"-" { return '-'; }
-"*" { yylval.token = '*'; return TIMES_DIVIDE; }
-"/" { yylval.token = '/'; return TIMES_DIVIDE; }
+"*" { return '*'; }
+"/" { return '/'; }
"&" { return '&'; }
"^" { return '^'; }
@@ -146,7 +146,20 @@
if( YY_START == COMMANDSTATE1 ) BEGIN( COMMANDSTATE2 );
return NUMBER; }
-{ID} { yylval.string = mempool_strdup( debugger_memory_pool, yytext ); return STRING; }
+{ID} { char *dest, *source;
+ yylval.string = mempool_malloc( debugger_memory_pool, strlen( yytext ) + 1 );
+ /* remove escape characters */
+ dest = yylval.string;
+ source = yytext;
+ while( *source ) {
+ if( *source != '\\' ) {
+ *dest++ = *source;
+ }
+ source++;
+ }
+ *dest = '\0';
+ return STRING; }
+
${ID} { yylval.string = mempool_strdup( debugger_memory_pool, yytext + 1 ); return VARIABLE; }
\n { return '\n'; }
Modified: vendor/fuse-emulator/current/fuse/debugger/commandy.y
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/commandy.y 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/debugger/commandy.y 2016-06-06 13:23:18 UTC (rev 805)
@@ -2,7 +2,7 @@
Copyright (c) 2002-2015 Philip Kendall
Copyright (c) 2015 Sergio Baldoví
- $Id: commandy.y 5518 2016-05-23 19:12:31Z pak21 $
+ $Id: commandy.y 5539 2016-05-29 10:49:51Z fredm $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -72,7 +72,6 @@
%token <token> COMPARISON /* < > <= >= */
%token <token> EQUALITY /* == != */
%token <token> NEGATE /* ! ~ */
-%token <token> TIMES_DIVIDE /* * / */
%token BASE
%token BREAK
@@ -138,7 +137,7 @@
%left EQUALITY
%left COMPARISON
%left '+' '-'
-%left TIMES_DIVIDE
+%left '*' '/'
%right NEGATE /* Unary minus, unary plus, !, ~ */
/* High precedence */
@@ -169,6 +168,10 @@
debugger_breakpoint_add_event( DEBUGGER_BREAKPOINT_TYPE_EVENT,
$3, $5, 0, $1, $6 );
}
+ | breakpointlife EVENT STRING ':' '*' optionalcondition {
+ debugger_breakpoint_add_event( DEBUGGER_BREAKPOINT_TYPE_EVENT,
+ $3, "*", 0, $1, $6 );
+ }
| CLEAR numberorpc { debugger_breakpoint_clear( $2 ); }
| COMMANDS number '\n' debuggercommands DEBUGGER_END { debugger_breakpoint_set_commands( $2, $4 ); }
| CONDITION NUMBER expressionornull {
@@ -268,10 +271,14 @@
$$ = debugger_expression_new_binaryop( '-', $1, $3, debugger_memory_pool );
if( !$$ ) YYABORT;
}
- | expression TIMES_DIVIDE expression {
- $$ = debugger_expression_new_binaryop( $2, $1, $3, debugger_memory_pool );
+ | expression '*' expression {
+ $$ = debugger_expression_new_binaryop( '*', $1, $3, debugger_memory_pool );
if( !$$ ) YYABORT;
}
+ | expression '/' expression {
+ $$ = debugger_expression_new_binaryop( '/', $1, $3, debugger_memory_pool );
+ if( !$$ ) YYABORT;
+ }
| expression EQUALITY expression {
$$ = debugger_expression_new_binaryop( $2, $1, $3, debugger_memory_pool );
if( !$$ ) YYABORT;
Modified: vendor/fuse-emulator/current/fuse/debugger/event.c
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/event.c 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/debugger/event.c 2016-06-06 13:23:18 UTC (rev 805)
@@ -65,6 +65,7 @@
{
if( strcasecmp( type, event->type ) ) return 0;
if( strcmp( detail, "*" ) == 0 ) return 1;
+ if( strcmp( event->detail, "*" ) == 0 ) return 1;
return strcasecmp( detail, event->detail ) == 0;
}
Modified: vendor/fuse-emulator/current/fuse/debugger/expression.c
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/expression.c 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/debugger/expression.c 2016-06-06 13:23:18 UTC (rev 805)
@@ -367,8 +367,14 @@
case '*': return debugger_expression_evaluate( binary->op1 ) *
debugger_expression_evaluate( binary->op2 );
- case '/': return debugger_expression_evaluate( binary->op1 ) /
- debugger_expression_evaluate( binary->op2 );
+ case '/': {
+ libspectrum_dword op2 = debugger_expression_evaluate( binary->op2 );
+ if( op2 == 0 ) {
+ ui_error( UI_ERROR_ERROR, "divide by 0" );
+ return 0;
+ }
+ return debugger_expression_evaluate( binary->op1 ) / op2;
+ }
case DEBUGGER_TOKEN_EQUAL_TO:
return debugger_expression_evaluate( binary->op1 ) ==
Modified: vendor/fuse-emulator/current/fuse/fuse.c
===================================================================
--- vendor/fuse-emulator/current/fuse/fuse.c 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/fuse.c 2016-06-06 13:23:18 UTC (rev 805)
@@ -617,13 +617,11 @@
start_files->disk_beta = filename; break;
case LIBSPECTRUM_CLASS_DISK_GENERIC:
- if( machine_current->machine == LIBSPECTRUM_MACHINE_PLUS3 ||
- machine_current->machine == LIBSPECTRUM_MACHINE_PLUS2A )
+ if( machine_current->capabilities &
+ LIBSPECTRUM_MACHINE_CAPABILITY_PLUS3_DISK )
start_files->disk_plus3 = filename;
- else if( machine_current->machine == LIBSPECTRUM_MACHINE_PENT ||
- machine_current->machine == LIBSPECTRUM_MACHINE_PENT512 ||
- machine_current->machine == LIBSPECTRUM_MACHINE_PENT1024 ||
- machine_current->machine == LIBSPECTRUM_MACHINE_SCORP )
+ else if( machine_current->capabilities &
+ LIBSPECTRUM_MACHINE_CAPABILITY_TRDOS_DISK )
start_files->disk_beta = filename;
else {
if( periph_is_active( PERIPH_TYPE_BETA128 ) )
Modified: vendor/fuse-emulator/current/fuse/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/hacking/ChangeLog 2016-06-06 13:23:18 UTC (rev 805)
@@ -5097,7 +5097,7 @@
20160503 peripherals/usource.c: add support for Currah uSource snapshots (patch
#363) (Fred and Sergio).
20160503 z80/z80c: complete revert accurate emulation of the HALT instruction
- in [r5160] as it causes [bugs:#316] and there is no current resolution
+ in [r5160] as it causes [bugs:#329] and there is no current resolution
(Fred).
20160508 peripherals/disk/beta.c: don't enable the Beta128 interface when
loading a snapshot on a machine with Beta built-in (fixes bug #342)
@@ -5163,3 +5163,56 @@
format (Sergio).
20160523 compat.h,settings.pl: use Windows line endings for plain text settings
(Sergio).
+20160524 rzx.c: use SZX format for the initial snapshot in RZX files (more from
+ bug #304) (Sergio).
+20160526 debugger/commandl.l,man/fuse.1: allow strings with escaped spaces in
+ the debugger (bug #337) (Sergio).
+20160528 ChangeLog: add even more recent changes (Fred).
+20160529 Makefile.am,lib/Makefile.am,z80/Makefile.am: distribute
+ m4/ax_create_stdint_h.m4,lib/tests/success.d80.bz2 and z80/tests/README
+ (Sergio).
+20160529 debugger/{commandl.l,commandy.y,event.c}: make wildcard events work
+ (fixes bug #349) (thanks, Sergio) (Phil).
+20160529 ChangeLog: add even more recent changes (Fred).
+20160529 README,man/fuse.1: update release dates (Fred).
+20160529 configure.ac: mark release as 1.2.0-pre1 (Fred).
+20160530 configure.ac: update more copyright dates (Sergio).
+20160530 z80/z80_ops.c: revert don't trap on breakpoints whilst halted in
+ [r5171] as it contributes to [bugs:#329] and there is no current
+ resolution (thanks, Guesser) (Fred).
+20160530 ChangeLog: remove reference to trap on breakpoints (Fred).
+20160530 ChangeLog: try to gather changes to related areas (Fred).
+20160531 svg.[hc],menu.c: tidy up svg_capture_mode (Fred).
+20160531 ui/ui.h: remove prototypes for obsolete functions (Fred).
+20160531 rzx.c: remove local arguments shadowing globals (Fred).
+20160531 z80/z80.c: remove local argument shadowing global (Fred).
+20160531 svg.c: don't declare svg_capture_mode when we don't have libxml2
+ (Fred).
+20160601 ChangeLog: fix typos (Fred).
+20160601 man/fuse.1: fix typo (Fred).
+20160601 menu.c,rzx.c: always report an error if we fail to continue a RZX
+ (Fred).
+20160601 fuse.c: use capabilities to decide whether a machine with a suitable
+ disk interface is currently running (Fred).
+20160601 AUTHORS: fix typo (Fred).
+20160602 ChangeLog: add Richard's full name, and tweak description as per
+ his advice (Phil).
+20160603 ChangeLog: fix spacing (Sergio).
+20160604 data/shell-completion/bash/fuse: add TRD file extension to bash
+ completion and remove wrong options (Sergio).
+20160604 data/shell-completion/bash/fuse: remove shebang in bash completion. The
+ script is meant to be sourced, not executed (Sergio).
+20160604 README: update list of supported interfaces (Sergio).
+20160604 debugger/expression.c: avoid doing divide by zero in debugger
+ expressions (fixes bug #350) (Fred).
+20160604 tape.c: fix use of tape traps if VERIFY is requested (thanks, Alberto
+ Garcia) (more from patch #337) (Fred).
+20160606 ui/{fb,gtk,sdl,svga,widget,wii,win32,xlib}/Makefile.am,z80/Makefile.am:
+ fix VPATH builds without dependency tracking (patch #368) (Alberto
+ Garcia).
+20160606 ChangeLog: add more recent changes (Sergio).
+20160606 ChangeLog: elaborate a bit more on the changes to contended memory for
+ Timex models (Fuse has changed all of them to follow the TS2068)
+ (Fred).
+20160606 ChangeLog,README,configure.ac,man/fuse.1: update release dates and mark
+ this release as 1.2.0 (Fred).
Modified: vendor/fuse-emulator/current/fuse/lib/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/lib/Makefile.am 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/lib/Makefile.am 2016-06-06 13:23:18 UTC (rev 805)
@@ -2,7 +2,7 @@
## Copyright (c) 1999-2004 Philip Kendall
## Copyright (c) 2015 Sergio Baldoví
-## $Id: Makefile.am 5434 2016-05-01 04:22:45Z fredm $
+## $Id: Makefile.am 5537 2016-05-29 06:17:00Z sbaldovi $
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -82,6 +82,7 @@
lib_tests = \
lib/tests/fatware-success.hdf.bz2 \
lib/tests/idedos-success.hdf.bz2 \
+ lib/tests/success.d80.bz2 \
lib/tests/success.mdr \
lib/tests/success.mgt.bz2 \
lib/tests/success.opd \
Modified: vendor/fuse-emulator/current/fuse/man/fuse.1
===================================================================
--- vendor/fuse-emulator/current/fuse/man/fuse.1 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/man/fuse.1 2016-06-06 13:23:18 UTC (rev 805)
@@ -23,7 +23,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH fuse 1 "24th May, 2013" "Version 1.2.0" "Emulators"
+.TH fuse 1 "6th June, 2016" "Version 1.2.0" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
@@ -4537,10 +4537,10 @@
.RI ` ROM '
sources (e.g. offset 0x1234 in ROM\ 1 is specified as
.RI ` ROM:1:0x1234 "')."
-Another available sources are:
+Other available sources are:
.RI ` Betadisk "',"
-.RI ` "Didaktik RAM" "',"
-.RI ` "Didaktik ROM" "',"
+.RI ` "Didaktik 80 RAM" "',"
+.RI ` "Didaktik 80 ROM" "',"
.RI ` "DISCiPLE RAM" "',"
.RI ` "DISCiPLE ROM" "',"
.RI ` "DivIDE EPROM" "',"
@@ -4554,9 +4554,12 @@
.RI ` Spectranet "',"
.RI ` "Timex Dock" "',"
.RI ` "Timex EXROM" "',"
+.RI ` uSource "',"
.RI ` ZXATASP '
and
.RI ` ZXCF "'."
+Please, note that spaces in memory sources should be escaped, e.g.,
+`break Didaktik\\\ 80\\\ ROM:0:0x1234'.
The 48K machines are treated as having a permanent
mapping of page\ 5 at 0x4000, page\ 2 at 0x8000 and page\ 0 at 0xC000;
the 16K\ Spectrum is treated as having page\ 5 at 0x4000 and no page at
Modified: vendor/fuse-emulator/current/fuse/menu.c
===================================================================
--- vendor/fuse-emulator/current/fuse/menu.c 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/menu.c 2016-06-06 13:23:18 UTC (rev 805)
@@ -771,8 +771,7 @@
if( !filename ) { fuse_emulation_unpause(); return; }
ui_menu_activate( UI_MENU_ITEM_FILE_SVG_CAPTURE, 1 );
- svg_capture_mode = SVG_CAPTURE_LINES;
- svg_startcapture( filename );
+ svg_startcapture( filename, SVG_CAPTURE_LINES );
fuse_emulation_unpause();
}
@@ -791,8 +790,7 @@
if( !filename ) { fuse_emulation_unpause(); return; }
ui_menu_activate( UI_MENU_ITEM_FILE_SVG_CAPTURE, 1 );
- svg_capture_mode = SVG_CAPTURE_DOTS;
- svg_startcapture( filename );
+ svg_startcapture( filename, SVG_CAPTURE_DOTS );
fuse_emulation_unpause();
}
@@ -920,6 +918,7 @@
MENU_CALLBACK( menu_file_recording_continuerecording )
{
char *rzx_filename;
+ int error;
if( rzx_playback || rzx_recording ) return;
@@ -928,8 +927,12 @@
rzx_filename = ui_get_open_filename( "Fuse - Continue Recording" );
if( !rzx_filename ) { fuse_emulation_unpause(); return; }
- rzx_continue_recording( rzx_filename );
+ error = rzx_continue_recording( rzx_filename );
+ if( error != LIBSPECTRUM_ERROR_NONE ) {
+ ui_error( UI_ERROR_WARNING, "RZX file cannot be continued" );
+ }
+
libspectrum_free( rzx_filename );
fuse_emulation_unpause();
Modified: vendor/fuse-emulator/current/fuse/rzx.c
===================================================================
--- vendor/fuse-emulator/current/fuse/rzx.c 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/rzx.c 2016-06-06 13:23:18 UTC (rev 805)
@@ -109,8 +109,8 @@
int end_event;
-static int start_playback( libspectrum_rzx *rzx );
-static void start_recording( libspectrum_rzx *rzx, int competition_mode );
+static int start_playback( libspectrum_rzx *from_rzx );
+static void start_recording( libspectrum_rzx *to_rzx, int competition_mode );
static int recording_frame( void );
static int playback_frame( void );
static int counter_reset( void );
@@ -133,7 +133,7 @@
}
static int
-rzx_add_snap( libspectrum_rzx *rzx, int automatic )
+rzx_add_snap( libspectrum_rzx *to_rzx, int automatic )
{
int error;
libspectrum_snap *snap = libspectrum_snap_alloc();
@@ -144,7 +144,7 @@
return error;
}
- error = libspectrum_rzx_add_snap( rzx, snap, automatic );
+ error = libspectrum_rzx_add_snap( to_rzx, snap, automatic );
if( error ) {
libspectrum_snap_free( snap );
return error;
@@ -208,7 +208,7 @@
length = 0;
buffer = NULL;
libspec_error = libspectrum_rzx_write(
- &buffer, &length, rzx, LIBSPECTRUM_ID_UNKNOWN, fuse_creator,
+ &buffer, &length, rzx, LIBSPECTRUM_ID_SNAPSHOT_SZX, fuse_creator,
settings_current.rzx_compression, rzx_competition_mode ? &rzx_key : NULL
);
if( libspec_error != LIBSPECTRUM_ERROR_NONE ) {
@@ -335,12 +335,12 @@
}
static int
-start_playback( libspectrum_rzx *rzx )
+start_playback( libspectrum_rzx *from_rzx )
{
int error;
libspectrum_snap *snap;
- error = libspectrum_rzx_start_playback( rzx, 0, &snap );
+ error = libspectrum_rzx_start_playback( from_rzx, 0, &snap );
if( error ) return error;
if( snap ) {
@@ -354,8 +354,8 @@
/* Add a sentinel event to prevent tstates overrun (bug #1057471) */
event_add( RZX_SENTINEL_TIME, sentinel_event );
- tstates = libspectrum_rzx_tstates( rzx );
- rzx_instruction_count = libspectrum_rzx_instructions( rzx );
+ tstates = libspectrum_rzx_tstates( from_rzx );
+ rzx_instruction_count = libspectrum_rzx_instructions( from_rzx );
rzx_playback = 1;
counter_reset();
@@ -408,9 +408,9 @@
}
static void
-start_recording( libspectrum_rzx *rzx, int competition_mode )
+start_recording( libspectrum_rzx *to_rzx, int competition_mode )
{
- libspectrum_rzx_start_input( rzx, tstates );
+ libspectrum_rzx_start_input( to_rzx, tstates );
counter_reset();
rzx_in_count = 0;
@@ -471,7 +471,6 @@
error = snapshot_copy_from( snap );
if( error ) return error;
} else {
- ui_error( UI_ERROR_WARNING, "RZX file cannot be continued" );
libspectrum_free( rzx_filename );
libspectrum_rzx_free( rzx );
return 1;
@@ -515,7 +514,7 @@
length = 0;
buffer = NULL;
libspec_error = libspectrum_rzx_write(
- &buffer, &length, rzx, LIBSPECTRUM_ID_UNKNOWN, fuse_creator,
+ &buffer, &length, rzx, LIBSPECTRUM_ID_SNAPSHOT_SZX, fuse_creator,
settings_current.rzx_compression, rzx_competition_mode ? &rzx_key : NULL
);
if( libspec_error != LIBSPECTRUM_ERROR_NONE ) {
@@ -751,13 +750,13 @@
}
static GSList*
-get_rollback_list( libspectrum_rzx *rzx )
+get_rollback_list( libspectrum_rzx *from_rzx )
{
libspectrum_rzx_iterator it;
GSList *rollback_points;
size_t frames;
- it = libspectrum_rzx_iterator_begin( rzx );
+ it = libspectrum_rzx_iterator_begin( from_rzx );
rollback_points = NULL;
frames = 0;
Modified: vendor/fuse-emulator/current/fuse/svg.c
===================================================================
--- vendor/fuse-emulator/current/fuse/svg.c 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/svg.c 2016-06-06 13:23:18 UTC (rev 805)
@@ -3,7 +3,7 @@
Copyright (c) 2014 Stefano Bodrato
Portions taken from svgwrite.c, (c) J.J. Green 2005
- $Id: svg.c 5385 2016-04-24 11:52:46Z fredm $
+ $Id: svg.c 5563 2016-05-31 12:59:48Z fredm $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -50,11 +50,10 @@
#define BUFSZ 128
int svg_capture_active = 0;
-int svg_capture_mode = SVG_CAPTURE_LINES;
-
#ifdef HAVE_LIB_XML2
+static svg_capture_type svg_capture_mode = SVG_CAPTURE_LINES;
static char *svg_fname;
static char *svg_fnameroot;
@@ -315,11 +314,14 @@
+/* some init, open file (name)*/
void
-svg_startcapture( const char *name ) /* some init, open file (name)*/
+svg_startcapture( const char *name, svg_capture_type mode )
{
if( !svg_capture_active ) {
+ svg_capture_mode = mode;
+
if( name == NULL || *name == '\0' )
name = "fuse";
@@ -638,7 +640,7 @@
if( ( machine_current->machine == LIBSPECTRUM_MACHINE_TS2068 ) ||
( machine_current->machine == LIBSPECTRUM_MACHINE_TC2068 ) ) {
- if( ( svg_capture_mode == SVG_CAPTURE_DOTS) && ( z80.pc.w == 0x263e ) )
+ if( ( svg_capture_mode == SVG_CAPTURE_DOTS ) && ( z80.pc.w == 0x263e ) )
svg_capture_draw();
if( ( svg_capture_mode == SVG_CAPTURE_LINES ) &&
Modified: vendor/fuse-emulator/current/fuse/svg.h
===================================================================
--- vendor/fuse-emulator/current/fuse/svg.h 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/svg.h 2016-06-06 13:23:18 UTC (rev 805)
@@ -3,7 +3,7 @@
Copyright (c) 2014 Stefano Bodrato
Portions taken from svgwrite.c, (c) J.J. Green 2005
- $Id: svg.h 5314 2015-08-23 22:27:39Z sbaldovi $
+ $Id: svg.h 5559 2016-05-31 11:14:00Z fredm $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -30,16 +30,15 @@
extern int svg_capture_active; /* SVG capture enabled? */
-extern void svg_startcapture( const char *name );
+typedef enum svg_capture_type {
+ SVG_CAPTURE_DOTS,
+ SVG_CAPTURE_LINES,
+} svg_capture_type;
-extern void svg_stopcapture( void );
+void svg_startcapture( const char *name, svg_capture_type mode );
+void svg_stopcapture( void );
void svg_capture( void );
void svg_capture_end( void );
-#define SVG_CAPTURE_DOTS 1
-#define SVG_CAPTURE_LINES 2
-
-extern int svg_capture_mode; /* SVG capture enabled? */
-
#endif /* #ifndef FUSE_SVG_H */
Modified: vendor/fuse-emulator/current/fuse/tape.c
===================================================================
--- vendor/fuse-emulator/current/fuse/tape.c 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/tape.c 2016-06-06 13:23:18 UTC (rev 805)
@@ -364,12 +364,6 @@
return -1;
}
- /* Verify? For now don't run the traps in that situation */
- if( !(F_ & FLAG_C) ) {
- tape_play( 1 );
- return -1;
- }
-
/* We don't properly handle the case of partial loading, so don't run
the traps in that situation */
if( libspectrum_tape_block_data_length( block ) != DE + 2 ) {
@@ -413,7 +407,7 @@
trap_load_block( libspectrum_tape_block *block )
{
libspectrum_byte parity, *data;
- int i = 0, length, read;
+ int i = 0, length, read, verify;
/* On exit:
* A = calculated parity byte if parity checked, else 0 (CHECKME)
@@ -447,6 +441,7 @@
return 0;
}
+ verify = !(F_ & FLAG_C);
i = A_; /* i = A' (flag byte) */
AF_ = 0x0145;
A = 0;
@@ -462,20 +457,20 @@
L = data[read - 1];
/* Loading or verifying determined by the carry flag of F' */
- if( F_ & FLAG_C ) {
+ if( verify ) { /* verifying */
for( i = 0; i < read; i++ ) {
parity ^= data[i];
- writebyte_internal( IX+i, data[i] );
- }
- } else { /* verifying */
- for( i = 0; i < read; i++ ) {
- parity ^= data[i];
if( data[i] != readbyte_internal(IX+i) ) {
/* Verification failure */
L = data[i];
goto error_ret;
}
}
+ } else {
+ for( i = 0; i < read; i++ ) {
+ parity ^= data[i];
+ writebyte_internal( IX+i, data[i] );
+ }
}
/* At this point, i == number of bytes actually read or verified */
Modified: vendor/fuse-emulator/current/fuse/ui/fb/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/fb/Makefile.am 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/ui/fb/Makefile.am 2016-06-06 13:23:18 UTC (rev 805)
@@ -2,7 +2,7 @@
## Copyright (c) 2001-2004 Philip Kendall
## Copyright (c) 2015 Sergio Baldoví
-## $Id: Makefile.am 5434 2016-05-01 04:22:45Z fredm $
+## $Id: Makefile.am 5589 2016-06-05 22:14:19Z sbaldovi $
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -47,4 +47,5 @@
ui_fb_built = ui/fb/keysyms.c
ui/fb/keysyms.c: $(srcdir)/keysyms.pl $(srcdir)/keysyms.dat
+ @$(MKDIR_P) ui/fb
$(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/keysyms.pl fb $(srcdir)/keysyms.dat > $@.tmp && mv $@.tmp $@
Modified: vendor/fuse-emulator/current/fuse/ui/gtk/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/gtk/Makefile.am 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/ui/gtk/Makefile.am 2016-06-06 13:23:18 UTC (rev 805)
@@ -2,7 +2,7 @@
## Copyright (c) 2001-2004 Philip Kendall
## Copyright (c) 2015 Sergio Baldoví
-## $Id: Makefile.am 5434 2016-05-01 04:22:45Z fredm $
+## $Id: Makefile.am 5589 2016-06-05 22:14:19Z sbaldovi $
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -77,16 +77,21 @@
ui/gtk/options-header.pl
ui/gtk/keysyms.c: $(srcdir)/keysyms.pl $(srcdir)/keysyms.dat
+ @$(MKDIR_P) ui/gtk
$(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/keysyms.pl gtk $(srcdir)/keysyms.dat > $@.tmp && mv $@.tmp $@
ui/gtk/menu_data.c: $(srcdir)/perl/cpp-perl.pl $(srcdir)/menu_data.pl $(srcdir)/menu_data.dat config.h
+ @$(MKDIR_P) ui/gtk
$(AM_V_GEN)$(PERL) $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/menu_data.dat | $(PERL) -I$(srcdir)/perl $(srcdir)/menu_data.pl gtk c > $@.tmp && mv $@.tmp $@
ui/gtk/menu_data.ui: $(srcdir)/perl/cpp-perl.pl $(srcdir)/menu_data.pl $(srcdir)/menu_data.dat config.h
+ @$(MKDIR_P) ui/gtk
$(AM_V_GEN)$(PERL) $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/menu_data.dat | $(PERL) -I$(srcdir)/perl $(srcdir)/menu_data.pl gtk ui > $@.tmp && mv $@.tmp $@
ui/gtk/options.c: $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/gtk/options.pl $(srcdir)/ui/options.dat $(srcdir)/perl/Fuse.pm $(srcdir)/perl/Fuse/Dialog.pm
+ @$(MKDIR_P) ui/gtk
$(AM_V_GEN)$(PERL) $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/options.dat | $(PERL) -I$(srcdir)/perl $(srcdir)/ui/gtk/options.pl - > $@.tmp && mv $@.tmp $@
ui/gtk/options_internals.h: $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/gtk/options-header.pl $(srcdir)/ui/options.dat $(srcdir)/perl/Fuse.pm $(srcdir)/perl/Fuse/Dialog.pm
+ @$(MKDIR_P) ui/gtk
$(AM_V_GEN)$(PERL) $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/options.dat | $(PERL) -I$(srcdir)/perl $(srcdir)/ui/gtk/options-header.pl - > $@.tmp && mv $@.tmp $@
Modified: vendor/fuse-emulator/current/fuse/ui/sdl/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/sdl/Makefile.am 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/ui/sdl/Makefile.am 2016-06-06 13:23:18 UTC (rev 805)
@@ -2,7 +2,7 @@
## Copyright (c) 2001-2004 Philip Kendall
## Copyright (c) 2015 Sergio Baldoví
-## $Id: Makefile.am 5434 2016-05-01 04:22:45Z fredm $
+## $Id: Makefile.am 5589 2016-06-05 22:14:19Z sbaldovi $
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -46,4 +46,5 @@
ui_sdl_built = ui/sdl/keysyms.c
ui/sdl/keysyms.c: $(srcdir)/keysyms.pl $(srcdir)/keysyms.dat
+ @$(MKDIR_P) ui/sdl
$(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/keysyms.pl sdl $(srcdir)/keysyms.dat > $@.tmp && mv $@.tmp $@
Modified: vendor/fuse-emulator/current/fuse/ui/svga/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/svga/Makefile.am 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/ui/svga/Makefile.am 2016-06-06 13:23:18 UTC (rev 805)
@@ -2,7 +2,7 @@
## Copyright (c) 2001-2004 Philip Kendall
## Copyright (c) 2015 Sergio Baldoví
-## $Id: Makefile.am 5434 2016-05-01 04:22:45Z fredm $
+## $Id: Makefile.am 5589 2016-06-05 22:14:19Z sbaldovi $
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -45,4 +45,5 @@
ui_svga_built = ui/svga/keysyms.c
ui/svga/keysyms.c: $(srcdir)/keysyms.pl $(srcdir)/keysyms.dat
+ @$(MKDIR_P) ui/svga
$(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/keysyms.pl svga $(srcdir)/keysyms.dat > $@.tmp && mv $@.tmp $@
Modified: vendor/fuse-emulator/current/fuse/ui/ui.h
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/ui.h 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/ui/ui.h 2016-06-06 13:23:18 UTC (rev 805)
@@ -121,12 +121,6 @@
/* Write the current tape out */
int ui_tape_write( void );
-/* Write a +3, Beta or +D disk out */
-int ui_plus3_disk_write( specplus3_drive_number which, int saveas );
-int ui_beta_disk_write( beta_drive_number which, int saveas );
-int ui_opus_disk_write( opus_drive_number which, int saveas );
-int ui_plusd_disk_write( plusd_drive_number which, int saveas );
-int ui_disciple_disk_write( disciple_drive_number which, int saveas );
int ui_mdr_write( int which, int saveas );
/* Get a rollback point from the given list */
Modified: vendor/fuse-emulator/current/fuse/ui/widget/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/widget/Makefile.am 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/ui/widget/Makefile.am 2016-06-06 13:23:18 UTC (rev 805)
@@ -2,7 +2,7 @@
## Copyright (c) 2001,2002 Philip Kendall
## Copyright (c) 2015 Sergio Baldoví
-## $Id: Makefile.am 5434 2016-05-01 04:22:45Z fredm $
+## $Id: Makefile.am 5589 2016-06-05 22:14:19Z sbaldovi $
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -68,13 +68,17 @@
ui/widget/options-header.pl
ui/widget/menu_data.c: $(srcdir)/perl/cpp-perl.pl $(srcdir)/menu_data.dat $(srcdir)/menu_data.pl config.h
+ @$(MKDIR_P) ui/widget
$(AM_V_GEN)$(PERL) $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/menu_data.dat | $(PERL) -I$(srcdir)/perl $(srcdir)/menu_data.pl widget > $@.tmp && mv $@.tmp $@
ui/widget/options.c: $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/widget/options.pl $(srcdir)/ui/options.dat $(srcdir)/perl/Fuse.pm $(srcdir)/perl/Fuse/Dialog.pm
+ @$(MKDIR_P) ui/widget
$(AM_V_GEN)$(PERL) $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/options.dat | $(PERL) -I$(srcdir)/perl $(srcdir)/ui/widget/options.pl - > $@.tmp && mv $@.tmp $@
ui/widget/options_internals.h: $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/widget/options-header.pl $(srcdir)/ui/options.dat $(srcdir)/perl/Fuse.pm $(srcdir)/perl/Fuse/Dialog.pm
+ @$(MKDIR_P) ui/widget
$(AM_V_GEN)$(PERL) $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/options.dat | $(PERL) -I$(srcdir)/perl $(srcdir)/ui/widget/options-header.pl - > $@.tmp && mv $@.tmp $@
ui/widget/fuse.font: $(srcdir)/ui/widget/mkfusefont.pl $(srcdir)/ui/widget/fuse.font.sbf
+ @$(MKDIR_P) ui/widget
$(AM_V_GEN)$(PERL) $(srcdir)/ui/widget/mkfusefont.pl $(srcdir)/ui/widget/fuse.font.sbf > $@.tmp && mv $@.tmp $@
Modified: vendor/fuse-emulator/current/fuse/ui/wii/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/wii/Makefile.am 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/ui/wii/Makefile.am 2016-06-06 13:23:18 UTC (rev 805)
@@ -2,7 +2,7 @@
## Copyright (c) 2001-2009 Philip Kendall, Bjoern Giesler
## Copyright (c) 2015 Sergio Baldoví
-## $Id: Makefile.am 5434 2016-05-01 04:22:45Z fredm $
+## $Id: Makefile.am 5589 2016-06-05 22:14:19Z sbaldovi $
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -48,4 +48,5 @@
ui_wii_built = ui/wii/keysyms.c
ui/wii/keysyms.c: $(srcdir)/keysyms.pl $(srcdir)/keysyms.dat
+ @$(MKDIR_P) ui/wii
$(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/keysyms.pl wii $(srcdir)/keysyms.dat > $@.tmp && mv $@.tmp $@
Modified: vendor/fuse-emulator/current/fuse/ui/win32/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/win32/Makefile.am 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/ui/win32/Makefile.am 2016-06-06 13:23:18 UTC (rev 805)
@@ -2,7 +2,7 @@
## Copyright (c) 2001-2008 Philip Kendall
## Copyright (c) 2015 Sergio Baldoví
-## $Id: Makefile.am 5434 2016-05-01 04:22:45Z fredm $
+## $Id: Makefile.am 5589 2016-06-05 22:14:19Z sbaldovi $
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -118,22 +118,29 @@
$(ui_win32_rc_files)
ui/win32/keysyms.c: $(srcdir)/keysyms.pl $(srcdir)/keysyms.dat
+ @$(MKDIR_P) ui/win32
$(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/keysyms.pl win32 $(srcdir)/keysyms.dat > $@.tmp && mv $@.tmp $@
ui/win32/menu_data.c: $(srcdir)/perl/cpp-perl.pl $(srcdir)/menu_data.pl $(srcdir)/menu_data.dat config.h
+ @$(MKDIR_P) ui/win32
$(AM_V_GEN)$(PERL) $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/menu_data.dat | $(PERL) -I$(srcdir)/perl $(srcdir)/menu_data.pl win32 c > $@.tmp && mv $@.tmp $@
ui/win32/menu_data.h: $(srcdir)/perl/cpp-perl.pl $(srcdir)/menu_data.pl $(srcdir)/menu_data.dat config.h
+ @$(MKDIR_P) ui/win32
$(AM_V_GEN)$(PERL) $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/menu_data.dat | $(PERL) -I$(srcdir)/perl $(srcdir)/menu_data.pl win32 h > $@.tmp && mv $@.tmp $@
ui/win32/menu_data.rc: $(srcdir)/perl/cpp-perl.pl $(srcdir)/menu_data.pl $(srcdir)/menu_data.dat config.h
+ @$(MKDIR_P) ui/win32
$(AM_V_GEN)$(PERL) $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/menu_data.dat | $(PERL) -I$(srcdir)/perl $(srcdir)/menu_data.pl win32 rc > $@.tmp && mv $@.tmp $@
ui/win32/options.c: $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/win32/options.pl $(srcdir)/ui/options.dat $(srcdir)/perl/Fuse.pm $(srcdir)/perl/Fuse/Dialog.pm
+ @$(MKDIR_P) ui/win32
$(AM_V_GEN)$(PERL) $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/options.dat | $(PERL) -I$(srcdir)/perl $(srcdir)/ui/win32/options.pl - > $@.tmp && mv $@.tmp $@
ui/win32/options_internals.h: $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/win32/options-header.pl $(srcdir)/ui/options.dat $(srcdir)/perl/Fuse.pm $(srcdir)/perl/Fuse/Dialog.pm
+ @$(MKDIR_P) ui/win32
$(AM_V_GEN)$(PERL) $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/options.dat | $(PERL) -I$(srcdir)/perl $(srcdir)/ui/win32/options-header.pl - > $@.tmp && mv $@.tmp $@
ui/win32/options.rc: $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/win32/options-resource.pl $(srcdir)/ui/options.dat $(srcdir)/perl/Fuse.pm $(srcdir)/perl/Fuse/Dialog.pm
+ @$(MKDIR_P) ui/win32
$(AM_V_GEN)$(PERL) $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/options.dat | $(PERL) -I$(srcdir)/perl $(srcdir)/ui/win32/options-resource.pl - > $@.tmp && mv $@.tmp $@
Modified: vendor/fuse-emulator/current/fuse/ui/xlib/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/xlib/Makefile.am 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/ui/xlib/Makefile.am 2016-06-06 13:23:18 UTC (rev 805)
@@ -2,7 +2,7 @@
## Copyright (c) 2001-2004 Philip Kendall
## Copyright (c) 2015 Sergio Baldoví
-## $Id: Makefile.am 5434 2016-05-01 04:22:45Z fredm $
+## $Id: Makefile.am 5589 2016-06-05 22:14:19Z sbaldovi $
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -55,7 +55,9 @@
ui/xlib/xstatusbar.pl
ui/xlib/keysyms.c: $(srcdir)/keysyms.pl $(srcdir)/keysyms.dat
+ @$(MKDIR_P) ui/xlib
$(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/keysyms.pl x $(srcdir)/keysyms.dat > $@.tmp && mv $@.tmp $@
ui/xlib/xpixmaps.c: ui/xlib/xstatusbar.pl $(srcdir)/ui/gtk/pixmaps.c
+ @$(MKDIR_P) ui/xlib
$(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/ui/xlib/xstatusbar.pl $(srcdir)/ui/gtk/pixmaps.c > $@.tmp && mv $@.tmp $@
Modified: vendor/fuse-emulator/current/fuse/z80/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/z80/Makefile.am 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/z80/Makefile.am 2016-06-06 13:23:18 UTC (rev 805)
@@ -2,7 +2,7 @@
## Copyright (c) 2001-2003 Philip Kendall
## Copyright (c) 2015-2016 Sergio Baldoví
-## $Id: Makefile.am 5434 2016-05-01 04:22:45Z fredm $
+## $Id: Makefile.am 5589 2016-06-05 22:14:19Z sbaldovi $
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -34,18 +34,23 @@
z80/z80_ed.c
z80/opcodes_base.c: $(srcdir)/z80/z80.pl $(srcdir)/z80/opcodes_base.dat
+ @$(MKDIR_P) z80
$(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/z80/z80.pl $(srcdir)/z80/opcodes_base.dat > $@.tmp && mv $@.tmp $@
z80/z80_cb.c: $(srcdir)/z80/z80.pl $(srcdir)/z80/opcodes_cb.dat
+ @$(MKDIR_P) z80
$(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/z80/z80.pl $(srcdir)/z80/opcodes_cb.dat > $@.tmp && mv $@.tmp $@
z80/z80_ddfd.c: $(srcdir)/z80/z80.pl $(srcdir)/z80/opcodes_ddfd.dat
+ @$(MKDIR_P) z80
$(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/z80/z80.pl $(srcdir)/z80/opcodes_ddfd.dat > $@.tmp && mv $@.tmp $@
z80/z80_ddfdcb.c: $(srcdir)/z80/z80.pl $(srcdir)/z80/opcodes_ddfd.dat
+ @$(MKDIR_P) z80
$(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/z80/z80.pl $(srcdir)/z80/opcodes_ddfdcb.dat > $@.tmp && mv $@.tmp $@
z80/z80_ed.c: $(srcdir)/z80/z80.pl $(srcdir)/z80/opcodes_ed.dat
+ @$(MKDIR_P) z80
$(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/z80/z80.pl $(srcdir)/z80/opcodes_ed.dat > $@.tmp && mv $@.tmp $@
noinst_HEADERS += \
@@ -54,8 +59,9 @@
z80/z80_macros.h
EXTRA_DIST += \
+ z80/tests/README \
+ z80/tests/tests.expected \
z80/tests/tests.in \
- z80/tests/tests.expected \
z80/opcodes_base.c \
z80/opcodes_base.dat \
z80/opcodes_cb.dat \
Modified: vendor/fuse-emulator/current/fuse/z80/z80.c
===================================================================
--- vendor/fuse-emulator/current/fuse/z80/z80.c 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/z80/z80.c 2016-06-06 13:23:18 UTC (rev 805)
@@ -84,7 +84,8 @@
};
static void
-z80_interrupt_event_fn( libspectrum_dword tstates, int type, void *user_data )
+z80_interrupt_event_fn( libspectrum_dword event_tstates, int type,
+ void *user_data )
{
/* Retriggered interrupt; firstly, ignore if we're doing RZX playback
as all interrupts are generated by the RZX code */
Modified: vendor/fuse-emulator/current/fuse/z80/z80_ops.c
===================================================================
--- vendor/fuse-emulator/current/fuse/z80/z80_ops.c 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/fuse/z80/z80_ops.c 2016-06-06 13:23:18 UTC (rev 805)
@@ -161,7 +161,7 @@
/* Check if the debugger should become active at this point */
CHECK( debugger, debugger_mode != DEBUGGER_MODE_INACTIVE )
- if( !z80.halted && debugger_check( DEBUGGER_BREAKPOINT_TYPE_EXECUTE, PC ) )
+ if( debugger_check( DEBUGGER_BREAKPOINT_TYPE_EXECUTE, PC ) )
debugger_trap();
END_CHECK
Modified: vendor/fuse-emulator/current/libspectrum/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/libspectrum/ChangeLog 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/libspectrum/ChangeLog 2016-06-06 13:23:18 UTC (rev 805)
@@ -1,4 +1,4 @@
-2016-??-?? Philip Kendall <phi...@sh...>
+2016-06-06 Philip Kendall <phi...@sh...>
* libspectrum 1.2.0 released.
@@ -34,7 +34,7 @@
* Add pkg.m4 for PKG_CHECK_MODULES in case the platform doesn't have
pkg-config installed (Sergio Baldoví).
* Enable silent rules for perl and windres commands (Sergio Baldoví).
- * Allow for the inital_level of PZX data blocks to have the default
+ * Allow for the initial_level of PZX data blocks to have the default
value (Fredrick Meunier).
2013-05-24 Philip Kendall <phi...@sh...>
@@ -379,5 +379,5 @@
* libspectrum separated from Fuse just before the 0.5.0 release of
Fuse; see Fuse's ChangeLog for changes up to this point
-$Id: ChangeLog 5413 2016-04-27 11:50:17Z fredm $
+$Id: ChangeLog 5592 2016-06-06 10:37:02Z fredm $
Modified: vendor/fuse-emulator/current/libspectrum/README
===================================================================
--- vendor/fuse-emulator/current/libspectrum/README 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/libspectrum/README 2016-06-06 13:23:18 UTC (rev 805)
@@ -67,6 +67,6 @@
Then, type "make" and if everything went well, "make install".
Philip Kendall <phi...@sh...>
-24th May, 2013
+6th June, 2016
-$Id: README 5428 2016-04-30 07:03:25Z sbaldovi $
+$Id: README 5592 2016-06-06 10:37:02Z fredm $
Modified: vendor/fuse-emulator/current/libspectrum/configure.ac
===================================================================
--- vendor/fuse-emulator/current/libspectrum/configure.ac 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/libspectrum/configure.ac 2016-06-06 13:23:18 UTC (rev 805)
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
dnl Copyright (c) 1999-2013 Philip Kendall
-dnl $Id: configure.ac 5422 2016-04-29 12:54:59Z fredm $
+dnl $Id: configure.ac 5592 2016-06-06 10:37:02Z fredm $
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
Modified: vendor/fuse-emulator/current/libspectrum/doc/libspectrum.3
===================================================================
--- vendor/fuse-emulator/current/libspectrum/doc/libspectrum.3 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/libspectrum/doc/libspectrum.3 2016-06-06 13:23:18 UTC (rev 805)
@@ -22,7 +22,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH libspectrum 3 "24th May, 2013" "Version 1.2.0" "Emulators"
+.TH libspectrum 3 "6th June, 2016" "Version 1.2.0" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
Modified: vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt
===================================================================
--- vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt 2016-06-06 13:23:18 UTC (rev 805)
@@ -10,8 +10,8 @@
* Tape images: .tzx, .tap, .spc, .sta and .ltp (read/write) and
.pzx, Warajevo .tap, Z80Em and CSW version 1 (read only).
* Input recordings: .rzx (read/write).
-* Disk images: .dsk (both plain and extended), .fdi, .sad, .scl, .td0,
- .trd and .udi (identification only).
+* Disk images: .dsk (both plain and extended), .d40, .d80, .fdi, .img, .mgt,
+ .opd, .sad, .scl, .td0, .trd and .udi (identification only).
* Timex cartridges: .dck (read only).
* IDE hard disk images: .hdf (read/write).
* Microdrive cartridge images: .mdr (read/write).
@@ -1867,4 +1867,4 @@
Write `data' to register `reg' of the IDE channel `chn'.
-$Id: libspectrum.txt 5486 2016-05-14 12:39:37Z fredm $
+$Id: libspectrum.txt 5552 2016-05-29 22:08:09Z sbaldovi $
Modified: vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog 2016-06-01 10:46:07 UTC (rev 804)
+++ vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog 2016-06-06 13:23:18 UTC (rev 805)
@@ -1067,3 +1067,8 @@
(patch #364) (Fred).
20160521 szx.c: reset uncompressed size when loading Op...
[truncated message content] |
|
From: <fr...@us...> - 2016-06-01 10:46:13
|
Revision: 804
http://sourceforge.net/p/fuse-for-macosx/code/804
Author: fredm
Date: 2016-06-01 10:46:07 +0000 (Wed, 01 Jun 2016)
Log Message:
-----------
Merge up to vendor 1.2.0 release branches r5525.
Revision Links:
--------------
http://sourceforge.net/p/fuse-for-macosx/code/5525
Modified Paths:
--------------
trunk/fuse/AUTHORS
trunk/fuse/ChangeLog
trunk/fuse/INSTALL
trunk/fuse/Makefile.am
trunk/fuse/README
trunk/fuse/THANKS
trunk/fuse/autogen.sh
trunk/fuse/bitmap.h
trunk/fuse/compat/Makefile.am
trunk/fuse/compat/amiga/osname.c
trunk/fuse/compat/amiga/paths.c
trunk/fuse/compat/linux/paths.c
trunk/fuse/compat/morphos/osname.c
trunk/fuse/compat/unix/dir.c
trunk/fuse/compat/unix/file.c
trunk/fuse/compat/unix/osname.c
trunk/fuse/compat/unix/paths.c
trunk/fuse/compat/unix/socket.c
trunk/fuse/compat/unix/timer.c
trunk/fuse/compat/unix/tuntap.c
trunk/fuse/compat/wii/dir.c
trunk/fuse/compat/wii/osname.c
trunk/fuse/compat/wii/paths.c
trunk/fuse/compat/wii/timer.c
trunk/fuse/compat/win32/osname.c
trunk/fuse/compat/win32/paths.c
trunk/fuse/compat/win32/socket.c
trunk/fuse/compat/win32/timer.c
trunk/fuse/compat.h
trunk/fuse/configure.ac
trunk/fuse/data/Makefile.am
trunk/fuse/data/fuse.desktop.in
trunk/fuse/data/fuse.xml.in
trunk/fuse/debugger/Makefile.am
trunk/fuse/debugger/breakpoint.c
trunk/fuse/debugger/breakpoint.h
trunk/fuse/debugger/command.c
trunk/fuse/debugger/commandl.l
trunk/fuse/debugger/commandy.y
trunk/fuse/debugger/debugger.c
trunk/fuse/debugger/debugger.h
trunk/fuse/debugger/debugger_internals.h
trunk/fuse/debugger/disassemble.c
trunk/fuse/debugger/event.c
trunk/fuse/debugger/expression.c
trunk/fuse/debugger/variable.c
trunk/fuse/display.c
trunk/fuse/display.h
trunk/fuse/event.c
trunk/fuse/event.h
trunk/fuse/fuse.c
trunk/fuse/fuse.h
trunk/fuse/fusepb/English.lproj/InfoPlist.strings
trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
trunk/fuse/fusepb/FuseMenus.m
trunk/fuse/fusepb/Info-Fuse.plist
trunk/fuse/fusepb/controllers/DebuggerController.h
trunk/fuse/fusepb/controllers/DebuggerController.m
trunk/fuse/fusepb/controllers/FuseController.h
trunk/fuse/fusepb/controllers/FuseController.m
trunk/fuse/fusepb/controllers/PreferencesController.m
trunk/fuse/fusepb/models/Emulator.h
trunk/fuse/fusepb/models/Emulator.m
trunk/fuse/fusepb/resources/Fuse Help/html/about.html
trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html
trunk/fuse/fusepb/resources/Fuse Help/html/disciple.html
trunk/fuse/fusepb/resources/Fuse Help/html/divide.html
trunk/fuse/fusepb/resources/Fuse Help/html/formats.html
trunk/fuse/fusepb/resources/Fuse Help/html/general.html
trunk/fuse/fusepb/resources/Fuse Help/html/menus.html
trunk/fuse/fusepb/resources/Fuse Help/html/monitor.html
trunk/fuse/fusepb/resources/Fuse Help/html/peripherals.html
trunk/fuse/fusepb/resources/Fuse Help/html/plusd.html
trunk/fuse/fusepb/resources/Fuse Help/html/tocstart.html
trunk/fuse/fusepb/settings-cocoa-header.pl
trunk/fuse/fusepb/settings-header.pl
trunk/fuse/fusepb/settings_cocoa.h
trunk/fuse/fusepb/views/DisplayOpenGLView.h
trunk/fuse/fusepb/views/DisplayOpenGLView.m
trunk/fuse/fusepb/xibs/Debugger.xib
trunk/fuse/fusepb/xibs/MainMenu.xib
trunk/fuse/fusepb/xibs/Preferences.xib
trunk/fuse/hacking/ChangeLog
trunk/fuse/hacking/Makefile.am
trunk/fuse/hacking/peripheral_tests.txt
trunk/fuse/input.c
trunk/fuse/input.h
trunk/fuse/keyboard.c
trunk/fuse/keyboard.h
trunk/fuse/keysyms.pl
trunk/fuse/lib/Makefile.am
trunk/fuse/loader.c
trunk/fuse/loader.h
trunk/fuse/m4/ax_pthread.m4
trunk/fuse/m4/pkg.m4
trunk/fuse/machine.c
trunk/fuse/machine.h
trunk/fuse/machines/Makefile.am
trunk/fuse/machines/machines.h
trunk/fuse/machines/machines_periph.c
trunk/fuse/machines/machines_periph.h
trunk/fuse/machines/pentagon.c
trunk/fuse/machines/pentagon.h
trunk/fuse/machines/pentagon1024.c
trunk/fuse/machines/pentagon512.c
trunk/fuse/machines/scorpion.c
trunk/fuse/machines/scorpion.h
trunk/fuse/machines/spec128.c
trunk/fuse/machines/spec128.h
trunk/fuse/machines/spec16.c
trunk/fuse/machines/spec48.c
trunk/fuse/machines/spec48.h
trunk/fuse/machines/spec48_ntsc.c
trunk/fuse/machines/spec_se.c
trunk/fuse/machines/specplus2.c
trunk/fuse/machines/specplus2a.c
trunk/fuse/machines/specplus3.c
trunk/fuse/machines/specplus3.h
trunk/fuse/machines/specplus3e.c
trunk/fuse/machines/tc2048.c
trunk/fuse/machines/tc2068.c
trunk/fuse/machines/tc2068.h
trunk/fuse/machines/ts2068.c
trunk/fuse/man/Makefile.am
trunk/fuse/man/fuse.1
trunk/fuse/memory.c
trunk/fuse/memory.h
trunk/fuse/mempool.c
trunk/fuse/mempool.h
trunk/fuse/menu.c
trunk/fuse/menu.h
trunk/fuse/menu_data.dat
trunk/fuse/menu_data.pl
trunk/fuse/module.c
trunk/fuse/module.h
trunk/fuse/movie.c
trunk/fuse/movie.h
trunk/fuse/movie_tables.h
trunk/fuse/periph.c
trunk/fuse/periph.h
trunk/fuse/peripherals/Makefile.am
trunk/fuse/peripherals/ay.c
trunk/fuse/peripherals/ay.h
trunk/fuse/peripherals/dck.c
trunk/fuse/peripherals/dck.h
trunk/fuse/peripherals/disk/beta.c
trunk/fuse/peripherals/disk/beta.h
trunk/fuse/peripherals/disk/crc.c
trunk/fuse/peripherals/disk/crc.h
trunk/fuse/peripherals/disk/disciple.c
trunk/fuse/peripherals/disk/disciple.h
trunk/fuse/peripherals/disk/disk.c
trunk/fuse/peripherals/disk/disk.h
trunk/fuse/peripherals/disk/fdd.c
trunk/fuse/peripherals/disk/fdd.h
trunk/fuse/peripherals/disk/opus.c
trunk/fuse/peripherals/disk/opus.h
trunk/fuse/peripherals/disk/plusd.c
trunk/fuse/peripherals/disk/plusd.h
trunk/fuse/peripherals/disk/upd_fdc.c
trunk/fuse/peripherals/disk/upd_fdc.h
trunk/fuse/peripherals/disk/wd_fdc.c
trunk/fuse/peripherals/disk/wd_fdc.h
trunk/fuse/peripherals/flash/am29f010.c
trunk/fuse/peripherals/flash/am29f010.h
trunk/fuse/peripherals/fuller.c
trunk/fuse/peripherals/fuller.h
trunk/fuse/peripherals/ide/divide.c
trunk/fuse/peripherals/ide/divide.h
trunk/fuse/peripherals/ide/ide.c
trunk/fuse/peripherals/ide/ide.h
trunk/fuse/peripherals/ide/simpleide.c
trunk/fuse/peripherals/ide/simpleide.h
trunk/fuse/peripherals/ide/zxatasp.c
trunk/fuse/peripherals/ide/zxatasp.h
trunk/fuse/peripherals/ide/zxcf.c
trunk/fuse/peripherals/ide/zxcf.h
trunk/fuse/peripherals/if1.c
trunk/fuse/peripherals/if1.h
trunk/fuse/peripherals/if2.c
trunk/fuse/peripherals/if2.h
trunk/fuse/peripherals/joystick.c
trunk/fuse/peripherals/joystick.h
trunk/fuse/peripherals/kempmouse.c
trunk/fuse/peripherals/kempmouse.h
trunk/fuse/peripherals/melodik.c
trunk/fuse/peripherals/melodik.h
trunk/fuse/peripherals/nic/enc28j60.c
trunk/fuse/peripherals/nic/enc28j60.h
trunk/fuse/peripherals/nic/w5100.c
trunk/fuse/peripherals/nic/w5100.h
trunk/fuse/peripherals/nic/w5100_internals.h
trunk/fuse/peripherals/nic/w5100_socket.c
trunk/fuse/peripherals/printer.c
trunk/fuse/peripherals/printer.h
trunk/fuse/peripherals/scld.c
trunk/fuse/peripherals/scld.h
trunk/fuse/peripherals/speccyboot.c
trunk/fuse/peripherals/speccyboot.h
trunk/fuse/peripherals/specdrum.c
trunk/fuse/peripherals/specdrum.h
trunk/fuse/peripherals/spectranet.c
trunk/fuse/peripherals/spectranet.h
trunk/fuse/peripherals/ula.c
trunk/fuse/peripherals/ula.h
trunk/fuse/perl/Fuse/Dialog.pm
trunk/fuse/perl/Makefile.am
trunk/fuse/pokefinder/Makefile.am
trunk/fuse/pokefinder/pokefinder.c
trunk/fuse/pokefinder/pokefinder.h
trunk/fuse/pokefinder/pokemem.c
trunk/fuse/pokefinder/pokemem.h
trunk/fuse/profile.c
trunk/fuse/profile.h
trunk/fuse/psg.c
trunk/fuse/psg.h
trunk/fuse/rectangle.c
trunk/fuse/rectangle.h
trunk/fuse/roms/Makefile.am
trunk/fuse/roms/se-0.rom
trunk/fuse/roms/se-1.rom
trunk/fuse/rzx.c
trunk/fuse/rzx.h
trunk/fuse/screenshot.c
trunk/fuse/screenshot.h
trunk/fuse/settings-header.pl
trunk/fuse/settings.dat
trunk/fuse/settings.pl
trunk/fuse/slt.c
trunk/fuse/slt.h
trunk/fuse/snapshot.c
trunk/fuse/snapshot.h
trunk/fuse/sound/Makefile.am
trunk/fuse/sound/alsasound.c
trunk/fuse/sound/aosound.c
trunk/fuse/sound/blipbuffer.h
trunk/fuse/sound/dxsound.c
trunk/fuse/sound/hpsound.c
trunk/fuse/sound/nullsound.c
trunk/fuse/sound/osssound.c
trunk/fuse/sound/sdlsound.c
trunk/fuse/sound/sunsound.c
trunk/fuse/sound/wiisound.c
trunk/fuse/sound/win32sound.c
trunk/fuse/sound.c
trunk/fuse/sound.h
trunk/fuse/spectrum.c
trunk/fuse/spectrum.h
trunk/fuse/tape.c
trunk/fuse/tape.h
trunk/fuse/timer/Makefile.am
trunk/fuse/timer/native.c
trunk/fuse/timer/sdl.c
trunk/fuse/timer/timer.c
trunk/fuse/timer/timer.h
trunk/fuse/ui/Makefile.am
trunk/fuse/ui/cocoa/cocoadisplay.m
trunk/fuse/ui/cocoa/cocoascreenshot.m
trunk/fuse/ui/cocoa/cocoaui.m
trunk/fuse/ui/cocoa/options-cocoa-header.pl
trunk/fuse/ui/cocoa/options-header.pl
trunk/fuse/ui/cocoa/options.pl
trunk/fuse/ui/fb/Makefile.am
trunk/fuse/ui/fb/fbdisplay.c
trunk/fuse/ui/fb/fbdisplay.h
trunk/fuse/ui/fb/fbjoystick.c
trunk/fuse/ui/fb/fbkeyboard.c
trunk/fuse/ui/fb/fbkeyboard.h
trunk/fuse/ui/fb/fbmouse.c
trunk/fuse/ui/fb/fbmouse.h
trunk/fuse/ui/fb/fbui.c
trunk/fuse/ui/gtk/Makefile.am
trunk/fuse/ui/gtk/binary.c
trunk/fuse/ui/gtk/browse.c
trunk/fuse/ui/gtk/confirm.c
trunk/fuse/ui/gtk/debugger.c
trunk/fuse/ui/gtk/fileselector.c
trunk/fuse/ui/gtk/gtkcompat.c
trunk/fuse/ui/gtk/gtkcompat.h
trunk/fuse/ui/gtk/gtkdisplay.c
trunk/fuse/ui/gtk/gtkinternals.h
trunk/fuse/ui/gtk/gtkjoystick.c
trunk/fuse/ui/gtk/gtkkeyboard.c
trunk/fuse/ui/gtk/gtkmouse.c
trunk/fuse/ui/gtk/gtkui.c
trunk/fuse/ui/gtk/memory.c
trunk/fuse/ui/gtk/options.pl
trunk/fuse/ui/gtk/picture.c
trunk/fuse/ui/gtk/pixmaps.c
trunk/fuse/ui/gtk/pokefinder.c
trunk/fuse/ui/gtk/pokemem.c
trunk/fuse/ui/gtk/rollback.c
trunk/fuse/ui/gtk/roms.c
trunk/fuse/ui/gtk/statusbar.c
trunk/fuse/ui/gtk/stock.c
trunk/fuse/ui/options.dat
trunk/fuse/ui/scaler/Makefile.am
trunk/fuse/ui/scaler/scaler.c
trunk/fuse/ui/scaler/scaler_hq2x.c
trunk/fuse/ui/scaler/scaler_hq3x.c
trunk/fuse/ui/scaler/scaler_internals.h
trunk/fuse/ui/scaler/scalers.c
trunk/fuse/ui/sdl/Makefile.am
trunk/fuse/ui/sdl/sdldisplay.c
trunk/fuse/ui/sdl/sdldisplay.h
trunk/fuse/ui/sdl/sdljoystick.c
trunk/fuse/ui/sdl/sdljoystick.h
trunk/fuse/ui/sdl/sdlkeyboard.c
trunk/fuse/ui/sdl/sdlkeyboard.h
trunk/fuse/ui/sdl/sdlui.c
trunk/fuse/ui/svga/Makefile.am
trunk/fuse/ui/svga/svgadisplay.c
trunk/fuse/ui/svga/svgadisplay.h
trunk/fuse/ui/svga/svgajoystick.c
trunk/fuse/ui/svga/svgakeyboard.c
trunk/fuse/ui/svga/svgakeyboard.h
trunk/fuse/ui/svga/svgaui.c
trunk/fuse/ui/ui.h
trunk/fuse/ui/uidisplay.h
trunk/fuse/ui/uijoystick.c
trunk/fuse/ui/uijoystick.h
trunk/fuse/ui/widget/Makefile.am
trunk/fuse/ui/widget/browse.c
trunk/fuse/ui/widget/debugger.c
trunk/fuse/ui/widget/error.c
trunk/fuse/ui/widget/filesel.c
trunk/fuse/ui/widget/memory.c
trunk/fuse/ui/widget/menu.c
trunk/fuse/ui/widget/mkfusefont.pl
trunk/fuse/ui/widget/options.pl
trunk/fuse/ui/widget/picture.c
trunk/fuse/ui/widget/pokefinder.c
trunk/fuse/ui/widget/pokemem.c
trunk/fuse/ui/widget/query.c
trunk/fuse/ui/widget/roms.c
trunk/fuse/ui/widget/select.c
trunk/fuse/ui/widget/text.c
trunk/fuse/ui/widget/widget.c
trunk/fuse/ui/widget/widget.h
trunk/fuse/ui/widget/widget_internals.h
trunk/fuse/ui/wii/Makefile.am
trunk/fuse/ui/wii/wiidisplay.c
trunk/fuse/ui/wii/wiidisplay.h
trunk/fuse/ui/wii/wiijoystick.c
trunk/fuse/ui/wii/wiikeyboard.c
trunk/fuse/ui/wii/wiikeyboard.h
trunk/fuse/ui/wii/wiikeysyms.h
trunk/fuse/ui/wii/wiimouse.c
trunk/fuse/ui/wii/wiimouse.h
trunk/fuse/ui/wii/wiiui.c
trunk/fuse/ui/win32/Makefile.am
trunk/fuse/ui/win32/about.c
trunk/fuse/ui/win32/about.h
trunk/fuse/ui/win32/binary.c
trunk/fuse/ui/win32/binary.h
trunk/fuse/ui/win32/browse.c
trunk/fuse/ui/win32/browse.h
trunk/fuse/ui/win32/confirm.c
trunk/fuse/ui/win32/debugger.c
trunk/fuse/ui/win32/debugger.h
trunk/fuse/ui/win32/debugger.rc
trunk/fuse/ui/win32/fileselector.c
trunk/fuse/ui/win32/hyperlinks.c
trunk/fuse/ui/win32/hyperlinks.h
trunk/fuse/ui/win32/memorybrowser.c
trunk/fuse/ui/win32/memorybrowser.h
trunk/fuse/ui/win32/options-resource.pl
trunk/fuse/ui/win32/options.pl
trunk/fuse/ui/win32/picture.c
trunk/fuse/ui/win32/picture.h
trunk/fuse/ui/win32/pokefinder.c
trunk/fuse/ui/win32/pokefinder.h
trunk/fuse/ui/win32/pokemem.c
trunk/fuse/ui/win32/pokemem.h
trunk/fuse/ui/win32/rollback.c
trunk/fuse/ui/win32/rollback.h
trunk/fuse/ui/win32/roms.c
trunk/fuse/ui/win32/roms.h
trunk/fuse/ui/win32/statusbar.c
trunk/fuse/ui/win32/win32display.c
trunk/fuse/ui/win32/win32internals.h
trunk/fuse/ui/win32/win32joystick.c
trunk/fuse/ui/win32/win32joystick.h
trunk/fuse/ui/win32/win32joystick.rc
trunk/fuse/ui/win32/win32keyboard.c
trunk/fuse/ui/win32/win32mouse.c
trunk/fuse/ui/win32/win32ui.c
trunk/fuse/ui/xlib/Makefile.am
trunk/fuse/ui/xlib/xdisplay.c
trunk/fuse/ui/xlib/xdisplay.h
trunk/fuse/ui/xlib/xerror.c
trunk/fuse/ui/xlib/xjoystick.c
trunk/fuse/ui/xlib/xkeyboard.c
trunk/fuse/ui/xlib/xkeyboard.h
trunk/fuse/ui/xlib/xstatusbar.pl
trunk/fuse/ui/xlib/xui.c
trunk/fuse/ui/xlib/xui.h
trunk/fuse/ui.c
trunk/fuse/uidisplay.c
trunk/fuse/unittests/Makefile.am
trunk/fuse/unittests/unittests.c
trunk/fuse/unittests/unittests.h
trunk/fuse/utils.c
trunk/fuse/utils.h
trunk/fuse/windres.rc
trunk/fuse/z80/Makefile.am
trunk/fuse/z80/coretest.c
trunk/fuse/z80/z80.c
trunk/fuse/z80/z80.h
trunk/fuse/z80/z80.pl
trunk/fuse/z80/z80_checks.h
trunk/fuse/z80/z80_macros.h
trunk/fuse/z80/z80_ops.c
Added Paths:
-----------
trunk/fuse/data/shell-completion/
trunk/fuse/data/win32/
trunk/fuse/fusepb/resources/Fuse Help/html/didaktik80.html
trunk/fuse/hacking/code_beautifiers.txt
trunk/fuse/hacking/uncrustify.cfg
trunk/fuse/lib/tests/success.d80.bz2
trunk/fuse/m4/ax_create_stdint_h.m4
trunk/fuse/peripherals/disk/didaktik.c
trunk/fuse/peripherals/disk/didaktik.h
trunk/fuse/peripherals/usource.c
trunk/fuse/peripherals/usource.h
trunk/fuse/svg.c
trunk/fuse/svg.h
trunk/fuse/ui/uimedia.h
trunk/fuse/uimedia.c
Removed Paths:
-------------
trunk/fuse/compat/amiga/Makefile.am
trunk/fuse/compat/linux/Makefile.am
trunk/fuse/compat/morphos/Makefile.am
trunk/fuse/compat/unix/Makefile.am
trunk/fuse/compat/wii/Makefile.am
trunk/fuse/compat/win32/Makefile.am
trunk/fuse/peripherals/disk/Makefile.am
trunk/fuse/peripherals/flash/Makefile.am
trunk/fuse/peripherals/ide/Makefile.am
trunk/fuse/peripherals/nic/Makefile.am
trunk/fuse/perl/Fuse/Makefile.am
trunk/fuse/ui/win32/fuse.manifest.in
trunk/fuse/ui/win32/icons/Makefile.am
trunk/fuse/ui/win32/installer/
trunk/fuse/winfuse.ico
trunk/fuse/z80/tests/Makefile.am
Property Changed:
----------------
trunk/fuse/
trunk/fuse/AUTHORS
trunk/fuse/COPYING
trunk/fuse/ChangeLog
trunk/fuse/INSTALL
trunk/fuse/Makefile.am
trunk/fuse/PORTING
trunk/fuse/README
trunk/fuse/THANKS
trunk/fuse/autogen.sh
trunk/fuse/bitmap.h
trunk/fuse/compat/Makefile.am
trunk/fuse/compat/amiga/osname.c
trunk/fuse/compat/amiga/paths.c
trunk/fuse/compat/dirname.c
trunk/fuse/compat/getopt.c
trunk/fuse/compat/getopt.h
trunk/fuse/compat/getopt1.c
trunk/fuse/compat/linux/paths.c
trunk/fuse/compat/mkstemp.c
trunk/fuse/compat/morphos/osname.c
trunk/fuse/compat/unix/dir.c
trunk/fuse/compat/unix/file.c
trunk/fuse/compat/unix/osname.c
trunk/fuse/compat/unix/paths.c
trunk/fuse/compat/unix/socket.c
trunk/fuse/compat/unix/timer.c
trunk/fuse/compat/unix/tuntap.c
trunk/fuse/compat/wii/dir.c
trunk/fuse/compat/wii/osname.c
trunk/fuse/compat/wii/paths.c
trunk/fuse/compat/wii/timer.c
trunk/fuse/compat/win32/osname.c
trunk/fuse/compat/win32/paths.c
trunk/fuse/compat/win32/socket.c
trunk/fuse/compat/win32/timer.c
trunk/fuse/compat.h
trunk/fuse/configure.ac
trunk/fuse/data/Makefile.am
trunk/fuse/debugger/Makefile.am
trunk/fuse/debugger/breakpoint.c
trunk/fuse/debugger/breakpoint.h
trunk/fuse/debugger/command.c
trunk/fuse/debugger/debugger.c
trunk/fuse/debugger/debugger.h
trunk/fuse/debugger/debugger_internals.h
trunk/fuse/debugger/disassemble.c
trunk/fuse/debugger/event.c
trunk/fuse/debugger/expression.c
trunk/fuse/debugger/variable.c
trunk/fuse/display.c
trunk/fuse/display.h
trunk/fuse/event.c
trunk/fuse/event.h
trunk/fuse/fuse.c
trunk/fuse/fuse.h
trunk/fuse/hacking/Makefile.am
trunk/fuse/input.c
trunk/fuse/input.h
trunk/fuse/keyboard.c
trunk/fuse/keyboard.h
trunk/fuse/keysyms.dat
trunk/fuse/keysyms.pl
trunk/fuse/lib/Makefile.am
trunk/fuse/loader.c
trunk/fuse/loader.h
trunk/fuse/m4/ax_pthread.m4
trunk/fuse/m4/glib-2.0.m4
trunk/fuse/m4/gtk-2.0.m4
trunk/fuse/m4/libxml.m4
trunk/fuse/m4/pkg.m4
trunk/fuse/m4/sdl.m4
trunk/fuse/machine.c
trunk/fuse/machine.h
trunk/fuse/machines/Makefile.am
trunk/fuse/machines/machines.h
trunk/fuse/machines/machines_periph.c
trunk/fuse/machines/machines_periph.h
trunk/fuse/machines/pentagon.c
trunk/fuse/machines/pentagon.h
trunk/fuse/machines/pentagon1024.c
trunk/fuse/machines/pentagon512.c
trunk/fuse/machines/scorpion.c
trunk/fuse/machines/scorpion.h
trunk/fuse/machines/spec128.c
trunk/fuse/machines/spec128.h
trunk/fuse/machines/spec16.c
trunk/fuse/machines/spec48.c
trunk/fuse/machines/spec48.h
trunk/fuse/machines/spec48_ntsc.c
trunk/fuse/machines/spec_se.c
trunk/fuse/machines/specplus2.c
trunk/fuse/machines/specplus2a.c
trunk/fuse/machines/specplus3.c
trunk/fuse/machines/specplus3.h
trunk/fuse/machines/specplus3e.c
trunk/fuse/machines/tc2048.c
trunk/fuse/machines/tc2068.c
trunk/fuse/machines/tc2068.h
trunk/fuse/machines/ts2068.c
trunk/fuse/man/Makefile.am
trunk/fuse/man/fuse.1
trunk/fuse/memory.c
trunk/fuse/memory.h
trunk/fuse/mempool.c
trunk/fuse/mempool.h
trunk/fuse/menu.c
trunk/fuse/menu.h
trunk/fuse/menu_data.dat
trunk/fuse/menu_data.pl
trunk/fuse/module.c
trunk/fuse/module.h
trunk/fuse/movie.c
trunk/fuse/movie.h
trunk/fuse/movie_tables.h
trunk/fuse/periph.c
trunk/fuse/periph.h
trunk/fuse/peripherals/Makefile.am
trunk/fuse/peripherals/ay.c
trunk/fuse/peripherals/ay.h
trunk/fuse/peripherals/dck.c
trunk/fuse/peripherals/dck.h
trunk/fuse/peripherals/disk/beta.c
trunk/fuse/peripherals/disk/beta.h
trunk/fuse/peripherals/disk/crc.c
trunk/fuse/peripherals/disk/crc.h
trunk/fuse/peripherals/disk/disciple.c
trunk/fuse/peripherals/disk/disciple.h
trunk/fuse/peripherals/disk/disk.c
trunk/fuse/peripherals/disk/disk.h
trunk/fuse/peripherals/disk/fdd.c
trunk/fuse/peripherals/disk/fdd.h
trunk/fuse/peripherals/disk/opus.c
trunk/fuse/peripherals/disk/opus.h
trunk/fuse/peripherals/disk/plusd.c
trunk/fuse/peripherals/disk/plusd.h
trunk/fuse/peripherals/disk/upd_fdc.c
trunk/fuse/peripherals/disk/upd_fdc.h
trunk/fuse/peripherals/disk/wd_fdc.c
trunk/fuse/peripherals/disk/wd_fdc.h
trunk/fuse/peripherals/flash/am29f010.c
trunk/fuse/peripherals/flash/am29f010.h
trunk/fuse/peripherals/fuller.c
trunk/fuse/peripherals/fuller.h
trunk/fuse/peripherals/ide/divide.c
trunk/fuse/peripherals/ide/divide.h
trunk/fuse/peripherals/ide/ide.c
trunk/fuse/peripherals/ide/ide.h
trunk/fuse/peripherals/ide/simpleide.c
trunk/fuse/peripherals/ide/simpleide.h
trunk/fuse/peripherals/ide/zxatasp.c
trunk/fuse/peripherals/ide/zxatasp.h
trunk/fuse/peripherals/ide/zxcf.c
trunk/fuse/peripherals/ide/zxcf.h
trunk/fuse/peripherals/if1.c
trunk/fuse/peripherals/if1.h
trunk/fuse/peripherals/if2.c
trunk/fuse/peripherals/if2.h
trunk/fuse/peripherals/joystick.c
trunk/fuse/peripherals/joystick.h
trunk/fuse/peripherals/kempmouse.c
trunk/fuse/peripherals/kempmouse.h
trunk/fuse/peripherals/melodik.c
trunk/fuse/peripherals/melodik.h
trunk/fuse/peripherals/nic/enc28j60.c
trunk/fuse/peripherals/nic/enc28j60.h
trunk/fuse/peripherals/nic/w5100.c
trunk/fuse/peripherals/nic/w5100.h
trunk/fuse/peripherals/nic/w5100_internals.h
trunk/fuse/peripherals/nic/w5100_socket.c
trunk/fuse/peripherals/printer.c
trunk/fuse/peripherals/printer.h
trunk/fuse/peripherals/scld.c
trunk/fuse/peripherals/scld.h
trunk/fuse/peripherals/speccyboot.c
trunk/fuse/peripherals/speccyboot.h
trunk/fuse/peripherals/specdrum.c
trunk/fuse/peripherals/specdrum.h
trunk/fuse/peripherals/spectranet.c
trunk/fuse/peripherals/spectranet.h
trunk/fuse/peripherals/ula.c
trunk/fuse/peripherals/ula.h
trunk/fuse/perl/Makefile.am
trunk/fuse/perl/cpp-perl.pl
trunk/fuse/pokefinder/Makefile.am
trunk/fuse/pokefinder/pokefinder.c
trunk/fuse/pokefinder/pokefinder.h
trunk/fuse/pokefinder/pokemem.c
trunk/fuse/pokefinder/pokemem.h
trunk/fuse/profile.c
trunk/fuse/profile.h
trunk/fuse/psg.c
trunk/fuse/psg.h
trunk/fuse/rectangle.c
trunk/fuse/rectangle.h
trunk/fuse/roms/Makefile.am
trunk/fuse/rzx.c
trunk/fuse/rzx.h
trunk/fuse/screenshot.c
trunk/fuse/screenshot.h
trunk/fuse/settings-header.pl
trunk/fuse/settings.dat
trunk/fuse/settings.pl
trunk/fuse/slt.c
trunk/fuse/slt.h
trunk/fuse/snapshot.c
trunk/fuse/snapshot.h
trunk/fuse/sound/Makefile.am
trunk/fuse/sound/alsasound.c
trunk/fuse/sound/aosound.c
trunk/fuse/sound/blipbuffer.c
trunk/fuse/sound/blipbuffer.h
trunk/fuse/sound/coreaudiosound.c
trunk/fuse/sound/dxsound.c
trunk/fuse/sound/hpsound.c
trunk/fuse/sound/nullsound.c
trunk/fuse/sound/osssound.c
trunk/fuse/sound/sdlsound.c
trunk/fuse/sound/sfifo.c
trunk/fuse/sound/sfifo.h
trunk/fuse/sound/sunsound.c
trunk/fuse/sound/wiisound.c
trunk/fuse/sound/win32sound.c
trunk/fuse/sound.c
trunk/fuse/sound.h
trunk/fuse/spectrum.c
trunk/fuse/spectrum.h
trunk/fuse/tape.c
trunk/fuse/tape.h
trunk/fuse/timer/Makefile.am
trunk/fuse/timer/native.c
trunk/fuse/timer/sdl.c
trunk/fuse/timer/timer.c
trunk/fuse/timer/timer.h
trunk/fuse/ui/Makefile.am
trunk/fuse/ui/fb/Makefile.am
trunk/fuse/ui/fb/fbdisplay.c
trunk/fuse/ui/fb/fbdisplay.h
trunk/fuse/ui/fb/fbjoystick.c
trunk/fuse/ui/fb/fbkeyboard.c
trunk/fuse/ui/fb/fbkeyboard.h
trunk/fuse/ui/fb/fbmouse.c
trunk/fuse/ui/fb/fbmouse.h
trunk/fuse/ui/fb/fbui.c
trunk/fuse/ui/gtk/Makefile.am
trunk/fuse/ui/gtk/binary.c
trunk/fuse/ui/gtk/browse.c
trunk/fuse/ui/gtk/confirm.c
trunk/fuse/ui/gtk/debugger.c
trunk/fuse/ui/gtk/fileselector.c
trunk/fuse/ui/gtk/gtkcompat.c
trunk/fuse/ui/gtk/gtkcompat.h
trunk/fuse/ui/gtk/gtkdisplay.c
trunk/fuse/ui/gtk/gtkinternals.h
trunk/fuse/ui/gtk/gtkjoystick.c
trunk/fuse/ui/gtk/gtkkeyboard.c
trunk/fuse/ui/gtk/gtkmouse.c
trunk/fuse/ui/gtk/gtkui.c
trunk/fuse/ui/gtk/memory.c
trunk/fuse/ui/gtk/options-header.pl
trunk/fuse/ui/gtk/options.pl
trunk/fuse/ui/gtk/picture.c
trunk/fuse/ui/gtk/pixmaps.c
trunk/fuse/ui/gtk/pokefinder.c
trunk/fuse/ui/gtk/pokemem.c
trunk/fuse/ui/gtk/rollback.c
trunk/fuse/ui/gtk/roms.c
trunk/fuse/ui/gtk/statusbar.c
trunk/fuse/ui/gtk/stock.c
trunk/fuse/ui/options.dat
trunk/fuse/ui/scaler/Makefile.am
trunk/fuse/ui/scaler/scaler.c
trunk/fuse/ui/scaler/scaler.h
trunk/fuse/ui/scaler/scaler_hq2x.c
trunk/fuse/ui/scaler/scaler_hq3x.c
trunk/fuse/ui/scaler/scaler_internals.h
trunk/fuse/ui/scaler/scalers.c
trunk/fuse/ui/sdl/Makefile.am
trunk/fuse/ui/sdl/sdldisplay.c
trunk/fuse/ui/sdl/sdldisplay.h
trunk/fuse/ui/sdl/sdljoystick.c
trunk/fuse/ui/sdl/sdljoystick.h
trunk/fuse/ui/sdl/sdlkeyboard.c
trunk/fuse/ui/sdl/sdlkeyboard.h
trunk/fuse/ui/sdl/sdlui.c
trunk/fuse/ui/svga/Makefile.am
trunk/fuse/ui/svga/svgadisplay.c
trunk/fuse/ui/svga/svgadisplay.h
trunk/fuse/ui/svga/svgajoystick.c
trunk/fuse/ui/svga/svgakeyboard.c
trunk/fuse/ui/svga/svgakeyboard.h
trunk/fuse/ui/svga/svgaui.c
trunk/fuse/ui/ui.h
trunk/fuse/ui/uidisplay.h
trunk/fuse/ui/uijoystick.c
trunk/fuse/ui/uijoystick.h
trunk/fuse/ui/widget/Makefile.am
trunk/fuse/ui/widget/browse.c
trunk/fuse/ui/widget/debugger.c
trunk/fuse/ui/widget/error.c
trunk/fuse/ui/widget/filesel.c
trunk/fuse/ui/widget/memory.c
trunk/fuse/ui/widget/menu.c
trunk/fuse/ui/widget/mkfusefont.pl
trunk/fuse/ui/widget/options-header.pl
trunk/fuse/ui/widget/options.pl
trunk/fuse/ui/widget/picture.c
trunk/fuse/ui/widget/pokefinder.c
trunk/fuse/ui/widget/pokemem.c
trunk/fuse/ui/widget/query.c
trunk/fuse/ui/widget/roms.c
trunk/fuse/ui/widget/select.c
trunk/fuse/ui/widget/text.c
trunk/fuse/ui/widget/widget.c
trunk/fuse/ui/widget/widget.h
trunk/fuse/ui/widget/widget_internals.h
trunk/fuse/ui/wii/Makefile.am
trunk/fuse/ui/wii/wiidisplay.c
trunk/fuse/ui/wii/wiidisplay.h
trunk/fuse/ui/wii/wiijoystick.c
trunk/fuse/ui/wii/wiikeyboard.c
trunk/fuse/ui/wii/wiikeyboard.h
trunk/fuse/ui/wii/wiikeysyms.h
trunk/fuse/ui/wii/wiimouse.c
trunk/fuse/ui/wii/wiimouse.h
trunk/fuse/ui/wii/wiiui.c
trunk/fuse/ui/win32/Makefile.am
trunk/fuse/ui/win32/about.c
trunk/fuse/ui/win32/about.h
trunk/fuse/ui/win32/binary.c
trunk/fuse/ui/win32/binary.h
trunk/fuse/ui/win32/browse.c
trunk/fuse/ui/win32/browse.h
trunk/fuse/ui/win32/confirm.c
trunk/fuse/ui/win32/debugger.c
trunk/fuse/ui/win32/debugger.h
trunk/fuse/ui/win32/fileselector.c
trunk/fuse/ui/win32/hyperlinks.c
trunk/fuse/ui/win32/hyperlinks.h
trunk/fuse/ui/win32/memorybrowser.c
trunk/fuse/ui/win32/memorybrowser.h
trunk/fuse/ui/win32/options-header.pl
trunk/fuse/ui/win32/options-resource.pl
trunk/fuse/ui/win32/options.pl
trunk/fuse/ui/win32/picture.c
trunk/fuse/ui/win32/picture.h
trunk/fuse/ui/win32/pokefinder.c
trunk/fuse/ui/win32/pokefinder.h
trunk/fuse/ui/win32/pokemem.c
trunk/fuse/ui/win32/pokemem.h
trunk/fuse/ui/win32/rollback.c
trunk/fuse/ui/win32/rollback.h
trunk/fuse/ui/win32/roms.c
trunk/fuse/ui/win32/roms.h
trunk/fuse/ui/win32/select_template.h
trunk/fuse/ui/win32/statusbar.c
trunk/fuse/ui/win32/win32display.c
trunk/fuse/ui/win32/win32internals.h
trunk/fuse/ui/win32/win32joystick.c
trunk/fuse/ui/win32/win32joystick.h
trunk/fuse/ui/win32/win32keyboard.c
trunk/fuse/ui/win32/win32mouse.c
trunk/fuse/ui/win32/win32ui.c
trunk/fuse/ui/xlib/Makefile.am
trunk/fuse/ui/xlib/xdisplay.c
trunk/fuse/ui/xlib/xdisplay.h
trunk/fuse/ui/xlib/xerror.c
trunk/fuse/ui/xlib/xjoystick.c
trunk/fuse/ui/xlib/xkeyboard.c
trunk/fuse/ui/xlib/xkeyboard.h
trunk/fuse/ui/xlib/xstatusbar.pl
trunk/fuse/ui/xlib/xui.c
trunk/fuse/ui/xlib/xui.h
trunk/fuse/ui.c
trunk/fuse/uidisplay.c
trunk/fuse/unittests/Makefile.am
trunk/fuse/unittests/unittests.c
trunk/fuse/unittests/unittests.h
trunk/fuse/utils.c
trunk/fuse/utils.h
trunk/fuse/windres.rc
trunk/fuse/z80/Makefile.am
trunk/fuse/z80/coretest.c
trunk/fuse/z80/opcodes_base.dat
trunk/fuse/z80/opcodes_cb.dat
trunk/fuse/z80/opcodes_ddfd.dat
trunk/fuse/z80/opcodes_ddfdcb.dat
trunk/fuse/z80/opcodes_ed.dat
trunk/fuse/z80/z80.c
trunk/fuse/z80/z80.h
trunk/fuse/z80/z80.pl
trunk/fuse/z80/z80_checks.h
trunk/fuse/z80/z80_macros.h
trunk/fuse/z80/z80_ops.c
Index: trunk/fuse
===================================================================
--- trunk/fuse 2016-05-25 11:30:52 UTC (rev 803)
+++ trunk/fuse 2016-06-01 10:46:07 UTC (rev 804)
Property changes on: trunk/fuse
___________________________________________________________________
Modified: svn:mergeinfo
## -1,5 +1,5 ##
/vendor/fuse-emulator/0.10.0/fuse:556-557
/vendor/fuse-emulator/0.10.0-pre1/fuse:545-546
-/vendor/fuse-emulator/current/fuse:530-761
+/vendor/fuse-emulator/current/fuse:530-803
/vendor/fuse-emulator/fuse-1.0.0a/fuse:668-669
/vendor/fuse-emulator/fuse-r4617/fuse:686
\ No newline at end of property
Modified: trunk/fuse/AUTHORS
===================================================================
--- trunk/fuse/AUTHORS 2016-05-25 11:30:52 UTC (rev 803)
+++ trunk/fuse/AUTHORS 2016-06-01 10:46:07 UTC (rev 804)
@@ -11,7 +11,7 @@
* John Elliott: for lib765, which provided Fuse's original emulation of the
+3's FDC, and libdsk which provided support for more disk image formats:
- see http://www.seasip.demon.co.uk/Unix/LibDsk/
+ see http://www.seasip.info/Unix/LibDsk/index.html
* Darren Salt: the original versions of the code for +3 emulation,
SLT support, MITSHM support (for the Xlib UI), TZX raw data blocks,
@@ -41,8 +41,8 @@
* Garry Lancaster: the simple 8-bit IDE, ZXATASP and ZXCF support.
-* Gergely Szasz: +3, +D, Opus and Interface 1/Microdrive emulation, the 'movie'
- code and the ao sound driver.
+* Gergely Szasz: +3, +D, Opus, Didaktik 80 and Interface 1/Microdrive emulation,
+ the 'movie' code and the ALSO and ao sound drivers.
* Bjoern Giesler: the original Wii port.
@@ -54,4 +54,4 @@
* Philip Kendall: everything else.
-$Id: AUTHORS 4972 2013-05-19 16:46:43Z zubzero $
+$Id: AUTHORS 5357 2016-02-23 23:43:54Z sbaldovi $
Property changes on: trunk/fuse/AUTHORS
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/fuse/COPYING
===================================================================
--- trunk/fuse/COPYING 2016-05-25 11:30:52 UTC (rev 803)
+++ trunk/fuse/COPYING 2016-06-01 10:46:07 UTC (rev 804)
Property changes on: trunk/fuse/COPYING
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/fuse/ChangeLog
===================================================================
--- trunk/fuse/ChangeLog 2016-05-25 11:30:52 UTC (rev 803)
+++ trunk/fuse/ChangeLog 2016-06-01 10:46:07 UTC (rev 804)
@@ -1,3 +1,172 @@
+2016-??-?? Philip Kendall <phi...@sh...>
+
+ * Fuse 1.2.0 released.
+
+ * New features:
+ * Add Currah µSource emulation (Stuart Brady).
+ * Add Didaktik 80/40 emulation (Gergely Szasz).
+ * Capture BASIC video functions to SVG file (Stefano Bodrato).
+ * Support bash completion (Sergio Baldoví).
+
+ * Emulation core improvements:
+ * Allow continuing RZX recordings if there is a final snapshot in the
+ RZX (Sergio Baldoví).
+ * Fix the prune function on RZX rollback (Sergio Baldoví).
+ * Fix loading of EDSK files with Sector Offset block (Sergio Baldoví).
+ * Fix speech in Cobra's Arc - Medium Case.tzx when loaded with tape
+ traps enabled (thanks, zx81 and Sergio Baldoví) (Fredrick Meunier).
+ * Migrate disk "index event" handling to the FDD layer and have the
+ FDC layer use it for their STATUS registers (Gergely Szasz).
+ * Set AF, AF' and SP to 0xffff on reset (Stuart Brady).
+ * Leave most registers unchanged on a soft reset (Stuart Brady).
+ * Emulate interrupt and NMI timings more precisely (Stuart Brady).
+ * Emulate NMOS and CMOS Z80 variants (Stuart Brady).
+ * Switch to 2KB page size (Stuart Brady).
+ * Implement WD2797 emulation (Gergely Szasz).
+ * Skip tape traps if VERIFY is requested (UB880D).
+ * Fix inaccurate output when AY envelopes are used (Matthew Westcott
+ and Fredrick Meunier)
+ * Fix some peripherals activation when loading snapshots (Sergio
+ Baldoví).
+ * Fix loading sound with some custom loaders (Fredrick Meunier).
+ * Centralise the "Disk icon" update code to the FDD layer (Gergely
+ Szasz).
+ * Check if data blocks are headers for handling PZX files (Fredrick
+ Meunier).
+ * Correct display of pulses in PZX pulse block for tape browser
+ (Fredrick Meunier).
+ * Fix disk image corruption after saving UDI files (Sergio Baldoví).
+ * Check ready status after loading a disk into floppy disk drive
+ (thanks, John Elliott) (Sergio Baldoví).
+ * Fix overlapped SEEK commands (Sergio Baldoví).
+ * Fix length of data returned by READ_DIAG (thanks, Fredrick Meunier)
+ (Sergio Baldoví).
+
+ * Machine specific improvements:
+ * The Timex SCLD is contended in all of the home, Dock and Exrom banks
+ in the 0x4000 - 0x7FFF range (thanks, rga24 from WoS) (Fredrick
+ Meunier).
+ * Clear all Opus RAM on hard reset (Stuart Brady).
+ * Ensure the ZX Printer does not require a hard reset to enable
+ (thanks, RMartins) (Fredrick Meunier).
+ * Fix timing of events when emulating Scorpion (Stuart Brady).
+ * Ensure we have successfully selected a Pentagon or a Timex machine
+ before inserting their media (Fredrick Meunier).
+ * Fix Beta 128 type II commands (thanks, windale and BogDan Vatra)
+ (Sergio Baldoví).
+ * Don't enable the Beta 128 interface when loading a snapshot on a
+ machine with Beta built-in (thanks, windale and BogDan Vatra)
+ (Fredrick Meunier).
+ * Lock port +3 1FFDh if paging is disabled (Brian Ruthven and Fredrick
+ Meunier).
+ * Spectranet: fix segfault in error handling when setting SO_REUSEADDR
+ (Stuart Brady).
+ * Prefer Scorpion to Pentagon when loading SCL/TRD disks for better
+ timing compatibility (part of feature request #90) (thanks, windale)
+ (Sergio Baldoví).
+ * Update SE ROMs to v4.07 (thanks, Andrew Owen) (Sergio Baldoví).
+
+ * Debugger improvements:
+ * Fix disassembly of LD (HL), LD (IX) and LD (IY) (BogDan Vatra).
+ * Add I and R register setting and getting to the debugger (Sergio
+ Baldoví).
+ * Show the status of the halted flag in the debugger (Stuart Brady).
+ * Fix time breakpoints later than a frame in the future (Sergio
+ Baldoví).
+ * Timex EXROM and Dock text was truncated in the debugger UI (thanks,
+ Andrew Owen and Sergio Baldoví) (Fredrick Meunier).
+ * Don't trap on breakpoints whilst halted (Stuart Brady).
+ * Win32: relocate halted flag and set monospaced font (Sergio
+ Baldoví).
+ * Fix memory issues when removing a matched breakpoint (Tom Seddon).
+ * Signal the UI when the breakpoints list is changed (BogDan Vatra).
+ * Document IF token for conditional expressions in debugger section
+ (thanks, TK90XFan) (Sergio Baldoví).
+ * Fix documentation of address syntax used in debugger section
+ (Sergio Baldoví).
+ * Allow debugger to dereference memory locations (Philip Kendall).
+
+ * Miscellaneous improvements:
+ * Remove warnings in aosound (Rene Ladan).
+ * Fix save tape traps with SE ROM (Andrew Owen and Fredrick Meunier).
+ * Don't ignore the return code from setuid() (Sergio Baldoví).
+ * Fix condition used in --with-desktop-dir option (thanks, wiz)
+ (Sergio Baldoví).
+ * Fix uninitialised keyboard button settings in GTK UI (UB880D).
+ * Fix pause when minimising Fuse on Windows (Sergio Baldoví).
+ * Generic FDD UI handling cleanup (Alex Badea).
+ * Remove unused macros on disk peripherals (Sergio Baldoví).
+ * Fix bad prototypes for activate signal on GTK UI (Sergio Baldoví).
+ * Ensure exiting on GTK UI when there are active breakpoints (Sergio
+ Baldoví).
+ * Improve scrolling of disassembly list on Win32 UI (Sergio Baldoví).
+ * Make mousewheel scrolling on memory browser GTK+ 3.4 compatible and
+ keep the selected row (Sergio Baldoví).
+ * Ignore unused-but-set-variable warnings for option dialogs on Win32
+ UI (Sergio Baldoví).
+ * Link to autoload snapshot for NTSC Spectrum (Sergio Baldoví).
+ * Fix desktop integration rules to cope with VPATH builds (Sergio
+ Baldoví).
+ * Modernise autoconf support (Sergio Baldoví Baldoví).
+ * Use unzipped tapes for peripheral tests (thanks, Phil Reynolds)
+ (Sergio Baldoví).
+ * Fix empty list in pokefinder on GTK+ 3 (Sergio Baldoví).
+ * Prefer GTK+ 3 to GTK+ 2 (Sergio Baldoví).
+ * Abort start if we can't drop root privileges (Fredrick Meunier).
+ * Use real GLib if and only if libspectrum does and make GTK+ UI
+ depend on real GLib (Stuart Brady).
+ * Split tape/Microdrive options into a new Media Options dialogue
+ (Stuart Brady).
+ * Fix memory leak in joystick UI (Sergio Baldoví).
+ * Don't show an error when rewinding an empty tape (Sergio Baldoví).
+ * GTK UI: clear out row mark in tape browser when selecting another
+ block (Sergio Baldoví).
+ * Add missing const qualifiers and casts (Stuart and Sergio Baldoví).
+ * Split Select ROMs menu into Machines and Peripherals (Gergely
+ Szasz).
+ * Only try to load the fallback ROM if it is different to the standard
+ one (Fredrick Meunier).
+ * Use PATH_MAX instead of FILENAME_MAX as our standard compatibility
+ define (thanks, Brian Ruthven) (Fredrick Meunier).
+ * WidgetUI: Fix build on Solaris (thanks, Brian Ruthven) (Fredrick
+ Meunier).
+ * Fix C89 compilation (Adrien Destugues).
+ * Standardise the number of joystick buttons across UIs (UB880D).
+ * Add static to functions where appropriate (Stuart Brady).
+ * Track port attachment for each data bus line (Stuart Brady).
+ * Switch to using non-recursive makefile (thanks, Stuart Brady)
+ (Sergio Baldoví).
+ * Move Windows resources that are UI-independent to data/win32
+ (Sergio Baldoví).
+ * Fix segfault due to inconsistent SETUP_CHECK() and CHECK() ordering
+ (UB880D; thanks, Guesser).
+ * Rename 'Interface I' to 'Interface 1' (thanks, Stuart Brady) (Sergio
+ Baldoví).
+ * Win32: fix compilation with mingwrt 4.0+ (Kirben).
+ * Replace various deprecated GTK+ functions: gtk_widget_modify_font,
+ GtkStock, gtk_tree_view_set_rules_hint(),
+ deprecated gdk_cursor_new() (Sergio Baldoví).
+ * Remove obsolete gtk_window_set_wmclass (Sergio Baldoví).
+ * Update URLs in documentation (Sergio Baldoví).
+ * Win32 UI: fix compilation with MinGW-w64 toolchain (lordhoto).
+ * Fix the build of SDL UI on Windows (Sergio Baldoví).
+ * Use compat_file_exists() instead of stat() in read_config_file() and
+ utils_find_file_path() (BogDan Vatra).
+ * Fix fdd_strerror() reading past the end of the fdd_error array
+ (BogDan Vatra).
+ * Use tape traps if we are using a custom ROM if the instructions at
+ the entry points have been preserved (thanks, Alberto Garcia)
+ (Fredrick Meunier).
+ * GTK+ and Win32 UI: add file filters in open/save dialogs (thanks,
+ Crisis) (Sergio Baldoví).
+ * Don't show hidden files/directories in the file selector on Widget
+ UIs (Sergio Baldoví).
+ * Remember filename when saving a recently formatted disk (Sergio
+ Baldoví).
+ * GTK UI: Change the resizing method for GTK+ UI for better
+ compatibility with GTK+ 3.20+ (thanks, Alberto Garcia) (Sergio
+ Baldoví).
+
2013-05-24 Philip Kendall <phi...@sh...>
* Fuse 1.1.1 released.
@@ -1119,4 +1288,4 @@
* Version 0.1.0 released.
-$Id: ChangeLog 4995 2013-05-24 19:54:19Z zubzero $
+$Id: ChangeLog 5519 2016-05-23 19:15:02Z pak21 $
Property changes on: trunk/fuse/ChangeLog
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/fuse/INSTALL
===================================================================
--- trunk/fuse/INSTALL 2016-05-25 11:30:52 UTC (rev 803)
+++ trunk/fuse/INSTALL 2016-06-01 10:46:07 UTC (rev 804)
@@ -64,8 +64,7 @@
./configure --target=powerpc-gekko --host=powerpc-gekko \
--with-wii \
- --without-libxml2 --without-libiconv --without-gpm \
- --without-x --without-glib \
+ --without-libxml2 --without-libiconv --without-gpm --without-x \
CFLAGS="-g -I$DEVKITPPC/include -I$DEVKITPRO/libogc/include -DGEKKO" \
LDFLAGS="-g -mrvl -mcpu=750 -meabi -mhard-float \
-Wl,-Map,fuse.elf.map -L$DEVKITPPC/lib \
@@ -82,8 +81,8 @@
Building the Win32 version of Fuse
----------------------------------
-You'll need to have the MinGW <http://www.mingw.org> or MinGW-w64 toolchain
-<http://mingw-w64.sourceforge.net>, e.g., on Debian:
+You'll need to have the MinGW <http://www.mingw.org/> or Mingw-w64 toolchain
+<http://mingw-w64.org/>, e.g., on Debian:
`apt-get install mingw32 mingw32-binutils mingw32-runtime'
On Windows, besides the former toolchain, you'll need an environment that
@@ -91,21 +90,21 @@
Cygwin <http://cygwin.com>.
The next examples build libspectrum and Fuse without any external library for
-the sake of clarity, but all these libraries successfully compile with MingGW
+the sake of clarity, but all these libraries successfully compile with a MinGW
environment - in case of problems with compiling any of the libs please refer to
the lib's homepage for help.
1) On Linux, first have to compile libspectrum:
./configure --host=i586-mingw32msvc --without-libaudiofile --without-zlib \
- --without-libgcrypt --without-bzip2 --without-glib --prefix=`pwd`
+ --without-libgcrypt --without-bzip2 --with-fake-glib --prefix=`pwd`
make install
This should `install' into the source directory.
Then, compile Fuse:
-./configure --host=i586-mingw32msvc --without-glib --prefix=`pwd` \
+./configure --host=i586-mingw32msvc --prefix=`pwd` \
--with-libspectrum-prefix=`pwd`/../libspectrum --with-win32 \
--without-libxml2 --without-zlib --without-png --without-x
make
@@ -119,28 +118,28 @@
2) On Windows, using MSYS + MinGW toolchain, first build libspectrum:
-./configure --without-glib --without-libaudiofile --without-libgcrypt \
+./configure --with-fake-glib --without-libaudiofile --without-libgcrypt \
--without-zlib --without-bzip2 --prefix=/usr/local
make install
Then, build Fuse:
-./configure --with-win32 --without-glib --without-libxml2 --without-zlib \
- --without-png --prefix=/usr/local
+./configure --with-win32 --without-libxml2 --without-zlib --without-png \
+ --prefix=/usr/local
make
-3) On Windows, using Cygwin + MinGW toolchain, first build libspectrum:
+3) On Windows, using Cygwin + Mingw-w64 toolchain, first build libspectrum:
-./configure --build=i686-pc-cygwin --host=i686-pc-mingw32 --without-glib \
+./configure --build=i686-pc-cygwin --host=i686-w64-mingw32 --with-fake-glib \
--without-libaudiofile --without-libgcrypt --without-zlib \
- --without-bzip2 --prefix=/usr/local/i686-pc
+ --without-bzip2 --prefix=/usr/local/i686-w64-mingw32
make install
Then, build Fuse:
-./configure --build=i686-pc-cygwin --host=i686-pc-mingw32 --with-win32 \
- --without-glib --without-libxml2 --without-zlib --without-png \
- --prefix=/usr/local/i686-pc
+./configure --build=i686-pc-cygwin --host=i686-w64-mingw32 --without-libxml2 \
+ --without-zlib --without-png --with-win32 \
+ --prefix=/usr/local/i686-w64-mingw32
make
Note: you need `libspectrum-8.dll' and the `roms' directory and the `lib'
@@ -162,4 +161,4 @@
respectively. That will make a temporary subdirectory (fuse-VERSION-win32)
in the build directory and then will create a package.
-$Id: INSTALL 4763 2012-11-16 11:01:59Z fredm $
+$Id: INSTALL 5407 2016-04-25 21:59:53Z sbaldovi $
Property changes on: trunk/fuse/INSTALL
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/fuse/Makefile.am
===================================================================
--- trunk/fuse/Makefile.am 2016-05-25 11:30:52 UTC (rev 803)
+++ trunk/fuse/Makefile.am 2016-06-01 10:46:07 UTC (rev 804)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
-## Copyright (c) 1999-2009 Philip Kendall
+## Copyright (c) 1999-2015 Philip Kendall
-## $Id: Makefile.am 5003 2013-05-26 16:24:03Z sbaldovi $
+## $Id: Makefile.am 5434 2016-05-01 04:22:45Z fredm $
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -21,45 +21,12 @@
##
## E-mail: phi...@sh...
-AUTOMAKE_OPTIONS = foreign
-
ACLOCAL_AMFLAGS = -I m4
bin_PROGRAMS = fuse
-SUBDIRS = @COMPAT_SUBDIR@ \
- data \
- debugger \
- hacking \
- lib \
- machines \
- man \
- peripherals \
- perl \
- pokefinder \
- roms \
- sound \
- timer \
- ui \
- unittests \
- z80
+noinst_PROGRAMS =
-DIST_SUBDIRS = data \
- debugger \
- hacking \
- lib \
- machines \
- man \
- peripherals \
- perl \
- pokefinder \
- roms \
- sound \
- timer \
- ui \
- unittests \
- z80
-
fuse_SOURCES = display.c \
event.c \
fuse.c \
@@ -83,94 +50,49 @@
snapshot.c \
sound.c \
spectrum.c \
+ svg.c \
tape.c \
ui.c \
uidisplay.c \
+ uimedia.c \
utils.c
-if COMPAT_DIRNAME
-fuse_SOURCES += compat/dirname.c
-endif
+fuse_LDADD = \
+ $(PTHREAD_LIBS) \
+ $(LIBSPEC_LIBS) \
+ $(GTK_LIBS) \
+ $(GLIB_LIBS) \
+ $(PNG_LIBS) \
+ $(SDL_LIBS) \
+ $(X_LIBS) \
+ $(XML_LIBS)
-if COMPAT_GETOPT
-fuse_SOURCES += compat/getopt.c compat/getopt1.c
-endif
+fuse_DEPENDENCIES =
-if COMPAT_MKSTEMP
-fuse_SOURCES += compat/mkstemp.c
-endif
+EXTRA_fuse_SOURCES =
-if COMPAT_WIN32
-fuse_SOURCES += windres.rc
-endif
-
-EXTRA_fuse_SOURCES = windres.rc
-
-fuse_LDADD = debugger/libdebugger.a \
-@UI_LIBS@ \
-debugger/libdebugger.a \
-machines/libmachines.a \
-peripherals/libperipherals.a \
-peripherals/disk/libdisk.a \
-peripherals/flash/libflash.a \
-peripherals/ide/libide.a \
-peripherals/nic/libnic.a \
-pokefinder/libpokefinder.a \
-sound/libsound.a \
-timer/libtimer.a \
-ui/scaler/libscaler.a \
-unittests/libunittests.a \
-z80/libz80.a \
-@LIBSPEC_LIBS@ \
-@GLIB_LIBS@ \
-@PNG_LIBS@ \
-@SOUND_LIBS@ \
-@SDL_LIBS@ \
-@X_LIBS@ \
-@XML_LIBS@ \
-compat/@COMPAT_OSNAME@/libcompatos.a \
-@WINDRES_OBJ@
-
-fuse_DEPENDENCIES = debugger/libdebugger.a \
-@UI_LIBS@ \
-debugger/libdebugger.a \
-machines/libmachines.a \
-peripherals/libperipherals.a \
-peripherals/disk/libdisk.a \
-peripherals/flash/libflash.a \
-peripherals/ide/libide.a \
-peripherals/nic/libnic.a \
-pokefinder/libpokefinder.a \
-sound/libsound.a \
-timer/libtimer.a \
-ui/scaler/libscaler.a \
-unittests/libunittests.a \
-z80/libz80.a \
-compat/@COMPAT_OSNAME@/libcompatos.a \
-@WINDRES_OBJ@
-
BUILT_SOURCES = options.h settings.c settings.h
-windres.o: windres.rc winfuse.ico ui/win32/*.rc
- @WINDRES@ -I$(srcdir) -I. $(srcdir)/windres.rc @LIBSPEC_CFLAGS@ @CPPFLAGS@ windres.o
-
settings.c: settings.pl settings.dat
- @PERL@ -I$(srcdir)/perl $(srcdir)/settings.pl $(srcdir)/settings.dat > $@.tmp && mv $@.tmp $@
+ $(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/settings.pl $(srcdir)/settings.dat > $@.tmp && mv $@.tmp $@
settings.h: settings-header.pl settings.dat
- @PERL@ -I$(srcdir)/perl $(srcdir)/settings-header.pl $(srcdir)/settings.dat > $@.tmp && mv $@.tmp $@
+ $(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/settings-header.pl $(srcdir)/settings.dat > $@.tmp && mv $@.tmp $@
-if WIDGET
-options.h: $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/@WIDGET@/options-header.pl $(srcdir)/ui/options.dat $(srcdir)/perl/Fuse.pm $(srcdir)/perl/Fuse/Dialog.pm
- @PERL@ $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/options.dat | @PERL@ -I$(srcdir)/perl $(srcdir)/ui/@WIDGET@/options-header.pl - public > $@.tmp && mv $@.tmp $@
-else
-options.h: $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/@UI@/options-header.pl $(srcdir)/ui/options.dat $(srcdir)/perl/Fuse.pm $(srcdir)/perl/Fuse/Dialog.pm
- @PERL@ $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/options.dat | @PERL@ -I$(srcdir)/perl $(srcdir)/ui/@UI@/options-header.pl - public > $@.tmp && mv $@.tmp $@
-endif
+options.h: $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/@OPTIONS_DIR@/options-header.pl $(srcdir)/ui/options.dat $(srcdir)/perl/Fuse.pm $(srcdir)/perl/Fuse/Dialog.pm
+ $(AM_V_GEN)$(PERL) $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/options.dat | $(PERL) -I$(srcdir)/perl $(srcdir)/ui/@OPTIONS_DIR@/options-header.pl - public > $@.tmp && mv $@.tmp $@
-AM_CPPFLAGS = @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@ \
-@XML_CFLAGS@ -DFUSEDATADIR="\"${pkgdatadir}\"" @SDL_CFLAGS@
+AM_CPPFLAGS = \
+ $(GLIB_CFLAGS) \
+ $(GTK_CFLAGS) \
+ $(LIBSPEC_CFLAGS) \
+ $(XML_CFLAGS) \
+ -DFUSEDATADIR="\"${pkgdatadir}\"" \
+ $(SDL_CFLAGS) \
+ $(PNG_CFLAGS)
+AM_CFLAGS = $(WARN_CFLAGS) $(PTHREAD_CFLAGS)
+
noinst_HEADERS = bitmap.h \
compat.h \
display.h \
@@ -196,6 +118,7 @@
snapshot.h \
sound.h \
spectrum.h \
+ svg.h \
tape.h \
utils.h \
options.h \
@@ -208,6 +131,7 @@
THANKS \
keysyms.dat \
keysyms.pl \
+ m4/ax_pthread.m4 \
m4/glib-2.0.m4 \
m4/gtk-2.0.m4 \
m4/libxml.m4 \
@@ -215,115 +139,54 @@
m4/sdl.m4 \
menu_data.dat \
menu_data.pl \
+ settings.dat \
settings.pl \
- settings-header.pl \
- settings.dat \
- winfuse.ico
+ settings-header.pl
CLEANFILES = options.h \
settings.c \
settings.h
-include compat/Makefile.am
+DISTCLEANFILES =
-if COMPAT_WIN32
+pkgdata_DATA =
-package_win32=$(PACKAGE)-$(PACKAGE_VERSION)-win32
-top_win32dir=$(top_builddir)/$(package_win32)
-install-win32: all
- test -n "$(DESTDIR)" || { echo "ERROR: set DESTDIR path"; exit 1; }
- $(MKDIR_P) $(DESTDIR)/roms/ || exit 1
- $(MKDIR_P) $(DESTDIR)/lib/ || exit 1
- cp $(top_srcdir)/roms/*.rom $(DESTDIR)/roms
- cp $(top_srcdir)/roms/README.copyright $(DESTDIR)/roms
- cp $(top_srcdir)/lib/*.bmp $(DESTDIR)/lib
- cp $(top_srcdir)/lib/*.scr $(DESTDIR)/lib
- cp $(top_builddir)/lib/*.szx $(DESTDIR)/lib
-# Copy fuse executable (we should manually copy the required libraries)
- cp $(top_builddir)/.libs/fuse$(EXEEXT) $(DESTDIR) || \
- cp $(top_builddir)/fuse$(EXEEXT) $(DESTDIR)
-# Get text files
- for file in AUTHORS ChangeLog COPYING README; \
- do cp "$(top_srcdir)/$$file" "$(DESTDIR)/$$file.txt"; \
- done
-# Get manuals
- if test -n "$(MAN2HTML)"; then \
- $(MAN2HTML) -r $(top_srcdir)/man/fuse.1 | sed '1d' > $(DESTDIR)/fuse.html; \
- else \
- test -z "$(GROFF)" || $(GROFF) -Thtml -man $(top_srcdir)/man/fuse.1 > $(DESTDIR)/fuse.html; \
- fi
-# Convert to DOS line endings
- test -z "$(UNIX2DOS)" || find $(DESTDIR) -type f \( -name "*.txt" -or -name "*.html" -or -name "*.copyright" \) -exec $(UNIX2DOS) {} \;
+## Resources for Windows executables
+if COMPAT_WIN32
-install-win32-strip: install-win32
- test -z "$(STRIP)" || $(STRIP) $(DESTDIR)/fuse$(EXEEXT)
+fuse_SOURCES += windres.rc
+fuse_LDADD += windres.o
+fuse_DEPENDENCIES += windres.o
-dist-win32-dir:
- $(MAKE) DESTDIR="$(top_win32dir)" install-win32-strip
+windres.o: windres.rc data/win32/winfuse.ico data/win32/fuse.manifest $(ui_win32_res)
+ $(AM_V_GEN)$(WINDRES) -I$(srcdir) -I. $(srcdir)/windres.rc $(LIBSPEC_CFLAGS) $(CPPFLAGS) windres.o
-dist-win32-zip: dist-win32-dir
- rm -f -- $(top_builddir)/$(package_win32).zip
- rm -f -- $(top_builddir)/$(package_win32).zip.sha1
- test -n "$(top_win32dir)" || exit 1
- @test `find $(top_win32dir) -type f -name \*.dll -print | wc -l` -ne 0 || \
- { echo "ERROR: external libraries not found in $(top_win32dir). Please, manually copy them."; exit 1; }
- cd $(top_win32dir) && \
- zip -q -9 -r $(abs_top_builddir)/$(package_win32).zip .
- -sha1sum $(top_builddir)/$(package_win32).zip > $(top_builddir)/$(package_win32).zip.sha1 && \
- { test -z "$(UNIX2DOS)" || $(UNIX2DOS) $(top_builddir)/$(package_win32).zip.sha1; }
+endif
-dist-win32-7z: dist-win32-dir
- rm -f -- $(top_builddir)/$(package_win32).7z
- rm -f -- $(top_builddir)/$(package_win32).7z.sha1
- test -n "$(top_win32dir)" || exit 1
- @test `find $(top_win32dir) -type f -name \*.dll -print | wc -l` -ne 0 || \
- { echo "ERROR: external libraries not found in $(top_win32dir). Please, manually copy them."; exit 1; }
- cd $(top_win32dir) && \
- 7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on -bd $(abs_top_builddir)/$(package_win32).7z .
- -sha1sum $(top_builddir)/$(package_win32).7z > $(top_builddir)/$(package_win32).7z.sha1 && \
- { test -z "$(UNIX2DOS)" || $(UNIX2DOS) $(top_builddir)/$(package_win32).7z.sha1; }
-dist-win32-exe: dist-win32-dir
- rm -f -- $(top_builddir)/$(package_win32)-setup.exe
- rm -f -- $(top_builddir)/$(package_win32)-setup.exe.sha1
- test -n "$(top_win32dir)" || exit 1
- @test `find $(top_win32dir) -type f -name \*.dll -print | wc -l` -ne 0 || \
- { echo "ERROR: external libraries not found in $(top_win32dir). Please, manually copy them."; exit 1; }
-# Locate NSIS in system path, MSYS drive or Cygwin drive
- @NSISFILE="$(abs_top_builddir)/ui/win32/installer/fuse.nsi"; \
- if makensis -VERSION > /dev/null 2>&1; then \
- MAKENSIS="makensis"; \
- elif [ -x "/c/Program Files/NSIS/makensis" ]; then \
- MAKENSIS="/c/Program\ Files/NSIS/makensis"; \
- elif [ -x "/cygdrive/c/Program Files/NSIS/makensis" ]; then \
- MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis"; \
- else \
- echo 'ERROR: cannot locate makensis tool'; exit 1; \
- fi; \
- case "`uname -s`" in \
- CYGWIN*) NSISFILE=`cygpath -m $$NSISFILE`;; \
- esac; \
- cd $(top_win32dir); \
- eval "$$MAKENSIS -V2 -NOCD $$NSISFILE"
- mv $(top_win32dir)/$(package_win32)-setup.exe $(top_builddir)
- -sha1sum $(top_builddir)/$(package_win32)-setup.exe > $(top_builddir)/$(package_win32)-setup.exe.sha1 && \
- { test -z "$(UNIX2DOS)" || $(UNIX2DOS) $(top_builddir)/$(package_win32)-setup.exe.sha1; }
-
-dist-win32: dist-win32-zip dist-win32-7z dist-win32-exe
-
-distclean-win32:
- if test -d "$(top_builddir)/$(package_win32)"; then \
- rm -rf -- "$(top_builddir)/$(package_win32)"; \
- fi
- rm -f -- $(top_builddir)/$(package_win32).zip
- rm -f -- $(top_builddir)/$(package_win32).zip.sha1
- rm -f -- $(top_builddir)/$(package_win32).7z
- rm -f -- $(top_builddir)/$(package_win32).7z.sha1
- rm -f -- $(top_builddir)/$(package_win32)-setup.exe
- rm -f -- $(top_builddir)/$(package_win32)-setup.exe.sha1
-
-.PHONY: install-win32 install-win32-strip dist-win32 dist-win32-dir \
- dist-win32-zip dist-win32-7z dist-win32-exe distclean-win32
-
-endif
+include compat/Makefile.am
+include data/Makefile.am
+include debugger/Makefile.am
+include hacking/Makefile.am
+include lib/Makefile.am
+include machines/Makefile.am
+include man/Makefile.am
+include peripherals/Makefile.am
+include perl/Makefile.am
+include pokefinder/Makefile.am
+include roms/Makefile.am
+include sound/Makefile.am
+include timer/Makefile.am
+include ui/Makefile.am
+include ui/fb/Makefile.am
+include ui/gtk/Makefile.am
+include ui/scaler/Makefile.am
+include ui/sdl/Makefile.am
+include ui/svga/Makefile.am
+include ui/widget/Makefile.am
+include ui/wii/Makefile.am
+include ui/win32/Makefile.am
+include ui/xlib/Makefile.am
+include unittests/Makefile.am
+include z80/Makefile.am
Property changes on: trunk/fuse/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/fuse/PORTING
===================================================================
--- trunk/fuse/PORTING 2016-05-25 11:30:52 UTC (rev 803)
+++ trunk/fuse/PORTING 2016-06-01 10:46:07 UTC (rev 804)
Property changes on: trunk/fuse/PORTING
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/fuse/README
===================================================================
--- trunk/fuse/README 2016-05-25 11:30:52 UTC (rev 803)
+++ trunk/fuse/README 2016-06-01 10:46:07 UTC (rev 804)
@@ -1,4 +1,4 @@
-The Free Unix Spectrum Emulator (Fuse) 1.1.1
+The Free Unix Spectrum Emulator (Fuse) 1.2.0
============================================
Fuse (the Free Unix Spectrum Emulator) was originally, and somewhat
@@ -25,7 +25,8 @@
* Support for the RZX input recording file format, including
rollback and 'competition mode'.
* Emulation of the DivIDE, Interface 1, Kempston mouse, Spectrum +3e,
- ZXATASP, ZXCF, Beta 128, Opus Discovery, +D and DISCiPLE interfaces.
+ ZXATASP, ZXCF, Beta 128, Opus Discovery, +D, DISCiPLE and Didaktik 80/40
+ interfaces.
Help! <xyz> doesn't work
------------------------
@@ -107,4 +108,4 @@
Philip Kendall <phi...@sh...>
24th May, 2013
-$Id: README 4995 2013-05-24 19:54:19Z zubzero $
+$Id: README 5403 2016-04-25 13:10:53Z fredm $
Property changes on: trunk/fuse/README
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/fuse/THANKS
===================================================================
--- trunk/fuse/THANKS 2016-05-25 11:30:52 UTC (rev 803)
+++ trunk/fuse/THANKS 2016-06-01 10:46:07 UTC (rev 804)
@@ -29,7 +29,7 @@
you've got an Amiga, you may well like to check out Ian's Spectrum
Emulator, ASp: http://www.lasernet.plus.com/asp.html
-* Shawn Hargreaves: for Allegro (http://alleg.sourceforge.net/)
+* Shawn Hargreaves: for Allegro (http://liballeg.org/)
(again, used by previous versions of Fuse for the graphical display)
* Steven Harrison: for helping track down why the SDL sound routines
@@ -44,7 +44,7 @@
emulations (see `AUTHORS')
* Gerton Lunter: his wonderful z80
- (ftp://ftp.worldofspectrum.org/pub/sinclair/emulators/pc/dos/z80-400.zip)
+ (http://www.worldofspectrum.org/pub/sinclair/emulators/pc/windows/z80-400.zip)
got me started on this emulation lark all those years ago...
* Anders Holmberg: for reporting a bug in the z80 v1.45 load routines. Anders
@@ -102,4 +102,4 @@
* Matan Ziv-Av: for various bits of code (see `AUTHORS')
-$Id: THANKS 4882 2013-02-15 23:47:37Z sbaldovi $
+$Id: THANKS 5357 2016-0...
[truncated message content] |
|
From: <fr...@us...> - 2016-05-25 11:30:56
|
Revision: 803
http://sourceforge.net/p/fuse-for-macosx/code/803
Author: fredm
Date: 2016-05-25 11:30:52 +0000 (Wed, 25 May 2016)
Log Message:
-----------
Merge up to vendor 1.2.0 release branches r5525.
Revision Links:
--------------
http://sourceforge.net/p/fuse-for-macosx/code/5525
Modified Paths:
--------------
trunk/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj
trunk/FuseGenerator/Info.plist
trunk/FuseGenerator/LibspectrumSCRExtractor.m
trunk/FuseGenerator/generate.pl
trunk/FuseGenerator/libspectrum.h
trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj
trunk/FuseImporter/Info.plist
trunk/FuseImporter/LibspectrumMetadataImporter.m
trunk/FuseImporter/generate.pl
trunk/FuseImporter/libspectrum.h
trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
trunk/fuse/fusepb/generate.pl
trunk/fuse/fusepb/libspectrum.h
trunk/libspectrum/generate.pl
trunk/libspectrum/libspectrum/ChangeLog
trunk/libspectrum/libspectrum/Makefile.am
trunk/libspectrum/libspectrum/README
trunk/libspectrum/libspectrum/accessor.pl
trunk/libspectrum/libspectrum/autogen.sh
trunk/libspectrum/libspectrum/bzip2.c
trunk/libspectrum/libspectrum/configure.ac
trunk/libspectrum/libspectrum/creator.c
trunk/libspectrum/libspectrum/crypto.c
trunk/libspectrum/libspectrum/csw.c
trunk/libspectrum/libspectrum/dck.c
trunk/libspectrum/libspectrum/dll.c
trunk/libspectrum/libspectrum/doc/libspectrum.3
trunk/libspectrum/libspectrum/doc/libspectrum.txt
trunk/libspectrum/libspectrum/generate.pl.in
trunk/libspectrum/libspectrum/hacking/ChangeLog
trunk/libspectrum/libspectrum/ide.c
trunk/libspectrum/libspectrum/internals.h
trunk/libspectrum/libspectrum/libspectrum.c
trunk/libspectrum/libspectrum/libspectrum.h.in
trunk/libspectrum/libspectrum/make-perl.c
trunk/libspectrum/libspectrum/memory.c
trunk/libspectrum/libspectrum/microdrive.c
trunk/libspectrum/libspectrum/myglib/garray.c
trunk/libspectrum/libspectrum/myglib/ghash.c
trunk/libspectrum/libspectrum/myglib/gslist.c
trunk/libspectrum/libspectrum/plusd.c
trunk/libspectrum/libspectrum/pzx_read.c
trunk/libspectrum/libspectrum/rzx.c
trunk/libspectrum/libspectrum/sna.c
trunk/libspectrum/libspectrum/snap_accessors.txt
trunk/libspectrum/libspectrum/snapshot.c
trunk/libspectrum/libspectrum/snp.c
trunk/libspectrum/libspectrum/sp.c
trunk/libspectrum/libspectrum/symbol_table.c
trunk/libspectrum/libspectrum/szx.c
trunk/libspectrum/libspectrum/tap.c
trunk/libspectrum/libspectrum/tape.c
trunk/libspectrum/libspectrum/tape_block.c
trunk/libspectrum/libspectrum/tape_block.h
trunk/libspectrum/libspectrum/test/Makefile.am
trunk/libspectrum/libspectrum/test/test.c
trunk/libspectrum/libspectrum/timings.c
trunk/libspectrum/libspectrum/tzx_read.c
trunk/libspectrum/libspectrum/tzx_write.c
trunk/libspectrum/libspectrum/utilities.c
trunk/libspectrum/libspectrum/warajevo_read.c
trunk/libspectrum/libspectrum/wav.c
trunk/libspectrum/libspectrum/z80.c
trunk/libspectrum/libspectrum/z80em.c
trunk/libspectrum/libspectrum/zlib.c
trunk/libspectrum/libspectrum/zxs.c
trunk/libspectrum/libspectrum.h
trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj
Added Paths:
-----------
trunk/libspectrum/libspectrum/m4/ax_create_stdint_h.m4
trunk/libspectrum/libspectrum/m4/pkg.m4
Property Changed:
----------------
trunk/libspectrum/libspectrum/
trunk/libspectrum/libspectrum/AUTHORS
trunk/libspectrum/libspectrum/COPYING
trunk/libspectrum/libspectrum/ChangeLog
trunk/libspectrum/libspectrum/Makefile.am
trunk/libspectrum/libspectrum/README
trunk/libspectrum/libspectrum/THANKS
trunk/libspectrum/libspectrum/accessor.pl
trunk/libspectrum/libspectrum/autogen.sh
trunk/libspectrum/libspectrum/bzip2.c
trunk/libspectrum/libspectrum/configure.ac
trunk/libspectrum/libspectrum/creator.c
trunk/libspectrum/libspectrum/crypto.c
trunk/libspectrum/libspectrum/csw.c
trunk/libspectrum/libspectrum/dck.c
trunk/libspectrum/libspectrum/dll.c
trunk/libspectrum/libspectrum/doc/Makefile.am
trunk/libspectrum/libspectrum/generate.pl.in
trunk/libspectrum/libspectrum/hacking/Makefile.am
trunk/libspectrum/libspectrum/ide.c
trunk/libspectrum/libspectrum/internals.h
trunk/libspectrum/libspectrum/libspectrum.c
trunk/libspectrum/libspectrum/libspectrum.h.in
trunk/libspectrum/libspectrum/libspectrum.qpg.in
trunk/libspectrum/libspectrum/m4/audiofile.m4
trunk/libspectrum/libspectrum/make-perl.c
trunk/libspectrum/libspectrum/memory.c
trunk/libspectrum/libspectrum/microdrive.c
trunk/libspectrum/libspectrum/myglib/Makefile.am
trunk/libspectrum/libspectrum/myglib/garray.c
trunk/libspectrum/libspectrum/myglib/ghash.c
trunk/libspectrum/libspectrum/myglib/gslist.c
trunk/libspectrum/libspectrum/plusd.c
trunk/libspectrum/libspectrum/pzx_read.c
trunk/libspectrum/libspectrum/rzx.c
trunk/libspectrum/libspectrum/sna.c
trunk/libspectrum/libspectrum/snap_accessors.txt
trunk/libspectrum/libspectrum/snapshot.c
trunk/libspectrum/libspectrum/snp.c
trunk/libspectrum/libspectrum/sp.c
trunk/libspectrum/libspectrum/symbol_table.c
trunk/libspectrum/libspectrum/szx.c
trunk/libspectrum/libspectrum/tap.c
trunk/libspectrum/libspectrum/tape.c
trunk/libspectrum/libspectrum/tape_accessors.pl
trunk/libspectrum/libspectrum/tape_accessors.txt
trunk/libspectrum/libspectrum/tape_block.c
trunk/libspectrum/libspectrum/tape_block.h
trunk/libspectrum/libspectrum/tape_set.pl
trunk/libspectrum/libspectrum/test/Makefile.am
trunk/libspectrum/libspectrum/test/complete-tzx.pl
trunk/libspectrum/libspectrum/test/edges.c
trunk/libspectrum/libspectrum/test/invalid-hardwareinfo.tzx
trunk/libspectrum/libspectrum/test/invalid.tzx
trunk/libspectrum/libspectrum/test/loopend.tzx
trunk/libspectrum/libspectrum/test/test.c
trunk/libspectrum/libspectrum/test/test.h
trunk/libspectrum/libspectrum/test/test15.c
trunk/libspectrum/libspectrum/timings.c
trunk/libspectrum/libspectrum/tzx_read.c
trunk/libspectrum/libspectrum/tzx_write.c
trunk/libspectrum/libspectrum/utilities.c
trunk/libspectrum/libspectrum/warajevo_read.c
trunk/libspectrum/libspectrum/wav.c
trunk/libspectrum/libspectrum/windres.rc
trunk/libspectrum/libspectrum/z80.c
trunk/libspectrum/libspectrum/z80em.c
trunk/libspectrum/libspectrum/zlib.c
trunk/libspectrum/libspectrum/zxs.c
Modified: trunk/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj
===================================================================
--- trunk/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj 2016-05-24 14:57:07 UTC (rev 802)
+++ trunk/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj 2016-05-25 11:30:52 UTC (rev 803)
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 46;
+ objectVersion = 47;
objects = {
/* Begin PBXBuildFile section */
@@ -366,7 +366,7 @@
LastUpgradeCheck = 0730;
};
buildConfigurationList = 2CA326220896AD4900168862 /* Build configuration list for PBXProject "FuseGenerator" */;
- compatibilityVersion = "Xcode 3.2";
+ compatibilityVersion = "Xcode 6.3";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
@@ -547,7 +547,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- MACOSX_DEPLOYMENT_TARGET = 10.7;
+ MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
};
@@ -574,7 +574,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- MACOSX_DEPLOYMENT_TARGET = 10.7;
+ MACOSX_DEPLOYMENT_TARGET = 10.8;
SDKROOT = macosx;
};
name = Release;
Modified: trunk/FuseGenerator/Info.plist
===================================================================
--- trunk/FuseGenerator/Info.plist 2016-05-24 14:57:07 UTC (rev 802)
+++ trunk/FuseGenerator/Info.plist 2016-05-25 11:30:52 UTC (rev 803)
@@ -59,7 +59,7 @@
<key>CFBundleShortVersionString</key>
<string>1</string>
<key>CFBundleVersion</key>
- <string>1.0</string>
+ <string>1.2</string>
<key>CFPlugInDynamicRegisterFunction</key>
<string></string>
<key>CFPlugInDynamicRegistration</key>
Modified: trunk/FuseGenerator/LibspectrumSCRExtractor.m
===================================================================
--- trunk/FuseGenerator/LibspectrumSCRExtractor.m 2016-05-24 14:57:07 UTC (rev 802)
+++ trunk/FuseGenerator/LibspectrumSCRExtractor.m 2016-05-25 11:30:52 UTC (rev 803)
@@ -192,8 +192,6 @@
libspectrum_tape_iterator iterator;
libspectrum_tape_block *block;
- int seen_scr_header = 0;
-
tape = libspectrum_tape_alloc();
error = libspectrum_tape_read( tape, buffer, length, LIBSPECTRUM_ID_UNKNOWN,
@@ -208,6 +206,7 @@
case LIBSPECTRUM_TAPE_BLOCK_ROM:
case LIBSPECTRUM_TAPE_BLOCK_TURBO:
+ case LIBSPECTRUM_TAPE_BLOCK_DATA_BLOCK:
/* See if this looks like a standard Spectrum screen and if so
display it if we haven't already assigned an image */
if( scrData ) {
@@ -215,30 +214,15 @@
continue;
}
- if( seen_scr_header ) {
- // SCREEN$ is 6912 bytes plus flag and checksum
- if( libspectrum_tape_block_data_length( block ) ==
- STANDARD_SCR_SIZE + 2 ) {
- libspectrum_byte *data = libspectrum_tape_block_data( block );
+ // SCREEN$ is 6912 bytes plus flag and checksum
+ if( libspectrum_tape_block_data_length( block ) ==
+ STANDARD_SCR_SIZE + 2 ) {
+ libspectrum_byte *data = libspectrum_tape_block_data( block );
- scrData = [NSData dataWithBytes:(const void *)(data+1)
- length:STANDARD_SCR_SIZE];
+ scrData = [NSData dataWithBytes:(const void *)(data+1)
+ length:STANDARD_SCR_SIZE];
- image_type = TYPE_SCR;
- }
-
- seen_scr_header = 0;
- } else {
- // Header is 17 bytes plus flag and checksum
- if( libspectrum_tape_block_data_length( block ) == 19 ) {
- libspectrum_byte *data = libspectrum_tape_block_data( block );
-
- /* Flag byte is 0x00 for headers, type is 3 for CODE, length is 6912 */
- if( data[0] == 0x00 && data[1] == 0x03 &&
- ( data[12] + data[13] * 0x100 == STANDARD_SCR_SIZE ) ) {
- seen_scr_header = 1;
- }
- }
+ image_type = TYPE_SCR;
}
break;
@@ -293,7 +277,7 @@
break;
default:
- seen_scr_header = 0;
+ break;
}
block = libspectrum_tape_iterator_next( &iterator );
Modified: trunk/FuseGenerator/generate.pl
===================================================================
--- trunk/FuseGenerator/generate.pl 2016-05-24 14:57:07 UTC (rev 802)
+++ trunk/FuseGenerator/generate.pl 2016-05-25 11:30:52 UTC (rev 803)
@@ -208,6 +208,13 @@
CODE
}
+if( /LIBSPECTRUM_AUTOGEN_WARNING/ ) {
+ $_ = << "CODE";
+/* NB: This file is autogenerated from libspectrum.h.in. Do not edit
+ unless you know what you're doing */
+CODE
+}
+
if( /LIBSPECTRUM_SNAP_ACCESSORS/ ) {
open( DATAFILE, '<' . "$ENV{SRCROOT}/libspectrum/snap_accessors.txt" ) or die "Couldn't open `$ENV{SRCROOT}/libspectrum/snap_accessors.txt': $!";
Modified: trunk/FuseGenerator/libspectrum.h
===================================================================
--- trunk/FuseGenerator/libspectrum.h 2016-05-24 14:57:07 UTC (rev 802)
+++ trunk/FuseGenerator/libspectrum.h 2016-05-25 11:30:52 UTC (rev 803)
@@ -1,7 +1,7 @@
/* libspectrum.h: the library for dealing with ZX Spectrum emulator files
- Copyright (c) 2001-2007 Philip Kendall, Darren Salt, Fredrick Meunier
+ Copyright (c) 2001-2015 Philip Kendall, Darren Salt, Fredrick Meunier
- $Id: libspectrum.h.in 4836 2012-12-31 15:40:10Z zubzero $
+ $Id: libspectrum.h.in 5422 2016-04-29 12:54:59Z fredm $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -281,14 +281,6 @@
libspectrum_byte **gzptr, size_t *gzlength );
-/* we support files compressed with bz2 */
-#define LIBSPECTRUM_SUPPORTS_BZ2_COMPRESSION (1)
-
-
-/* we support files wav files */
-#define LIBSPECTRUM_SUPPORTS_AUDIOFILE (1)
-
-
/* Initialisation */
WIN32_DLL libspectrum_error libspectrum_init( void );
@@ -326,12 +318,26 @@
} libspectrum_mem_vtable_t;
WIN32_DLL void* libspectrum_malloc( size_t size );
-WIN32_DLL void* libspectrum_calloc( size_t nmemb, size_t size );
+WIN32_DLL void* libspectrum_malloc_n( size_t nmemb, size_t size );
+WIN32_DLL void* libspectrum_malloc0_n( size_t nmemb, size_t size );
WIN32_DLL void* libspectrum_realloc( void *ptr, size_t size );
+WIN32_DLL void* libspectrum_realloc_n( void *ptr, size_t nmemb, size_t size );
WIN32_DLL void libspectrum_free( void *ptr );
WIN32_DLL void libspectrum_mem_set_vtable( libspectrum_mem_vtable_t *table );
+#define libspectrum_new( type, count ) \
+ ( ( type * ) libspectrum_malloc_n( (count), sizeof( type ) ) )
+
+#define libspectrum_new0( type, count ) \
+ ( ( type * ) libspectrum_malloc0_n( (count), sizeof( type ) ) )
+
+#define libspectrum_renew( type, mem, count ) \
+ ( ( type * ) libspectrum_realloc_n( (void *)mem, (count), sizeof( type ) ) )
+
+/* Deprecated */
+#define libspectrum_calloc libspectrum_malloc0_n
+
/* Attempt to identify a given file */
/* Various types of file we might manage to identify */
@@ -401,12 +407,20 @@
LIBSPECTRUM_ID_DISK_SAD, /* .sad generic disk image */
LIBSPECTRUM_ID_DISK_TD0, /* .td0 generic disk image */
+ /* Below here, present only in 1.0.0 and later */
+
LIBSPECTRUM_ID_DISK_OPD, /* .opu/.opd Opus Discovery disk image */
+ /* Below here, present only in 1.1.0 and later */
+
LIBSPECTRUM_ID_TAPE_PZX, /* PZX tape image */
LIBSPECTRUM_ID_AUX_POK, /* POKE file */
+ /* Below here, present only in 1.2.0 and later */
+
+ LIBSPECTRUM_ID_DISK_D80, /* .d80/.d40 Didaktik disk image */
+
LIBSPECTRUM_ID_SCREEN_SCR, /* .scr screen file */
} libspectrum_id_t;
@@ -445,8 +459,14 @@
LIBSPECTRUM_CLASS_DISK_GENERIC, /* generic disk image */
+ /* Below here, present only in 1.1.0 and later */
+
LIBSPECTRUM_CLASS_AUXILIARY, /* auxiliary supported file */
+ /* Below here, present only in 1.2.0 and later */
+
+ LIBSPECTRUM_CLASS_DISK_DIDAKTIK, /* Didaktik disk */
+
LIBSPECTRUM_CLASS_SCREENSHOT, /* Screenshot */
} libspectrum_class_t;
@@ -962,6 +982,70 @@
WIN32_DLL void libspectrum_snap_set_late_timings( libspectrum_snap *snap, int late_timings );
WIN32_DLL int libspectrum_snap_zx_printer_active( libspectrum_snap *snap );
WIN32_DLL void libspectrum_snap_set_zx_printer_active( libspectrum_snap *snap, int zx_printer_active );
+WIN32_DLL int libspectrum_snap_usource_active( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_usource_active( libspectrum_snap *snap, int usource_active );
+WIN32_DLL int libspectrum_snap_usource_paged( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_usource_paged( libspectrum_snap *snap, int usource_paged );
+WIN32_DLL int libspectrum_snap_usource_custom_rom( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_usource_custom_rom( libspectrum_snap *snap, int usource_custom_rom );
+WIN32_DLL libspectrum_byte * libspectrum_snap_usource_rom( libspectrum_snap *snap, int idx );
+WIN32_DLL void libspectrum_snap_set_usource_rom( libspectrum_snap *snap, int idx, libspectrum_byte* usource_rom );
+WIN32_DLL size_t libspectrum_snap_usource_rom_length( libspectrum_snap *snap, int idx );
+WIN32_DLL void libspectrum_snap_set_usource_rom_length( libspectrum_snap *snap, int idx, size_t usource_rom_length );
+WIN32_DLL int libspectrum_snap_disciple_active( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_disciple_active( libspectrum_snap *snap, int disciple_active );
+WIN32_DLL int libspectrum_snap_disciple_paged( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_disciple_paged( libspectrum_snap *snap, int disciple_paged );
+WIN32_DLL int libspectrum_snap_disciple_inhibit_button( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_disciple_inhibit_button( libspectrum_snap *snap, int disciple_inhibit_button );
+WIN32_DLL int libspectrum_snap_disciple_drive_count( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_disciple_drive_count( libspectrum_snap *snap, int disciple_drive_count );
+WIN32_DLL int libspectrum_snap_disciple_custom_rom( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_disciple_custom_rom( libspectrum_snap *snap, int disciple_custom_rom );
+WIN32_DLL size_t libspectrum_snap_disciple_rom_length( libspectrum_snap *snap, int idx );
+WIN32_DLL void libspectrum_snap_set_disciple_rom_length( libspectrum_snap *snap, int idx, size_t disciple_rom_length );
+WIN32_DLL int libspectrum_snap_disciple_direction( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_disciple_direction( libspectrum_snap *snap, int disciple_direction );
+WIN32_DLL libspectrum_byte libspectrum_snap_disciple_control( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_disciple_control( libspectrum_snap *snap, libspectrum_byte disciple_control );
+WIN32_DLL libspectrum_byte libspectrum_snap_disciple_track( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_disciple_track( libspectrum_snap *snap, libspectrum_byte disciple_track );
+WIN32_DLL libspectrum_byte libspectrum_snap_disciple_sector( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_disciple_sector( libspectrum_snap *snap, libspectrum_byte disciple_sector );
+WIN32_DLL libspectrum_byte libspectrum_snap_disciple_data( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_disciple_data( libspectrum_snap *snap, libspectrum_byte disciple_data );
+WIN32_DLL libspectrum_byte libspectrum_snap_disciple_status( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_disciple_status( libspectrum_snap *snap, libspectrum_byte disciple_status );
+WIN32_DLL libspectrum_byte * libspectrum_snap_disciple_rom( libspectrum_snap *snap, int idx );
+WIN32_DLL void libspectrum_snap_set_disciple_rom( libspectrum_snap *snap, int idx, libspectrum_byte* disciple_rom );
+WIN32_DLL libspectrum_byte * libspectrum_snap_disciple_ram( libspectrum_snap *snap, int idx );
+WIN32_DLL void libspectrum_snap_set_disciple_ram( libspectrum_snap *snap, int idx, libspectrum_byte* disciple_ram );
+WIN32_DLL int libspectrum_snap_didaktik80_active( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_didaktik80_active( libspectrum_snap *snap, int didaktik80_active );
+WIN32_DLL int libspectrum_snap_didaktik80_paged( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_didaktik80_paged( libspectrum_snap *snap, int didaktik80_paged );
+WIN32_DLL int libspectrum_snap_didaktik80_drive_count( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_didaktik80_drive_count( libspectrum_snap *snap, int didaktik80_drive_count );
+WIN32_DLL int libspectrum_snap_didaktik80_custom_rom( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_didaktik80_custom_rom( libspectrum_snap *snap, int didaktik80_custom_rom );
+WIN32_DLL size_t libspectrum_snap_didaktik80_rom_length( libspectrum_snap *snap, int idx );
+WIN32_DLL void libspectrum_snap_set_didaktik80_rom_length( libspectrum_snap *snap, int idx, size_t didaktik80_rom_length );
+WIN32_DLL int libspectrum_snap_didaktik80_direction( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_didaktik80_direction( libspectrum_snap *snap, int didaktik80_direction );
+WIN32_DLL libspectrum_byte libspectrum_snap_didaktik80_aux( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_didaktik80_aux( libspectrum_snap *snap, libspectrum_byte didaktik80_aux );
+WIN32_DLL libspectrum_byte libspectrum_snap_didaktik80_track( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_didaktik80_track( libspectrum_snap *snap, libspectrum_byte didaktik80_track );
+WIN32_DLL libspectrum_byte libspectrum_snap_didaktik80_sector( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_didaktik80_sector( libspectrum_snap *snap, libspectrum_byte didaktik80_sector );
+WIN32_DLL libspectrum_byte libspectrum_snap_didaktik80_data( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_didaktik80_data( libspectrum_snap *snap, libspectrum_byte didaktik80_data );
+WIN32_DLL libspectrum_byte libspectrum_snap_didaktik80_status( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_didaktik80_status( libspectrum_snap *snap, libspectrum_byte didaktik80_status );
+WIN32_DLL libspectrum_byte * libspectrum_snap_didaktik80_rom( libspectrum_snap *snap, int idx );
+WIN32_DLL void libspectrum_snap_set_didaktik80_rom( libspectrum_snap *snap, int idx, libspectrum_byte* didaktik80_rom );
+WIN32_DLL libspectrum_byte * libspectrum_snap_didaktik80_ram( libspectrum_snap *snap, int idx );
+WIN32_DLL void libspectrum_snap_set_didaktik80_ram( libspectrum_snap *snap, int idx, libspectrum_byte* didaktik80_ram );
/*
* Tape handling routines
@@ -1349,6 +1433,8 @@
libspectrum_rzx_iterator_begin( libspectrum_rzx *rzx );
WIN32_DLL libspectrum_rzx_iterator
libspectrum_rzx_iterator_next( libspectrum_rzx_iterator it );
+WIN32_DLL libspectrum_rzx_iterator
+libspectrum_rzx_iterator_last( libspectrum_rzx *rzx );
WIN32_DLL libspectrum_rzx_block_id
libspectrum_rzx_iterator_get_type( libspectrum_rzx_iterator it );
@@ -1363,6 +1449,9 @@
WIN32_DLL int
libspectrum_rzx_iterator_snap_is_automatic( libspectrum_rzx_iterator it );
+WIN32_DLL libspectrum_error
+libspectrum_rzx_finalise( libspectrum_rzx *rzx );
+
/*
* Microdrive image handling routines
*/
Modified: trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj
===================================================================
--- trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj 2016-05-24 14:57:07 UTC (rev 802)
+++ trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj 2016-05-25 11:30:52 UTC (rev 803)
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 46;
+ objectVersion = 47;
objects = {
/* Begin PBXBuildFile section */
@@ -341,7 +341,7 @@
LastUpgradeCheck = 0730;
};
buildConfigurationList = B6B0E30008CC65D5001D8411 /* Build configuration list for PBXProject "FuseImporter" */;
- compatibilityVersion = "Xcode 3.2";
+ compatibilityVersion = "Xcode 6.3";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
Modified: trunk/FuseImporter/Info.plist
===================================================================
--- trunk/FuseImporter/Info.plist 2016-05-24 14:57:07 UTC (rev 802)
+++ trunk/FuseImporter/Info.plist 2016-05-25 11:30:52 UTC (rev 803)
@@ -57,7 +57,7 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleVersion</key>
- <string>1.1</string>
+ <string>1.2</string>
<key>CFPlugInDynamicRegisterFunction</key>
<string></string>
<key>CFPlugInDynamicRegistration</key>
Modified: trunk/FuseImporter/LibspectrumMetadataImporter.m
===================================================================
--- trunk/FuseImporter/LibspectrumMetadataImporter.m 2016-05-24 14:57:07 UTC (rev 802)
+++ trunk/FuseImporter/LibspectrumMetadataImporter.m 2016-05-25 11:30:52 UTC (rev 803)
@@ -379,6 +379,12 @@
case LIBSPECTRUM_TAPE_BLOCK_GENERALISED_DATA:
break;
+
+ case LIBSPECTRUM_TAPE_BLOCK_PULSE_SEQUENCE:
+ break;
+
+ case LIBSPECTRUM_TAPE_BLOCK_DATA_BLOCK:
+ break;
default:
NSLog(@"LibspectrumMetadataImporter: (Sorry -- can't handle that kind of block. Skipping it)\n");
@@ -426,7 +432,7 @@
}
if( libspectrum_snap_joystick_active_count( snap ) ) {
- size_t i;
+ int i;
for( i=0; i< libspectrum_snap_joystick_active_count( snap ); i++ ) {
if(libspectrum_snap_joystick_list(snap, i) != LIBSPECTRUM_JOYSTICK_NONE) {
@@ -459,7 +465,42 @@
if( libspectrum_snap_plusd_active( snap ) ) {
[peripherals addObject:@"+D Disk"];
}
-
+ if( libspectrum_snap_opus_active( snap ) ) {
+ [peripherals addObject:@"Opus Disk"];
+ }
+ if( libspectrum_snap_kempston_mouse_active( snap ) ) {
+ [peripherals addObject:@"Kempston Mouse"];
+ }
+ if( libspectrum_snap_simpleide_active( snap ) ) {
+ [peripherals addObject:@"Simple IDE"];
+ }
+ if( libspectrum_snap_divide_active( snap ) ) {
+ [peripherals addObject:@"DivIDE"];
+ }
+ if( libspectrum_snap_fuller_box_active( snap ) ) {
+ [peripherals addObject:@"Fuller Box"];
+ }
+ if( libspectrum_snap_melodik_active( snap ) ) {
+ [peripherals addObject:@"Melodik"];
+ }
+ if( libspectrum_snap_specdrum_active( snap ) ) {
+ [peripherals addObject:@"SpecDrum"];
+ }
+ if( libspectrum_snap_spectranet_active( snap ) ) {
+ [peripherals addObject:@"Spectranet"];
+ }
+ if( libspectrum_snap_zx_printer_active( snap ) ) {
+ [peripherals addObject:@"ZX Printer"];
+ }
+ if( libspectrum_snap_usource_active( snap ) ) {
+ [peripherals addObject:@"Currah µSource"];
+ }
+ if( libspectrum_snap_disciple_active( snap ) ) {
+ [peripherals addObject:@"DISCiPLE"];
+ }
+ if( libspectrum_snap_didaktik80_active( snap ) ) {
+ [peripherals addObject:@"Didaktik D80"];
+ }
if( [peripherals count] ) {
[attributes setObject:peripherals
forKey:@"net_sourceforge_projects_fuse_emulator_Peripherals"];
@@ -603,6 +644,26 @@
}
- (BOOL)
+process_opd
+{
+ BOOL error = NO;
+
+ /* FIXME: size, %full?, read-only vs read-write etc? */
+
+ return error;
+}
+
+- (BOOL)
+process_d80
+{
+ BOOL error = NO;
+
+ /* FIXME: size, %full?, read-only vs read-write etc? */
+
+ return error;
+}
+
+- (BOOL)
process_if2r
{
BOOL error = NO;
@@ -622,7 +683,8 @@
return error;
}
-- (BOOL)process_hdr
+- (BOOL)
+process_hdr
{
BOOL error = NO;
@@ -712,6 +774,14 @@
retval = [self process_hdr];
break;
+ case LIBSPECTRUM_CLASS_DISK_OPUS:
+ retval = [self process_opd];
+ break;
+
+ case LIBSPECTRUM_CLASS_DISK_DIDAKTIK:
+ retval = [self process_d80];
+ break;
+
default:
NSLog(@"LibspectrumMetadataImporter: loadFile: unknown class %d!\n", lsclass );
retval = NO;
Modified: trunk/FuseImporter/generate.pl
===================================================================
--- trunk/FuseImporter/generate.pl 2016-05-24 14:57:07 UTC (rev 802)
+++ trunk/FuseImporter/generate.pl 2016-05-25 11:30:52 UTC (rev 803)
@@ -208,6 +208,13 @@
CODE
}
+if( /LIBSPECTRUM_AUTOGEN_WARNING/ ) {
+ $_ = << "CODE";
+/* NB: This file is autogenerated from libspectrum.h.in. Do not edit
+ unless you know what you're doing */
+CODE
+}
+
if( /LIBSPECTRUM_SNAP_ACCESSORS/ ) {
open( DATAFILE, '<' . "$ENV{SRCROOT}/libspectrum/snap_accessors.txt" ) or die "Couldn't open `$ENV{SRCROOT}/libspectrum/snap_accessors.txt': $!";
Modified: trunk/FuseImporter/libspectrum.h
===================================================================
--- trunk/FuseImporter/libspectrum.h 2016-05-24 14:57:07 UTC (rev 802)
+++ trunk/FuseImporter/libspectrum.h 2016-05-25 11:30:52 UTC (rev 803)
@@ -1,7 +1,7 @@
/* libspectrum.h: the library for dealing with ZX Spectrum emulator files
- Copyright (c) 2001-2007 Philip Kendall, Darren Salt, Fredrick Meunier
+ Copyright (c) 2001-2015 Philip Kendall, Darren Salt, Fredrick Meunier
- $Id: libspectrum.h.in 4836 2012-12-31 15:40:10Z zubzero $
+ $Id: libspectrum.h.in 5422 2016-04-29 12:54:59Z fredm $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -281,14 +281,6 @@
libspectrum_byte **gzptr, size_t *gzlength );
-/* we support files compressed with bz2 */
-#define LIBSPECTRUM_SUPPORTS_BZ2_COMPRESSION (1)
-
-
-/* we support files wav files */
-#define LIBSPECTRUM_SUPPORTS_AUDIOFILE (1)
-
-
/* Initialisation */
WIN32_DLL libspectrum_error libspectrum_init( void );
@@ -326,12 +318,26 @@
} libspectrum_mem_vtable_t;
WIN32_DLL void* libspectrum_malloc( size_t size );
-WIN32_DLL void* libspectrum_calloc( size_t nmemb, size_t size );
+WIN32_DLL void* libspectrum_malloc_n( size_t nmemb, size_t size );
+WIN32_DLL void* libspectrum_malloc0_n( size_t nmemb, size_t size );
WIN32_DLL void* libspectrum_realloc( void *ptr, size_t size );
+WIN32_DLL void* libspectrum_realloc_n( void *ptr, size_t nmemb, size_t size );
WIN32_DLL void libspectrum_free( void *ptr );
WIN32_DLL void libspectrum_mem_set_vtable( libspectrum_mem_vtable_t *table );
+#define libspectrum_new( type, count ) \
+ ( ( type * ) libspectrum_malloc_n( (count), sizeof( type ) ) )
+
+#define libspectrum_new0( type, count ) \
+ ( ( type * ) libspectrum_malloc0_n( (count), sizeof( type ) ) )
+
+#define libspectrum_renew( type, mem, count ) \
+ ( ( type * ) libspectrum_realloc_n( (void *)mem, (count), sizeof( type ) ) )
+
+/* Deprecated */
+#define libspectrum_calloc libspectrum_malloc0_n
+
/* Attempt to identify a given file */
/* Various types of file we might manage to identify */
@@ -401,12 +407,20 @@
LIBSPECTRUM_ID_DISK_SAD, /* .sad generic disk image */
LIBSPECTRUM_ID_DISK_TD0, /* .td0 generic disk image */
+ /* Below here, present only in 1.0.0 and later */
+
LIBSPECTRUM_ID_DISK_OPD, /* .opu/.opd Opus Discovery disk image */
+ /* Below here, present only in 1.1.0 and later */
+
LIBSPECTRUM_ID_TAPE_PZX, /* PZX tape image */
LIBSPECTRUM_ID_AUX_POK, /* POKE file */
+ /* Below here, present only in 1.2.0 and later */
+
+ LIBSPECTRUM_ID_DISK_D80, /* .d80/.d40 Didaktik disk image */
+
LIBSPECTRUM_ID_SCREEN_SCR, /* .scr screen file */
} libspectrum_id_t;
@@ -445,8 +459,14 @@
LIBSPECTRUM_CLASS_DISK_GENERIC, /* generic disk image */
+ /* Below here, present only in 1.1.0 and later */
+
LIBSPECTRUM_CLASS_AUXILIARY, /* auxiliary supported file */
+ /* Below here, present only in 1.2.0 and later */
+
+ LIBSPECTRUM_CLASS_DISK_DIDAKTIK, /* Didaktik disk */
+
LIBSPECTRUM_CLASS_SCREENSHOT, /* Screenshot */
} libspectrum_class_t;
@@ -962,6 +982,70 @@
WIN32_DLL void libspectrum_snap_set_late_timings( libspectrum_snap *snap, int late_timings );
WIN32_DLL int libspectrum_snap_zx_printer_active( libspectrum_snap *snap );
WIN32_DLL void libspectrum_snap_set_zx_printer_active( libspectrum_snap *snap, int zx_printer_active );
+WIN32_DLL int libspectrum_snap_usource_active( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_usource_active( libspectrum_snap *snap, int usource_active );
+WIN32_DLL int libspectrum_snap_usource_paged( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_usource_paged( libspectrum_snap *snap, int usource_paged );
+WIN32_DLL int libspectrum_snap_usource_custom_rom( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_usource_custom_rom( libspectrum_snap *snap, int usource_custom_rom );
+WIN32_DLL libspectrum_byte * libspectrum_snap_usource_rom( libspectrum_snap *snap, int idx );
+WIN32_DLL void libspectrum_snap_set_usource_rom( libspectrum_snap *snap, int idx, libspectrum_byte* usource_rom );
+WIN32_DLL size_t libspectrum_snap_usource_rom_length( libspectrum_snap *snap, int idx );
+WIN32_DLL void libspectrum_snap_set_usource_rom_length( libspectrum_snap *snap, int idx, size_t usource_rom_length );
+WIN32_DLL int libspectrum_snap_disciple_active( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_disciple_active( libspectrum_snap *snap, int disciple_active );
+WIN32_DLL int libspectrum_snap_disciple_paged( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_disciple_paged( libspectrum_snap *snap, int disciple_paged );
+WIN32_DLL int libspectrum_snap_disciple_inhibit_button( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_disciple_inhibit_button( libspectrum_snap *snap, int disciple_inhibit_button );
+WIN32_DLL int libspectrum_snap_disciple_drive_count( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_disciple_drive_count( libspectrum_snap *snap, int disciple_drive_count );
+WIN32_DLL int libspectrum_snap_disciple_custom_rom( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_disciple_custom_rom( libspectrum_snap *snap, int disciple_custom_rom );
+WIN32_DLL size_t libspectrum_snap_disciple_rom_length( libspectrum_snap *snap, int idx );
+WIN32_DLL void libspectrum_snap_set_disciple_rom_length( libspectrum_snap *snap, int idx, size_t disciple_rom_length );
+WIN32_DLL int libspectrum_snap_disciple_direction( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_disciple_direction( libspectrum_snap *snap, int disciple_direction );
+WIN32_DLL libspectrum_byte libspectrum_snap_disciple_control( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_disciple_control( libspectrum_snap *snap, libspectrum_byte disciple_control );
+WIN32_DLL libspectrum_byte libspectrum_snap_disciple_track( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_disciple_track( libspectrum_snap *snap, libspectrum_byte disciple_track );
+WIN32_DLL libspectrum_byte libspectrum_snap_disciple_sector( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_disciple_sector( libspectrum_snap *snap, libspectrum_byte disciple_sector );
+WIN32_DLL libspectrum_byte libspectrum_snap_disciple_data( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_disciple_data( libspectrum_snap *snap, libspectrum_byte disciple_data );
+WIN32_DLL libspectrum_byte libspectrum_snap_disciple_status( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_disciple_status( libspectrum_snap *snap, libspectrum_byte disciple_status );
+WIN32_DLL libspectrum_byte * libspectrum_snap_disciple_rom( libspectrum_snap *snap, int idx );
+WIN32_DLL void libspectrum_snap_set_disciple_rom( libspectrum_snap *snap, int idx, libspectrum_byte* disciple_rom );
+WIN32_DLL libspectrum_byte * libspectrum_snap_disciple_ram( libspectrum_snap *snap, int idx );
+WIN32_DLL void libspectrum_snap_set_disciple_ram( libspectrum_snap *snap, int idx, libspectrum_byte* disciple_ram );
+WIN32_DLL int libspectrum_snap_didaktik80_active( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_didaktik80_active( libspectrum_snap *snap, int didaktik80_active );
+WIN32_DLL int libspectrum_snap_didaktik80_paged( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_didaktik80_paged( libspectrum_snap *snap, int didaktik80_paged );
+WIN32_DLL int libspectrum_snap_didaktik80_drive_count( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_didaktik80_drive_count( libspectrum_snap *snap, int didaktik80_drive_count );
+WIN32_DLL int libspectrum_snap_didaktik80_custom_rom( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_didaktik80_custom_rom( libspectrum_snap *snap, int didaktik80_custom_rom );
+WIN32_DLL size_t libspectrum_snap_didaktik80_rom_length( libspectrum_snap *snap, int idx );
+WIN32_DLL void libspectrum_snap_set_didaktik80_rom_length( libspectrum_snap *snap, int idx, size_t didaktik80_rom_length );
+WIN32_DLL int libspectrum_snap_didaktik80_direction( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_didaktik80_direction( libspectrum_snap *snap, int didaktik80_direction );
+WIN32_DLL libspectrum_byte libspectrum_snap_didaktik80_aux( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_didaktik80_aux( libspectrum_snap *snap, libspectrum_byte didaktik80_aux );
+WIN32_DLL libspectrum_byte libspectrum_snap_didaktik80_track( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_didaktik80_track( libspectrum_snap *snap, libspectrum_byte didaktik80_track );
+WIN32_DLL libspectrum_byte libspectrum_snap_didaktik80_sector( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_didaktik80_sector( libspectrum_snap *snap, libspectrum_byte didaktik80_sector );
+WIN32_DLL libspectrum_byte libspectrum_snap_didaktik80_data( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_didaktik80_data( libspectrum_snap *snap, libspectrum_byte didaktik80_data );
+WIN32_DLL libspectrum_byte libspectrum_snap_didaktik80_status( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_didaktik80_status( libspectrum_snap *snap, libspectrum_byte didaktik80_status );
+WIN32_DLL libspectrum_byte * libspectrum_snap_didaktik80_rom( libspectrum_snap *snap, int idx );
+WIN32_DLL void libspectrum_snap_set_didaktik80_rom( libspectrum_snap *snap, int idx, libspectrum_byte* didaktik80_rom );
+WIN32_DLL libspectrum_byte * libspectrum_snap_didaktik80_ram( libspectrum_snap *snap, int idx );
+WIN32_DLL void libspectrum_snap_set_didaktik80_ram( libspectrum_snap *snap, int idx, libspectrum_byte* didaktik80_ram );
/*
* Tape handling routines
@@ -1349,6 +1433,8 @@
libspectrum_rzx_iterator_begin( libspectrum_rzx *rzx );
WIN32_DLL libspectrum_rzx_iterator
libspectrum_rzx_iterator_next( libspectrum_rzx_iterator it );
+WIN32_DLL libspectrum_rzx_iterator
+libspectrum_rzx_iterator_last( libspectrum_rzx *rzx );
WIN32_DLL libspectrum_rzx_block_id
libspectrum_rzx_iterator_get_type( libspectrum_rzx_iterator it );
@@ -1363,6 +1449,9 @@
WIN32_DLL int
libspectrum_rzx_iterator_snap_is_automatic( libspectrum_rzx_iterator it );
+WIN32_DLL libspectrum_error
+libspectrum_rzx_finalise( libspectrum_rzx *rzx );
+
/*
* Microdrive image handling routines
*/
Modified: trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
===================================================================
--- trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2016-05-24 14:57:07 UTC (rev 802)
+++ trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2016-05-25 11:30:52 UTC (rev 803)
@@ -1902,7 +1902,7 @@
PRODUCT_BUNDLE_IDENTIFIER = FusePreferences;
PRODUCT_NAME = Fuse;
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
- SDKROOT = macosx10.11;
+ SDKROOT = macosx;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "-Wall";
WRAPPER_EXTENSION = app;
@@ -1947,7 +1947,7 @@
PRODUCT_BUNDLE_IDENTIFIER = FusePreferences;
PRODUCT_NAME = Fuse;
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
- SDKROOT = macosx10.11;
+ SDKROOT = macosx;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "-Wall";
WRAPPER_EXTENSION = app;
@@ -1991,7 +1991,7 @@
PRODUCT_BUNDLE_IDENTIFIER = FusePreferences;
PRODUCT_NAME = Fuse;
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
- SDKROOT = macosx10.11;
+ SDKROOT = macosx;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "-Wall";
WRAPPER_EXTENSION = app;
@@ -2018,7 +2018,7 @@
MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
RUN_CLANG_STATIC_ANALYZER = YES;
- SDKROOT = macosx10.11;
+ SDKROOT = macosx;
YACCFLAGS = "-d";
YACC_GENERATED_FILE_STEM = InputFileStem;
ZERO_LINK = YES;
@@ -2043,7 +2043,7 @@
LLVM_LTO = YES;
MACOSX_DEPLOYMENT_TARGET = 10.8;
RUN_CLANG_STATIC_ANALYZER = YES;
- SDKROOT = macosx10.11;
+ SDKROOT = macosx;
YACCFLAGS = "-d";
YACC_GENERATED_FILE_STEM = InputFileStem;
ZERO_LINK = NO;
@@ -2066,7 +2066,7 @@
LLVM_LTO = YES;
MACOSX_DEPLOYMENT_TARGET = 10.8;
RUN_CLANG_STATIC_ANALYZER = YES;
- SDKROOT = macosx10.11;
+ SDKROOT = macosx;
YACCFLAGS = "-d";
YACC_GENERATED_FILE_STEM = InputFileStem;
ZERO_LINK = NO;
Modified: trunk/fuse/fusepb/generate.pl
===================================================================
--- trunk/fuse/fusepb/generate.pl 2016-05-24 14:57:07 UTC (rev 802)
+++ trunk/fuse/fusepb/generate.pl 2016-05-25 11:30:52 UTC (rev 803)
@@ -220,6 +220,13 @@
CODE
}
+if( /LIBSPECTRUM_AUTOGEN_WARNING/ ) {
+ $_ = << "CODE";
+/* NB: This file is autogenerated from libspectrum.h.in. Do not edit
+ unless you know what you're doing */
+CODE
+}
+
if( /LIBSPECTRUM_SNAP_ACCESSORS/ ) {
open( DATAFILE, '<' . "$ENV{SRCROOT}/libspectrum/snap_accessors.txt" ) or die "Couldn't open `$ENV{SRCROOT}/libspectrum/snap_accessors.txt': $!";
Modified: trunk/fuse/fusepb/libspectrum.h
===================================================================
--- trunk/fuse/fusepb/libspectrum.h 2016-05-24 14:57:07 UTC (rev 802)
+++ trunk/fuse/fusepb/libspectrum.h 2016-05-25 11:30:52 UTC (rev 803)
@@ -1,7 +1,7 @@
/* libspectrum.h: the library for dealing with ZX Spectrum emulator files
- Copyright (c) 2001-2007 Philip Kendall, Darren Salt, Fredrick Meunier
+ Copyright (c) 2001-2015 Philip Kendall, Darren Salt, Fredrick Meunier
- $Id: libspectrum.h.in 4836 2012-12-31 15:40:10Z zubzero $
+ $Id: libspectrum.h.in 5422 2016-04-29 12:54:59Z fredm $
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -327,12 +327,26 @@
} libspectrum_mem_vtable_t;
WIN32_DLL void* libspectrum_malloc( size_t size );
-WIN32_DLL void* libspectrum_calloc( size_t nmemb, size_t size );
+WIN32_DLL void* libspectrum_malloc_n( size_t nmemb, size_t size );
+WIN32_DLL void* libspectrum_malloc0_n( size_t nmemb, size_t size );
WIN32_DLL void* libspectrum_realloc( void *ptr, size_t size );
+WIN32_DLL void* libspectrum_realloc_n( void *ptr, size_t nmemb, size_t size );
WIN32_DLL void libspectrum_free( void *ptr );
WIN32_DLL void libspectrum_mem_set_vtable( libspectrum_mem_vtable_t *table );
+#define libspectrum_new( type, count ) \
+ ( ( type * ) libspectrum_malloc_n( (count), sizeof( type ) ) )
+
+#define libspectrum_new0( type, count ) \
+ ( ( type * ) libspectrum_malloc0_n( (count), sizeof( type ) ) )
+
+#define libspectrum_renew( type, mem, count ) \
+ ( ( type * ) libspectrum_realloc_n( (void *)mem, (count), sizeof( type ) ) )
+
+/* Deprecated */
+#define libspectrum_calloc libspectrum_malloc0_n
+
/* Attempt to identify a given file */
/* Various types of file we might manage to identify */
@@ -402,12 +416,20 @@
LIBSPECTRUM_ID_DISK_SAD, /* .sad generic disk image */
LIBSPECTRUM_ID_DISK_TD0, /* .td0 generic disk image */
+ /* Below here, present only in 1.0.0 and later */
+
LIBSPECTRUM_ID_DISK_OPD, /* .opu/.opd Opus Discovery disk image */
+ /* Below here, present only in 1.1.0 and later */
+
LIBSPECTRUM_ID_TAPE_PZX, /* PZX tape image */
LIBSPECTRUM_ID_AUX_POK, /* POKE file */
+ /* Below here, present only in 1.2.0 and later */
+
+ LIBSPECTRUM_ID_DISK_D80, /* .d80/.d40 Didaktik disk image */
+
LIBSPECTRUM_ID_SCREEN_SCR, /* .scr screen file */
} libspectrum_id_t;
@@ -446,8 +468,14 @@
LIBSPECTRUM_CLASS_DISK_GENERIC, /* generic disk image */
+ /* Below here, present only in 1.1.0 and later */
+
LIBSPECTRUM_CLASS_AUXILIARY, /* auxiliary supported file */
+ /* Below here, present only in 1.2.0 and later */
+
+ LIBSPECTRUM_CLASS_DISK_DIDAKTIK, /* Didaktik disk */
+
LIBSPECTRUM_CLASS_SCREENSHOT, /* Screenshot */
} libspectrum_class_t;
@@ -963,6 +991,70 @@
WIN32_DLL void libspectrum_snap_set_late_timings( libspectrum_snap *snap, int late_timings );
WIN32_DLL int libspectrum_snap_zx_printer_active( libspectrum_snap *snap );
WIN32_DLL void libspectrum_snap_set_zx_printer_active( libspectrum_snap *snap, int zx_printer_active );
+WIN32_DLL int libspectrum_snap_usource_active( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_usource_active( libspectrum_snap *snap, int usource_active );
+WIN32_DLL int libspectrum_snap_usource_paged( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_usource_paged( libspectrum_snap *snap, int usource_paged );
+WIN32_DLL int libspectrum_snap_usource_custom_rom( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_usource_custom_rom( libspectrum_snap *snap, int usource_custom_rom );
+WIN32_DLL libspectrum_byte * libspectrum_snap_usource_rom( libspectrum_snap *snap, int idx );
+WIN32_DLL void libspectrum_snap_set_usource_rom( libspectrum_snap *snap, int idx, libspectrum_byte* usource_rom );
+WIN32_DLL size_t libspectrum_snap_usource_rom_length( libspectrum_snap *snap, int idx );
+WIN32_DLL void libspectrum_snap_set_usource_rom_length( libspectrum_snap *snap, int idx, size_t usource_rom_length );
+WIN32_DLL int libspectrum_snap_disciple_active( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_disciple_active( libspectrum_snap *snap, int disciple_active );
+WIN32_DLL int libspectrum_snap_disciple_paged( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_disciple_paged( libspectrum_snap *snap, int disciple_paged );
+WIN32_DLL int libspectrum_snap_disciple_inhibit_button( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_disciple_inhibit_button( libspectrum_snap *snap, int disciple_inhibit_button );
+WIN32_DLL int libspectrum_snap_disciple_drive_count( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_disciple_drive_count( libspectrum_snap *snap, int disciple_drive_count );
+WIN32_DLL int libspectrum_snap_disciple_custom_rom( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_disciple_custom_rom( libspectrum_snap *snap, int disciple_custom_rom );
+WIN32_DLL size_t libspectrum_snap_disciple_rom_length( libspectrum_snap *snap, int idx );
+WIN32_DLL void libspectrum_snap_set_disciple_rom_length( libspectrum_snap *snap, int idx, size_t disciple_rom_length );
+WIN32_DLL int libspectrum_snap_disciple_direction( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_disciple_direction( libspectrum_snap *snap, int disciple_direction );
+WIN32_DLL libspectrum_byte libspectrum_snap_disciple_control( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_disciple_control( libspectrum_snap *snap, libspectrum_byte disciple_control );
+WIN32_DLL libspectrum_byte libspectrum_snap_disciple_track( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_disciple_track( libspectrum_snap *snap, libspectrum_byte disciple_track );
+WIN32_DLL libspectrum_byte libspectrum_snap_disciple_sector( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_disciple_sector( libspectrum_snap *snap, libspectrum_byte disciple_sector );
+WIN32_DLL libspectrum_byte libspectrum_snap_disciple_data( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_disciple_data( libspectrum_snap *snap, libspectrum_byte disciple_data );
+WIN32_DLL libspectrum_byte libspectrum_snap_disciple_status( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_disciple_status( libspectrum_snap *snap, libspectrum_byte disciple_status );
+WIN32_DLL libspectrum_byte * libspectrum_snap_disciple_rom( libspectrum_snap *snap, int idx );
+WIN32_DLL void libspectrum_snap_set_disciple_rom( libspectrum_snap *snap, int idx, libspectrum_byte* disciple_rom );
+WIN32_DLL libspectrum_byte * libspectrum_snap_disciple_ram( libspectrum_snap *snap, int idx );
+WIN32_DLL void libspectrum_snap_set_disciple_ram( libspectrum_snap *snap, int idx, libspectrum_byte* disciple_ram );
+WIN32_DLL int libspectrum_snap_didaktik80_active( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_didaktik80_active( libspectrum_snap *snap, int didaktik80_active );
+WIN32_DLL int libspectrum_snap_didaktik80_paged( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_didaktik80_paged( libspectrum_snap *snap, int didaktik80_paged );
+WIN32_DLL int libspectrum_snap_didaktik80_drive_count( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_didaktik80_drive_count( libspectrum_snap *snap, int didaktik80_drive_count );
+WIN32_DLL int libspectrum_snap_didaktik80_custom_rom( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_didaktik80_custom_rom( libspectrum_snap *snap, int didaktik80_custom_rom );
+WIN32_DLL size_t libspectrum_snap_didaktik80_rom_length( libspectrum_snap *snap, int idx );
+WIN32_DLL void libspectrum_snap_set_didaktik80_rom_length( libspectrum_snap *snap, int idx, size_t didaktik80_rom_length );
+WIN32_DLL int libspectrum_snap_didaktik80_direction( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_didaktik80_direction( libspectrum_snap *snap, int didaktik80_direction );
+WIN32_DLL libspectrum_byte libspectrum_snap_didaktik80_aux( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_didaktik80_aux( libspectrum_snap *snap, libspectrum_byte didaktik80_aux );
+WIN32_DLL libspectrum_byte libspectrum_snap_didaktik80_track( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_didaktik80_track( libspectrum_snap *snap, libspectrum_byte didaktik80_track );
+WIN32_DLL libspectrum_byte libspectrum_snap_didaktik80_sector( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_didaktik80_sector( libspectrum_snap *snap, libspectrum_byte didaktik80_sector );
+WIN32_DLL libspectrum_byte libspectrum_snap_didaktik80_data( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_didaktik80_data( libspectrum_snap *snap, libspectrum_byte didaktik80_data );
+WIN32_DLL libspectrum_byte libspectrum_snap_didaktik80_status( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_didaktik80_status( libspectrum_snap *snap, libspectrum_byte didaktik80_status );
+WIN32_DLL libspectrum_byte * libspectrum_snap_didaktik80_rom( libspectrum_snap *snap, int idx );
+WIN32_DLL void libspectrum_snap_set_didaktik80_rom( libspectrum_snap *snap, int idx, libspectrum_byte* didaktik80_rom );
+WIN32_DLL libspectrum_byte * libspectrum_snap_didaktik80_ram( libspectrum_snap *snap, int idx );
+WIN32_DLL void libspectrum_snap_set_didaktik80_ram( libspectrum_snap *snap, int idx, libspectrum_byte* didaktik80_ram );
/*
* Tape handling routines
@@ -1351,6 +1443,8 @@
libspectrum_rzx_iterator_begin( libspectrum_rzx *rzx );
WIN32_DLL libspectrum_rzx_iterator
libspectrum_rzx_iterator_next( libspectrum_rzx_iterator it );
+WIN32_DLL libspectrum_rzx_iterator
+libspectrum_rzx_iterator_last( libspectrum_rzx *rzx );
WIN32_DLL libspectrum_rzx_block_id
libspectrum_rzx_iterator_get_type( libspectrum_rzx_iterator it );
@@ -1365,6 +1459,9 @@
WIN32_DLL int
libspectrum_rzx_iterator_snap_is_automatic( libspectrum_rzx_iterator it );
+WIN32_DLL libspectrum_error
+libspectrum_rzx_finalise( libspectrum_rzx *rzx );
+
/*
* Microdrive image handling routines
*/
Modified: trunk/libspectrum/generate.pl
===================================================================
--- trunk/libspectrum/generate.pl 2016-05-24 14:57:07 UTC (rev 802)
+++ trunk/libspectrum/generate.pl 2016-05-25 11:30:52 UTC (rev 803)
@@ -177,14 +177,13 @@
if( /LIBSPECTRUM_INCLUDE_GCRYPT/ ) {
- $_ = '';
+ $_ = "#include <gcrypt.h>\n";
}
if( /LIBSPECTRUM_SIGNATURE_PARAMETERS/ ) {
- $_ = "/* Signature parameters not stored as libgcrypt is not present */
-";
+ $_ = " /* The DSA signature parameters 'r' and 's' */\n gcry_mpi_t r, s;\n";
}
@@ -216,6 +215,13 @@
CODE
}
+if( /LIBSPECTRUM_AUTOGEN_WARNING/ ) {
+ $_ = << "CODE";
+/* NB: This file is autogenerated from libspectrum.h.in. Do not edit
+ unless you know what you're doing */
+CODE
+}
+
if( /LIBSPECTRUM_SNAP_ACCESSORS/ ) {
open( DATAFILE, '<' . "$ENV{SRCROOT}/libspectrum/snap_accessors.txt" ) or die "Couldn't open `$ENV{SRCROOT}/libspectrum/snap_accessors.txt': $!";
Index: trunk/libspectrum/libspectrum
===================================================================
--- trunk/libspectrum/libspectrum 2016-05-24 14:57:07 UTC (rev 802)
+++ trunk/libspectrum/libspectrum 2016-05-25 11:30:52 UTC (rev 803)
Property changes on: trunk/libspectrum/libspectrum
___________________________________________________________________
Modified: svn:mergeinfo
## -1,5 +1,5 ##
/vendor/fuse-emulator/0.10.0/libspectrum:556-557
/vendor/fuse-emulator/0.10.0-pre1/libspectrum:545-546
-/vendor/fuse-emulator/current/libspectrum:530-755
+/vendor/fuse-emulator/current/libspectrum:530-802
/vendor/fuse-emulator/fuse-1.0.0a/libspectrum:668-669
/vendor/fuse-emulator/fuse-r4617/libspectrum:686
\ No newline at end of property
Index: trunk/libspectrum/libspectrum/AUTHORS
===================================================================
--- trunk/libspectrum/libspectrum/AUTHORS 2016-05-24 14:57:07 UTC (rev 802)
+++ trunk/libspectrum/libspectrum/AUTHORS 2016-05-25 11:30:52 UTC (rev 803)
Property changes on: trunk/libspectrum/libspectrum/AUTHORS
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/libspectrum/libspectrum/COPYING
===================================================================
--- trunk/libspectrum/libspectrum/COPYING 2016-05-24 14:57:07 UTC (rev 802)
+++ trunk/libspectrum/libspectrum/COPYING 2016-05-25 11:30:52 UTC (rev 803)
Property changes on: trunk/libspectrum/libspectrum/COPYING
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/libspectrum/libspectrum/ChangeLog
===================================================================
--- trunk/libspectrum/libspectrum/ChangeLog 2016-05-24 14:57:07 UTC (rev 802)
+++ trunk/libspectrum/libspectrum/ChangeLog 2016-05-25 11:30:52 UTC (rev 803)
@@ -1,3 +1,42 @@
+2016-??-?? Philip Kendall <phi...@sh...>
+
+ * libspectrum 1.2.0 released.
+
+ * Allow finalising RZX recordings (Sergio Baldoví).
+
+ * Support for Didaktik D80 disk class (Gergely Szasz).
+
+ * Use SZX format for interspersed snapshots in RZX recordings (Sergio
+ Baldoví).
+
+ * Add libspectrum_{new,new0,renew}(), libspectrum_{m,re}alloc_n()
+ memory macros (Stuart Brady).
+
+ * Rename libspectrum_calloc() to libspectrum_malloc0_n() (Stuart Brady).
+
+ * Various minor bug fixes/improvements:
+ * Modernise autoconf support (Sergio Baldoví).
+ * Fix snapshot insertion in RZX recordings (Sergio Baldoví).
+ * Ensure we have an edge at the end of a tape - fixes loading of Moon
+ Cresta (Fredrick Meunier).
+ * Avoid reliance on undefined pointer overflow in buffer length checks
+ (Stuart Brady).
+ * Add ARRAY_SIZE macro (Stuart Brady).
+ * Fix overallocation for uncompressed Z80 v2 data blocks (Stuart
+ Brady).
+ * Check for overflow in libspectrum_calloc() (Stuart Brady).
+ * Replace automatic fallback to GLib replacement with --with-fake-glib
+ flag (Stuart Brady).
+ * const and static cleanups (Stuart Brady).
+ * Fix compilation on systems without stdint.h (Stuart Brady).
+ * C89 compilation fixes (Adrien Destugues)
+ * Refactor frame timings (Stuart Brady).
+ * Add pkg.m4 for PKG_CHECK_MODULES in case the platform doesn't have
+ pkg-config installed (Sergio Baldoví).
+ * Enable silent rules for perl and windres commands (Sergio Baldoví).
+ * Allow for the inital_level of PZX data blocks to have the default
+ value (Fredrick Meunier).
+
2013-05-24 Philip Kendall <phi...@sh...>
* libspectrum 1.1.1 released.
@@ -340,5 +379,5 @@
* libspectrum separated from Fuse just before the 0.5.0 release of
Fuse; see Fuse's ChangeLog for changes up to this point
-$Id: ChangeLog 4994 2013-05-24 19:52:37Z zubzero $
+$Id: ChangeLog 5413 2016-04-27 11:50:17Z fredm $
Property changes on: trunk/libspectrum/libspectrum/ChangeLog
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/libspectrum/libspectrum/Makefile.am
===================================================================
--- trunk/libspectrum/libspectrum/Makefile.am 2016-05-24 14:57:07 UTC (rev 802)
+++ trunk/libspectrum/libspectrum/Makefile.am 2016-05-25 11:30:52 UTC (rev 803)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
-## Copyright (c) 2001-2013 Philip Kendall
+## Copyright (c) 2001-2016 Philip Kendall
-## $Id: Makefile.am 4985 2013-05-24 17:27:14Z zubzero $
+## $Id: Makefile.am 5438 2016-05-01 16:27:08Z sbaldovi $
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -63,7 +63,7 @@
zlib.c \
zxs.c
-libspectrum_la_LDFLAGS = -version-info 9:0:1 -no-undefined @WINDRES_LDFLAGS@
+libspectrum_la_LDFLAGS = -version-info 10:0:2 -no-undefined @WINDRES_LDFLAGS@
libspectrum_la_LIBADD = @AUDIOFILE_LIBS@ @GLIB_LIBS@ -lm
@@ -80,32 +80,35 @@
AM_CFLAGS = -DLIBSPECTRUM_EXPORTS
make-perl$(EXEEXT): $(srcdir)/make-perl.c config.h
- $(CC_FOR_BUILD) -I. $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $<
+ $(AM_V_CC)$(CC_FOR_BUILD) -I. -o $@ $<
libspectrum.h: libspectrum.h.in generate.pl snap_accessors.txt tape_accessors.txt config.h
- @PERL@ -p generate.pl $(srcdir) $(srcdir)/libspectrum.h.in > $@.tmp && mv $@.tmp $@
+ $(AM_V_GEN)$(PERL) -p generate.pl $(srcdir) $(srcdir)/libspectrum.h.in > $@.tmp && mv $@.tmp $@
generate.pl: make-perl$(EXEEXT) generate.pl.in
- ./make-perl$(EXEEXT) > $@
- cat $(srcdir)/generate.pl.in >> $@
+ $(AM_V_GEN)./make-perl$(EXEEXT) > $@
+ $(AM_V_at)cat $(srcdir)/generate.pl.in >> $@
snap_accessors.c: accessor.pl snap_accessors.txt
- @PERL@ $(srcdir)/accessor.pl $(srcdir)/snap_accessors.txt > $@.tmp && mv $@.tmp $@
+ $(AM_V_GEN)$(PERL) $(srcdir)/accessor.pl $(srcdir)/snap_accessors.txt > $@.tmp && mv $@.tmp $@
tape_accessors.c: tape_accessors.pl tape_accessors.txt
- @PERL@ $(srcdir)/tape_accessors.pl $(srcdir)/tape_accessors.txt > $@.tmp && mv $@.tmp $@
+ $(AM_V_GEN)$(PERL) $(srcdir)/tape_accessors.pl $(srcdir)/tape_accessors.txt > $@.tmp && mv $@.tmp $@
tape_set.c: tape_set.pl tape_accessors.txt
- @PERL@ $(srcdir)/tape_set.pl $(srcdir)/tape_accessors.txt > $@.tmp && mv $@.tmp $@
+ $(AM_V_GEN)$(PERL) $(srcdir)/tape_set.pl $(srcdir)/tape_accessors.txt > $@.tmp && mv $@.tmp $@
windres.o: windres.rc
- @WINDRES@ -I. $(srcdir)/windres.rc windres.o
+ $(AM_V_GEN)$(WINDRES) -I. $(srcdir)/windres.rc windres.o
AM_CPPFLAGS = @GLIB_CFLAGS@ @AUDIOFILE_CFLAGS@
EXTRA_DIST = accessor.pl \
+ dll.c \
generate.pl.in \
m4/audiofile.m4 \
+ m4/ax_create_stdint_h.m4 \
+ m4/pkg.m4 \
make-perl.c \
tape_accessors.pl \
tape_accessors.txt \
Property changes on: trunk/libspectrum/libspectrum/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/libspectrum/libspectrum/README
===================================================================
--- trunk/libspectrum/libspectrum/README 2016-05-24 14:57:07 UTC (rev 802)
+++ trunk/libspectrum/libspectrum/README 2016-05-25 11:30:52 UTC (rev 803)
@@ -1,4 +1,4 @@
-libspectrum 1.1.1
+libspectrum 1.2.0
=================
libspectrum is a library which is designed to make the input and
@@ -13,8 +13,8 @@
* Tape images: .tzx, .tap, .spc, .sta and .ltp (read/write) and
.pzx, Warajevo .tap, Z80Em and CSW version 1 (read only).
* Input recordings: .rzx (read/write).
-* Disk images: .dsk (both plain and extended), .fdi, .sad, .scl, .td0,
- .trd and .udi (identification only).
+* Disk images: .dsk (both plain and extended), .d40, .d80, .fdi, .img,
+ .mgt, .opd, .sad, .scl, .td0, .trd and .udi (identification only).
* Timex cartridges: .dck (read only).
* IDE hard disk images: .hdf (read/write).
* Microdrive cartridge images: .mdr (read/write).
@@ -59,7 +59,7 @@
./configure --target=powerpc-gekko --host=powerpc-gekko \
--prefix=$DEVKITPPC \
- --without-gcrypt --without-glib --without-libaudiofile
+ --without-gcrypt --with-fake-glib --without-libaudiofile
That is assuming you don't have gcrypt, glib and libaudiofile for the
Wii. At the time of writing, those haven't been ported yet.
@@ -69,4 +69,4 @@
Philip Kendall <phi...@sh...>
24th May, 2013
-$Id: README 4992 2013-05-24 19:49:15Z zubzero $
+$Id: README 5428 2016-04-30 07:03:25Z sbaldovi $
Property changes on: trunk/libspectrum/libspectrum/README
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of prope...
[truncated message content] |
|
From: <fr...@us...> - 2016-05-24 14:57:08
|
Revision: 802
http://sourceforge.net/p/fuse-for-macosx/code/802
Author: fredm
Date: 2016-05-24 14:57:07 +0000 (Tue, 24 May 2016)
Log Message:
-----------
Tag vendor/fuse-emulator/current as
vendor/fuse-emulator/fuse-1.2.0-r5525.
Revision Links:
--------------
http://sourceforge.net/p/fuse-for-macosx/code/5525
Added Paths:
-----------
vendor/fuse-emulator/fuse-1.2.0-r5525/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2016-05-24 14:56:53
|
Revision: 801
http://sourceforge.net/p/fuse-for-macosx/code/801
Author: fredm
Date: 2016-05-24 14:56:49 +0000 (Tue, 24 May 2016)
Log Message:
-----------
Load . into vendor/fuse-emulator/current.
Modified Paths:
--------------
vendor/fuse-emulator/current/fuse/AUTHORS
vendor/fuse-emulator/current/fuse/ChangeLog
vendor/fuse-emulator/current/fuse/INSTALL
vendor/fuse-emulator/current/fuse/Makefile.am
vendor/fuse-emulator/current/fuse/README
vendor/fuse-emulator/current/fuse/THANKS
vendor/fuse-emulator/current/fuse/autogen.sh
vendor/fuse-emulator/current/fuse/bitmap.h
vendor/fuse-emulator/current/fuse/compat/Makefile.am
vendor/fuse-emulator/current/fuse/compat/unix/socket.c
vendor/fuse-emulator/current/fuse/compat/unix/tuntap.c
vendor/fuse-emulator/current/fuse/compat/win32/osname.c
vendor/fuse-emulator/current/fuse/compat/win32/socket.c
vendor/fuse-emulator/current/fuse/compat.h
vendor/fuse-emulator/current/fuse/configure.ac
vendor/fuse-emulator/current/fuse/data/Makefile.am
vendor/fuse-emulator/current/fuse/data/fuse.desktop.in
vendor/fuse-emulator/current/fuse/data/fuse.xml.in
vendor/fuse-emulator/current/fuse/data/win32/installer.nsi.in
vendor/fuse-emulator/current/fuse/debugger/Makefile.am
vendor/fuse-emulator/current/fuse/debugger/breakpoint.c
vendor/fuse-emulator/current/fuse/debugger/breakpoint.h
vendor/fuse-emulator/current/fuse/debugger/command.c
vendor/fuse-emulator/current/fuse/debugger/commandl.l
vendor/fuse-emulator/current/fuse/debugger/commandy.y
vendor/fuse-emulator/current/fuse/debugger/debugger.h
vendor/fuse-emulator/current/fuse/debugger/debugger_internals.h
vendor/fuse-emulator/current/fuse/debugger/disassemble.c
vendor/fuse-emulator/current/fuse/debugger/event.c
vendor/fuse-emulator/current/fuse/debugger/expression.c
vendor/fuse-emulator/current/fuse/debugger/variable.c
vendor/fuse-emulator/current/fuse/display.c
vendor/fuse-emulator/current/fuse/event.c
vendor/fuse-emulator/current/fuse/fuse.c
vendor/fuse-emulator/current/fuse/fuse.h
vendor/fuse-emulator/current/fuse/hacking/ChangeLog
vendor/fuse-emulator/current/fuse/hacking/Makefile.am
vendor/fuse-emulator/current/fuse/hacking/peripheral_tests.txt
vendor/fuse-emulator/current/fuse/keyboard.c
vendor/fuse-emulator/current/fuse/keysyms.pl
vendor/fuse-emulator/current/fuse/lib/Makefile.am
vendor/fuse-emulator/current/fuse/m4/ax_pthread.m4
vendor/fuse-emulator/current/fuse/m4/pkg.m4
vendor/fuse-emulator/current/fuse/machine.c
vendor/fuse-emulator/current/fuse/machines/Makefile.am
vendor/fuse-emulator/current/fuse/machines/machines_periph.c
vendor/fuse-emulator/current/fuse/machines/pentagon.c
vendor/fuse-emulator/current/fuse/machines/pentagon.h
vendor/fuse-emulator/current/fuse/machines/spec16.c
vendor/fuse-emulator/current/fuse/machines/spec_se.c
vendor/fuse-emulator/current/fuse/machines/specplus3.c
vendor/fuse-emulator/current/fuse/machines/specplus3.h
vendor/fuse-emulator/current/fuse/machines/tc2048.c
vendor/fuse-emulator/current/fuse/machines/tc2068.c
vendor/fuse-emulator/current/fuse/machines/tc2068.h
vendor/fuse-emulator/current/fuse/machines/ts2068.c
vendor/fuse-emulator/current/fuse/man/Makefile.am
vendor/fuse-emulator/current/fuse/man/fuse.1
vendor/fuse-emulator/current/fuse/memory.c
vendor/fuse-emulator/current/fuse/memory.h
vendor/fuse-emulator/current/fuse/mempool.c
vendor/fuse-emulator/current/fuse/mempool.h
vendor/fuse-emulator/current/fuse/menu.c
vendor/fuse-emulator/current/fuse/menu.h
vendor/fuse-emulator/current/fuse/menu_data.dat
vendor/fuse-emulator/current/fuse/menu_data.pl
vendor/fuse-emulator/current/fuse/movie.c
vendor/fuse-emulator/current/fuse/periph.c
vendor/fuse-emulator/current/fuse/periph.h
vendor/fuse-emulator/current/fuse/peripherals/Makefile.am
vendor/fuse-emulator/current/fuse/peripherals/ay.c
vendor/fuse-emulator/current/fuse/peripherals/ay.h
vendor/fuse-emulator/current/fuse/peripherals/dck.c
vendor/fuse-emulator/current/fuse/peripherals/disk/beta.c
vendor/fuse-emulator/current/fuse/peripherals/disk/beta.h
vendor/fuse-emulator/current/fuse/peripherals/disk/disciple.c
vendor/fuse-emulator/current/fuse/peripherals/disk/disciple.h
vendor/fuse-emulator/current/fuse/peripherals/disk/disk.c
vendor/fuse-emulator/current/fuse/peripherals/disk/disk.h
vendor/fuse-emulator/current/fuse/peripherals/disk/fdd.c
vendor/fuse-emulator/current/fuse/peripherals/disk/fdd.h
vendor/fuse-emulator/current/fuse/peripherals/disk/opus.c
vendor/fuse-emulator/current/fuse/peripherals/disk/opus.h
vendor/fuse-emulator/current/fuse/peripherals/disk/plusd.c
vendor/fuse-emulator/current/fuse/peripherals/disk/plusd.h
vendor/fuse-emulator/current/fuse/peripherals/disk/upd_fdc.c
vendor/fuse-emulator/current/fuse/peripherals/disk/upd_fdc.h
vendor/fuse-emulator/current/fuse/peripherals/disk/wd_fdc.c
vendor/fuse-emulator/current/fuse/peripherals/disk/wd_fdc.h
vendor/fuse-emulator/current/fuse/peripherals/flash/am29f010.c
vendor/fuse-emulator/current/fuse/peripherals/fuller.c
vendor/fuse-emulator/current/fuse/peripherals/ide/divide.c
vendor/fuse-emulator/current/fuse/peripherals/ide/ide.c
vendor/fuse-emulator/current/fuse/peripherals/ide/simpleide.c
vendor/fuse-emulator/current/fuse/peripherals/ide/zxatasp.c
vendor/fuse-emulator/current/fuse/peripherals/ide/zxcf.c
vendor/fuse-emulator/current/fuse/peripherals/if1.c
vendor/fuse-emulator/current/fuse/peripherals/if1.h
vendor/fuse-emulator/current/fuse/peripherals/if2.c
vendor/fuse-emulator/current/fuse/peripherals/joystick.c
vendor/fuse-emulator/current/fuse/peripherals/joystick.h
vendor/fuse-emulator/current/fuse/peripherals/kempmouse.c
vendor/fuse-emulator/current/fuse/peripherals/melodik.c
vendor/fuse-emulator/current/fuse/peripherals/nic/enc28j60.c
vendor/fuse-emulator/current/fuse/peripherals/nic/w5100.c
vendor/fuse-emulator/current/fuse/peripherals/nic/w5100_internals.h
vendor/fuse-emulator/current/fuse/peripherals/nic/w5100_socket.c
vendor/fuse-emulator/current/fuse/peripherals/printer.c
vendor/fuse-emulator/current/fuse/peripherals/scld.c
vendor/fuse-emulator/current/fuse/peripherals/scld.h
vendor/fuse-emulator/current/fuse/peripherals/speccyboot.c
vendor/fuse-emulator/current/fuse/peripherals/speccyboot.h
vendor/fuse-emulator/current/fuse/peripherals/specdrum.c
vendor/fuse-emulator/current/fuse/peripherals/specdrum.h
vendor/fuse-emulator/current/fuse/peripherals/spectranet.c
vendor/fuse-emulator/current/fuse/peripherals/spectranet.h
vendor/fuse-emulator/current/fuse/peripherals/ula.c
vendor/fuse-emulator/current/fuse/perl/Fuse/Dialog.pm
vendor/fuse-emulator/current/fuse/perl/Makefile.am
vendor/fuse-emulator/current/fuse/pokefinder/Makefile.am
vendor/fuse-emulator/current/fuse/pokefinder/pokemem.c
vendor/fuse-emulator/current/fuse/rectangle.c
vendor/fuse-emulator/current/fuse/roms/Makefile.am
vendor/fuse-emulator/current/fuse/roms/se-0.rom
vendor/fuse-emulator/current/fuse/roms/se-1.rom
vendor/fuse-emulator/current/fuse/rzx.c
vendor/fuse-emulator/current/fuse/rzx.h
vendor/fuse-emulator/current/fuse/screenshot.c
vendor/fuse-emulator/current/fuse/settings-header.pl
vendor/fuse-emulator/current/fuse/settings.dat
vendor/fuse-emulator/current/fuse/settings.pl
vendor/fuse-emulator/current/fuse/slt.c
vendor/fuse-emulator/current/fuse/sound/Makefile.am
vendor/fuse-emulator/current/fuse/sound/aosound.c
vendor/fuse-emulator/current/fuse/sound/blipbuffer.h
vendor/fuse-emulator/current/fuse/sound/sdlsound.c
vendor/fuse-emulator/current/fuse/sound/win32sound.c
vendor/fuse-emulator/current/fuse/sound.c
vendor/fuse-emulator/current/fuse/sound.h
vendor/fuse-emulator/current/fuse/spectrum.c
vendor/fuse-emulator/current/fuse/tape.c
vendor/fuse-emulator/current/fuse/tape.h
vendor/fuse-emulator/current/fuse/timer/Makefile.am
vendor/fuse-emulator/current/fuse/ui/Makefile.am
vendor/fuse-emulator/current/fuse/ui/fb/Makefile.am
vendor/fuse-emulator/current/fuse/ui/fb/fbdisplay.c
vendor/fuse-emulator/current/fuse/ui/fb/fbmouse.c
vendor/fuse-emulator/current/fuse/ui/fb/fbui.c
vendor/fuse-emulator/current/fuse/ui/gtk/Makefile.am
vendor/fuse-emulator/current/fuse/ui/gtk/binary.c
vendor/fuse-emulator/current/fuse/ui/gtk/browse.c
vendor/fuse-emulator/current/fuse/ui/gtk/confirm.c
vendor/fuse-emulator/current/fuse/ui/gtk/debugger.c
vendor/fuse-emulator/current/fuse/ui/gtk/fileselector.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkcompat.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkcompat.h
vendor/fuse-emulator/current/fuse/ui/gtk/gtkdisplay.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkinternals.h
vendor/fuse-emulator/current/fuse/ui/gtk/gtkjoystick.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkmouse.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkui.c
vendor/fuse-emulator/current/fuse/ui/gtk/memory.c
vendor/fuse-emulator/current/fuse/ui/gtk/options.pl
vendor/fuse-emulator/current/fuse/ui/gtk/pokefinder.c
vendor/fuse-emulator/current/fuse/ui/gtk/pokemem.c
vendor/fuse-emulator/current/fuse/ui/gtk/roms.c
vendor/fuse-emulator/current/fuse/ui/gtk/statusbar.c
vendor/fuse-emulator/current/fuse/ui/gtk/stock.c
vendor/fuse-emulator/current/fuse/ui/options.dat
vendor/fuse-emulator/current/fuse/ui/scaler/Makefile.am
vendor/fuse-emulator/current/fuse/ui/scaler/scaler.c
vendor/fuse-emulator/current/fuse/ui/scaler/scalers.c
vendor/fuse-emulator/current/fuse/ui/sdl/Makefile.am
vendor/fuse-emulator/current/fuse/ui/sdl/sdldisplay.c
vendor/fuse-emulator/current/fuse/ui/sdl/sdljoystick.c
vendor/fuse-emulator/current/fuse/ui/sdl/sdlui.c
vendor/fuse-emulator/current/fuse/ui/svga/Makefile.am
vendor/fuse-emulator/current/fuse/ui/svga/svgadisplay.c
vendor/fuse-emulator/current/fuse/ui/svga/svgajoystick.c
vendor/fuse-emulator/current/fuse/ui/ui.h
vendor/fuse-emulator/current/fuse/ui/uijoystick.c
vendor/fuse-emulator/current/fuse/ui/uijoystick.h
vendor/fuse-emulator/current/fuse/ui/widget/Makefile.am
vendor/fuse-emulator/current/fuse/ui/widget/debugger.c
vendor/fuse-emulator/current/fuse/ui/widget/error.c
vendor/fuse-emulator/current/fuse/ui/widget/filesel.c
vendor/fuse-emulator/current/fuse/ui/widget/menu.c
vendor/fuse-emulator/current/fuse/ui/widget/mkfusefont.pl
vendor/fuse-emulator/current/fuse/ui/widget/options.pl
vendor/fuse-emulator/current/fuse/ui/widget/pokefinder.c
vendor/fuse-emulator/current/fuse/ui/widget/pokemem.c
vendor/fuse-emulator/current/fuse/ui/widget/query.c
vendor/fuse-emulator/current/fuse/ui/widget/roms.c
vendor/fuse-emulator/current/fuse/ui/widget/select.c
vendor/fuse-emulator/current/fuse/ui/widget/text.c
vendor/fuse-emulator/current/fuse/ui/widget/widget.c
vendor/fuse-emulator/current/fuse/ui/widget/widget.h
vendor/fuse-emulator/current/fuse/ui/widget/widget_internals.h
vendor/fuse-emulator/current/fuse/ui/wii/Makefile.am
vendor/fuse-emulator/current/fuse/ui/win32/Makefile.am
vendor/fuse-emulator/current/fuse/ui/win32/browse.c
vendor/fuse-emulator/current/fuse/ui/win32/debugger.c
vendor/fuse-emulator/current/fuse/ui/win32/debugger.h
vendor/fuse-emulator/current/fuse/ui/win32/debugger.rc
vendor/fuse-emulator/current/fuse/ui/win32/fileselector.c
vendor/fuse-emulator/current/fuse/ui/win32/options-resource.pl
vendor/fuse-emulator/current/fuse/ui/win32/options.pl
vendor/fuse-emulator/current/fuse/ui/win32/pokefinder.c
vendor/fuse-emulator/current/fuse/ui/win32/pokemem.c
vendor/fuse-emulator/current/fuse/ui/win32/rollback.c
vendor/fuse-emulator/current/fuse/ui/win32/roms.c
vendor/fuse-emulator/current/fuse/ui/win32/win32joystick.c
vendor/fuse-emulator/current/fuse/ui/win32/win32joystick.h
vendor/fuse-emulator/current/fuse/ui/win32/win32joystick.rc
vendor/fuse-emulator/current/fuse/ui/win32/win32ui.c
vendor/fuse-emulator/current/fuse/ui/xlib/Makefile.am
vendor/fuse-emulator/current/fuse/ui/xlib/xdisplay.c
vendor/fuse-emulator/current/fuse/ui/xlib/xstatusbar.pl
vendor/fuse-emulator/current/fuse/ui/xlib/xui.c
vendor/fuse-emulator/current/fuse/ui.c
vendor/fuse-emulator/current/fuse/unittests/Makefile.am
vendor/fuse-emulator/current/fuse/unittests/unittests.c
vendor/fuse-emulator/current/fuse/unittests/unittests.h
vendor/fuse-emulator/current/fuse/utils.c
vendor/fuse-emulator/current/fuse/windres.rc
vendor/fuse-emulator/current/fuse/z80/Makefile.am
vendor/fuse-emulator/current/fuse/z80/coretest.c
vendor/fuse-emulator/current/fuse/z80/z80.c
vendor/fuse-emulator/current/fuse/z80/z80.h
vendor/fuse-emulator/current/fuse/z80/z80.pl
vendor/fuse-emulator/current/fuse/z80/z80_checks.h
vendor/fuse-emulator/current/fuse/z80/z80_macros.h
vendor/fuse-emulator/current/fuse/z80/z80_ops.c
vendor/fuse-emulator/current/libspectrum/ChangeLog
vendor/fuse-emulator/current/libspectrum/Makefile.am
vendor/fuse-emulator/current/libspectrum/README
vendor/fuse-emulator/current/libspectrum/accessor.pl
vendor/fuse-emulator/current/libspectrum/autogen.sh
vendor/fuse-emulator/current/libspectrum/bzip2.c
vendor/fuse-emulator/current/libspectrum/configure.ac
vendor/fuse-emulator/current/libspectrum/creator.c
vendor/fuse-emulator/current/libspectrum/crypto.c
vendor/fuse-emulator/current/libspectrum/csw.c
vendor/fuse-emulator/current/libspectrum/dck.c
vendor/fuse-emulator/current/libspectrum/doc/libspectrum.3
vendor/fuse-emulator/current/libspectrum/doc/libspectrum.txt
vendor/fuse-emulator/current/libspectrum/generate.pl.in
vendor/fuse-emulator/current/libspectrum/hacking/ChangeLog
vendor/fuse-emulator/current/libspectrum/ide.c
vendor/fuse-emulator/current/libspectrum/internals.h
vendor/fuse-emulator/current/libspectrum/libspectrum.c
vendor/fuse-emulator/current/libspectrum/libspectrum.h.in
vendor/fuse-emulator/current/libspectrum/make-perl.c
vendor/fuse-emulator/current/libspectrum/memory.c
vendor/fuse-emulator/current/libspectrum/microdrive.c
vendor/fuse-emulator/current/libspectrum/plusd.c
vendor/fuse-emulator/current/libspectrum/pzx_read.c
vendor/fuse-emulator/current/libspectrum/rzx.c
vendor/fuse-emulator/current/libspectrum/sna.c
vendor/fuse-emulator/current/libspectrum/snap_accessors.txt
vendor/fuse-emulator/current/libspectrum/snapshot.c
vendor/fuse-emulator/current/libspectrum/sp.c
vendor/fuse-emulator/current/libspectrum/szx.c
vendor/fuse-emulator/current/libspectrum/tap.c
vendor/fuse-emulator/current/libspectrum/tape.c
vendor/fuse-emulator/current/libspectrum/tape_block.c
vendor/fuse-emulator/current/libspectrum/test/Makefile.am
vendor/fuse-emulator/current/libspectrum/test/test.c
vendor/fuse-emulator/current/libspectrum/timings.c
vendor/fuse-emulator/current/libspectrum/tzx_read.c
vendor/fuse-emulator/current/libspectrum/tzx_write.c
vendor/fuse-emulator/current/libspectrum/warajevo_read.c
vendor/fuse-emulator/current/libspectrum/wav.c
vendor/fuse-emulator/current/libspectrum/z80.c
vendor/fuse-emulator/current/libspectrum/z80em.c
vendor/fuse-emulator/current/libspectrum/zlib.c
vendor/fuse-emulator/current/libspectrum/zxs.c
Added Paths:
-----------
vendor/fuse-emulator/current/fuse/data/shell-completion/
vendor/fuse-emulator/current/fuse/data/shell-completion/bash/
vendor/fuse-emulator/current/fuse/data/shell-completion/bash/fuse
vendor/fuse-emulator/current/fuse/data/shell-completion/diff_options.sh
vendor/fuse-emulator/current/fuse/data/win32/distribution.mk
vendor/fuse-emulator/current/fuse/hacking/code_beautifiers.txt
vendor/fuse-emulator/current/fuse/hacking/uncrustify.cfg
vendor/fuse-emulator/current/fuse/lib/tests/success.d80.bz2
vendor/fuse-emulator/current/fuse/m4/ax_create_stdint_h.m4
vendor/fuse-emulator/current/fuse/peripherals/disk/didaktik.c
vendor/fuse-emulator/current/fuse/peripherals/disk/didaktik.h
vendor/fuse-emulator/current/fuse/peripherals/usource.c
vendor/fuse-emulator/current/fuse/peripherals/usource.h
vendor/fuse-emulator/current/fuse/svg.c
vendor/fuse-emulator/current/fuse/svg.h
vendor/fuse-emulator/current/fuse/ui/uimedia.h
vendor/fuse-emulator/current/fuse/uimedia.c
vendor/fuse-emulator/current/libspectrum/m4/ax_create_stdint_h.m4
vendor/fuse-emulator/current/libspectrum/m4/pkg.m4
Removed Paths:
-------------
vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am
vendor/fuse-emulator/current/fuse/compat/linux/Makefile.am
vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am
vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am
vendor/fuse-emulator/current/fuse/compat/wii/Makefile.am
vendor/fuse-emulator/current/fuse/compat/win32/Makefile.am
vendor/fuse-emulator/current/fuse/peripherals/disk/Makefile.am
vendor/fuse-emulator/current/fuse/peripherals/flash/Makefile.am
vendor/fuse-emulator/current/fuse/peripherals/ide/Makefile.am
vendor/fuse-emulator/current/fuse/peripherals/nic/Makefile.am
vendor/fuse-emulator/current/fuse/perl/Fuse/Makefile.am
vendor/fuse-emulator/current/fuse/ui/win32/icons/Makefile.am
vendor/fuse-emulator/current/fuse/ui/win32/installer/
vendor/fuse-emulator/current/fuse/z80/tests/Makefile.am
Modified: vendor/fuse-emulator/current/fuse/AUTHORS
===================================================================
--- vendor/fuse-emulator/current/fuse/AUTHORS 2016-05-24 14:32:41 UTC (rev 800)
+++ vendor/fuse-emulator/current/fuse/AUTHORS 2016-05-24 14:56:49 UTC (rev 801)
@@ -11,7 +11,7 @@
* John Elliott: for lib765, which provided Fuse's original emulation of the
+3's FDC, and libdsk which provided support for more disk image formats:
- see http://www.seasip.demon.co.uk/Unix/LibDsk/
+ see http://www.seasip.info/Unix/LibDsk/index.html
* Darren Salt: the original versions of the code for +3 emulation,
SLT support, MITSHM support (for the Xlib UI), TZX raw data blocks,
@@ -41,8 +41,8 @@
* Garry Lancaster: the simple 8-bit IDE, ZXATASP and ZXCF support.
-* Gergely Szasz: +3, +D, Opus and Interface 1/Microdrive emulation, the 'movie'
- code and the ao sound driver.
+* Gergely Szasz: +3, +D, Opus, Didaktik 80 and Interface 1/Microdrive emulation,
+ the 'movie' code and the ALSO and ao sound drivers.
* Bjoern Giesler: the original Wii port.
@@ -54,4 +54,4 @@
* Philip Kendall: everything else.
-$Id: AUTHORS 4972 2013-05-19 16:46:43Z zubzero $
+$Id: AUTHORS 5357 2016-02-23 23:43:54Z sbaldovi $
Modified: vendor/fuse-emulator/current/fuse/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/ChangeLog 2016-05-24 14:32:41 UTC (rev 800)
+++ vendor/fuse-emulator/current/fuse/ChangeLog 2016-05-24 14:56:49 UTC (rev 801)
@@ -1,3 +1,172 @@
+2016-??-?? Philip Kendall <phi...@sh...>
+
+ * Fuse 1.2.0 released.
+
+ * New features:
+ * Add Currah µSource emulation (Stuart Brady).
+ * Add Didaktik 80/40 emulation (Gergely Szasz).
+ * Capture BASIC video functions to SVG file (Stefano Bodrato).
+ * Support bash completion (Sergio Baldoví).
+
+ * Emulation core improvements:
+ * Allow continuing RZX recordings if there is a final snapshot in the
+ RZX (Sergio Baldoví).
+ * Fix the prune function on RZX rollback (Sergio Baldoví).
+ * Fix loading of EDSK files with Sector Offset block (Sergio Baldoví).
+ * Fix speech in Cobra's Arc - Medium Case.tzx when loaded with tape
+ traps enabled (thanks, zx81 and Sergio Baldoví) (Fredrick Meunier).
+ * Migrate disk "index event" handling to the FDD layer and have the
+ FDC layer use it for their STATUS registers (Gergely Szasz).
+ * Set AF, AF' and SP to 0xffff on reset (Stuart Brady).
+ * Leave most registers unchanged on a soft reset (Stuart Brady).
+ * Emulate interrupt and NMI timings more precisely (Stuart Brady).
+ * Emulate NMOS and CMOS Z80 variants (Stuart Brady).
+ * Switch to 2KB page size (Stuart Brady).
+ * Implement WD2797 emulation (Gergely Szasz).
+ * Skip tape traps if VERIFY is requested (UB880D).
+ * Fix inaccurate output when AY envelopes are used (Matthew Westcott
+ and Fredrick Meunier)
+ * Fix some peripherals activation when loading snapshots (Sergio
+ Baldoví).
+ * Fix loading sound with some custom loaders (Fredrick Meunier).
+ * Centralise the "Disk icon" update code to the FDD layer (Gergely
+ Szasz).
+ * Check if data blocks are headers for handling PZX files (Fredrick
+ Meunier).
+ * Correct display of pulses in PZX pulse block for tape browser
+ (Fredrick Meunier).
+ * Fix disk image corruption after saving UDI files (Sergio Baldoví).
+ * Check ready status after loading a disk into floppy disk drive
+ (thanks, John Elliott) (Sergio Baldoví).
+ * Fix overlapped SEEK commands (Sergio Baldoví).
+ * Fix length of data returned by READ_DIAG (thanks, Fredrick Meunier)
+ (Sergio Baldoví).
+
+ * Machine specific improvements:
+ * The Timex SCLD is contended in all of the home, Dock and Exrom banks
+ in the 0x4000 - 0x7FFF range (thanks, rga24 from WoS) (Fredrick
+ Meunier).
+ * Clear all Opus RAM on hard reset (Stuart Brady).
+ * Ensure the ZX Printer does not require a hard reset to enable
+ (thanks, RMartins) (Fredrick Meunier).
+ * Fix timing of events when emulating Scorpion (Stuart Brady).
+ * Ensure we have successfully selected a Pentagon or a Timex machine
+ before inserting their media (Fredrick Meunier).
+ * Fix Beta 128 type II commands (thanks, windale and BogDan Vatra)
+ (Sergio Baldoví).
+ * Don't enable the Beta 128 interface when loading a snapshot on a
+ machine with Beta built-in (thanks, windale and BogDan Vatra)
+ (Fredrick Meunier).
+ * Lock port +3 1FFDh if paging is disabled (Brian Ruthven and Fredrick
+ Meunier).
+ * Spectranet: fix segfault in error handling when setting SO_REUSEADDR
+ (Stuart Brady).
+ * Prefer Scorpion to Pentagon when loading SCL/TRD disks for better
+ timing compatibility (part of feature request #90) (thanks, windale)
+ (Sergio Baldoví).
+ * Update SE ROMs to v4.07 (thanks, Andrew Owen) (Sergio Baldoví).
+
+ * Debugger improvements:
+ * Fix disassembly of LD (HL), LD (IX) and LD (IY) (BogDan Vatra).
+ * Add I and R register setting and getting to the debugger (Sergio
+ Baldoví).
+ * Show the status of the halted flag in the debugger (Stuart Brady).
+ * Fix time breakpoints later than a frame in the future (Sergio
+ Baldoví).
+ * Timex EXROM and Dock text was truncated in the debugger UI (thanks,
+ Andrew Owen and Sergio Baldoví) (Fredrick Meunier).
+ * Don't trap on breakpoints whilst halted (Stuart Brady).
+ * Win32: relocate halted flag and set monospaced font (Sergio
+ Baldoví).
+ * Fix memory issues when removing a matched breakpoint (Tom Seddon).
+ * Signal the UI when the breakpoints list is changed (BogDan Vatra).
+ * Document IF token for conditional expressions in debugger section
+ (thanks, TK90XFan) (Sergio Baldoví).
+ * Fix documentation of address syntax used in debugger section
+ (Sergio Baldoví).
+ * Allow debugger to dereference memory locations (Philip Kendall).
+
+ * Miscellaneous improvements:
+ * Remove warnings in aosound (Rene Ladan).
+ * Fix save tape traps with SE ROM (Andrew Owen and Fredrick Meunier).
+ * Don't ignore the return code from setuid() (Sergio Baldoví).
+ * Fix condition used in --with-desktop-dir option (thanks, wiz)
+ (Sergio Baldoví).
+ * Fix uninitialised keyboard button settings in GTK UI (UB880D).
+ * Fix pause when minimising Fuse on Windows (Sergio Baldoví).
+ * Generic FDD UI handling cleanup (Alex Badea).
+ * Remove unused macros on disk peripherals (Sergio Baldoví).
+ * Fix bad prototypes for activate signal on GTK UI (Sergio Baldoví).
+ * Ensure exiting on GTK UI when there are active breakpoints (Sergio
+ Baldoví).
+ * Improve scrolling of disassembly list on Win32 UI (Sergio Baldoví).
+ * Make mousewheel scrolling on memory browser GTK+ 3.4 compatible and
+ keep the selected row (Sergio Baldoví).
+ * Ignore unused-but-set-variable warnings for option dialogs on Win32
+ UI (Sergio Baldoví).
+ * Link to autoload snapshot for NTSC Spectrum (Sergio Baldoví).
+ * Fix desktop integration rules to cope with VPATH builds (Sergio
+ Baldoví).
+ * Modernise autoconf support (Sergio Baldoví Baldoví).
+ * Use unzipped tapes for peripheral tests (thanks, Phil Reynolds)
+ (Sergio Baldoví).
+ * Fix empty list in pokefinder on GTK+ 3 (Sergio Baldoví).
+ * Prefer GTK+ 3 to GTK+ 2 (Sergio Baldoví).
+ * Abort start if we can't drop root privileges (Fredrick Meunier).
+ * Use real GLib if and only if libspectrum does and make GTK+ UI
+ depend on real GLib (Stuart Brady).
+ * Split tape/Microdrive options into a new Media Options dialogue
+ (Stuart Brady).
+ * Fix memory leak in joystick UI (Sergio Baldoví).
+ * Don't show an error when rewinding an empty tape (Sergio Baldoví).
+ * GTK UI: clear out row mark in tape browser when selecting another
+ block (Sergio Baldoví).
+ * Add missing const qualifiers and casts (Stuart and Sergio Baldoví).
+ * Split Select ROMs menu into Machines and Peripherals (Gergely
+ Szasz).
+ * Only try to load the fallback ROM if it is different to the standard
+ one (Fredrick Meunier).
+ * Use PATH_MAX instead of FILENAME_MAX as our standard compatibility
+ define (thanks, Brian Ruthven) (Fredrick Meunier).
+ * WidgetUI: Fix build on Solaris (thanks, Brian Ruthven) (Fredrick
+ Meunier).
+ * Fix C89 compilation (Adrien Destugues).
+ * Standardise the number of joystick buttons across UIs (UB880D).
+ * Add static to functions where appropriate (Stuart Brady).
+ * Track port attachment for each data bus line (Stuart Brady).
+ * Switch to using non-recursive makefile (thanks, Stuart Brady)
+ (Sergio Baldoví).
+ * Move Windows resources that are UI-independent to data/win32
+ (Sergio Baldoví).
+ * Fix segfault due to inconsistent SETUP_CHECK() and CHECK() ordering
+ (UB880D; thanks, Guesser).
+ * Rename 'Interface I' to 'Interface 1' (thanks, Stuart Brady) (Sergio
+ Baldoví).
+ * Win32: fix compilation with mingwrt 4.0+ (Kirben).
+ * Replace various deprecated GTK+ functions: gtk_widget_modify_font,
+ GtkStock, gtk_tree_view_set_rules_hint(),
+ deprecated gdk_cursor_new() (Sergio Baldoví).
+ * Remove obsolete gtk_window_set_wmclass (Sergio Baldoví).
+ * Update URLs in documentation (Sergio Baldoví).
+ * Win32 UI: fix compilation with MinGW-w64 toolchain (lordhoto).
+ * Fix the build of SDL UI on Windows (Sergio Baldoví).
+ * Use compat_file_exists() instead of stat() in read_config_file() and
+ utils_find_file_path() (BogDan Vatra).
+ * Fix fdd_strerror() reading past the end of the fdd_error array
+ (BogDan Vatra).
+ * Use tape traps if we are using a custom ROM if the instructions at
+ the entry points have been preserved (thanks, Alberto Garcia)
+ (Fredrick Meunier).
+ * GTK+ and Win32 UI: add file filters in open/save dialogs (thanks,
+ Crisis) (Sergio Baldoví).
+ * Don't show hidden files/directories in the file selector on Widget
+ UIs (Sergio Baldoví).
+ * Remember filename when saving a recently formatted disk (Sergio
+ Baldoví).
+ * GTK UI: Change the resizing method for GTK+ UI for better
+ compatibility with GTK+ 3.20+ (thanks, Alberto Garcia) (Sergio
+ Baldoví).
+
2013-05-24 Philip Kendall <phi...@sh...>
* Fuse 1.1.1 released.
@@ -1119,4 +1288,4 @@
* Version 0.1.0 released.
-$Id: ChangeLog 4995 2013-05-24 19:54:19Z zubzero $
+$Id: ChangeLog 5519 2016-05-23 19:15:02Z pak21 $
Modified: vendor/fuse-emulator/current/fuse/INSTALL
===================================================================
--- vendor/fuse-emulator/current/fuse/INSTALL 2016-05-24 14:32:41 UTC (rev 800)
+++ vendor/fuse-emulator/current/fuse/INSTALL 2016-05-24 14:56:49 UTC (rev 801)
@@ -64,8 +64,7 @@
./configure --target=powerpc-gekko --host=powerpc-gekko \
--with-wii \
- --without-libxml2 --without-libiconv --without-gpm \
- --without-x --without-glib \
+ --without-libxml2 --without-libiconv --without-gpm --without-x \
CFLAGS="-g -I$DEVKITPPC/include -I$DEVKITPRO/libogc/include -DGEKKO" \
LDFLAGS="-g -mrvl -mcpu=750 -meabi -mhard-float \
-Wl,-Map,fuse.elf.map -L$DEVKITPPC/lib \
@@ -82,8 +81,8 @@
Building the Win32 version of Fuse
----------------------------------
-You'll need to have the MinGW <http://www.mingw.org> or MinGW-w64 toolchain
-<http://mingw-w64.sourceforge.net>, e.g., on Debian:
+You'll need to have the MinGW <http://www.mingw.org/> or Mingw-w64 toolchain
+<http://mingw-w64.org/>, e.g., on Debian:
`apt-get install mingw32 mingw32-binutils mingw32-runtime'
On Windows, besides the former toolchain, you'll need an environment that
@@ -91,21 +90,21 @@
Cygwin <http://cygwin.com>.
The next examples build libspectrum and Fuse without any external library for
-the sake of clarity, but all these libraries successfully compile with MingGW
+the sake of clarity, but all these libraries successfully compile with a MinGW
environment - in case of problems with compiling any of the libs please refer to
the lib's homepage for help.
1) On Linux, first have to compile libspectrum:
./configure --host=i586-mingw32msvc --without-libaudiofile --without-zlib \
- --without-libgcrypt --without-bzip2 --without-glib --prefix=`pwd`
+ --without-libgcrypt --without-bzip2 --with-fake-glib --prefix=`pwd`
make install
This should `install' into the source directory.
Then, compile Fuse:
-./configure --host=i586-mingw32msvc --without-glib --prefix=`pwd` \
+./configure --host=i586-mingw32msvc --prefix=`pwd` \
--with-libspectrum-prefix=`pwd`/../libspectrum --with-win32 \
--without-libxml2 --without-zlib --without-png --without-x
make
@@ -119,28 +118,28 @@
2) On Windows, using MSYS + MinGW toolchain, first build libspectrum:
-./configure --without-glib --without-libaudiofile --without-libgcrypt \
+./configure --with-fake-glib --without-libaudiofile --without-libgcrypt \
--without-zlib --without-bzip2 --prefix=/usr/local
make install
Then, build Fuse:
-./configure --with-win32 --without-glib --without-libxml2 --without-zlib \
- --without-png --prefix=/usr/local
+./configure --with-win32 --without-libxml2 --without-zlib --without-png \
+ --prefix=/usr/local
make
-3) On Windows, using Cygwin + MinGW toolchain, first build libspectrum:
+3) On Windows, using Cygwin + Mingw-w64 toolchain, first build libspectrum:
-./configure --build=i686-pc-cygwin --host=i686-pc-mingw32 --without-glib \
+./configure --build=i686-pc-cygwin --host=i686-w64-mingw32 --with-fake-glib \
--without-libaudiofile --without-libgcrypt --without-zlib \
- --without-bzip2 --prefix=/usr/local/i686-pc
+ --without-bzip2 --prefix=/usr/local/i686-w64-mingw32
make install
Then, build Fuse:
-./configure --build=i686-pc-cygwin --host=i686-pc-mingw32 --with-win32 \
- --without-glib --without-libxml2 --without-zlib --without-png \
- --prefix=/usr/local/i686-pc
+./configure --build=i686-pc-cygwin --host=i686-w64-mingw32 --without-libxml2 \
+ --without-zlib --without-png --with-win32 \
+ --prefix=/usr/local/i686-w64-mingw32
make
Note: you need `libspectrum-8.dll' and the `roms' directory and the `lib'
@@ -162,4 +161,4 @@
respectively. That will make a temporary subdirectory (fuse-VERSION-win32)
in the build directory and then will create a package.
-$Id: INSTALL 4763 2012-11-16 11:01:59Z fredm $
+$Id: INSTALL 5407 2016-04-25 21:59:53Z sbaldovi $
Modified: vendor/fuse-emulator/current/fuse/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/Makefile.am 2016-05-24 14:32:41 UTC (rev 800)
+++ vendor/fuse-emulator/current/fuse/Makefile.am 2016-05-24 14:56:49 UTC (rev 801)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
-## Copyright (c) 1999-2009 Philip Kendall
+## Copyright (c) 1999-2015 Philip Kendall
-## $Id: Makefile.am 5003 2013-05-26 16:24:03Z sbaldovi $
+## $Id: Makefile.am 5434 2016-05-01 04:22:45Z fredm $
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -21,45 +21,12 @@
##
## E-mail: phi...@sh...
-AUTOMAKE_OPTIONS = foreign
-
ACLOCAL_AMFLAGS = -I m4
bin_PROGRAMS = fuse
-SUBDIRS = @COMPAT_SUBDIR@ \
- data \
- debugger \
- hacking \
- lib \
- machines \
- man \
- peripherals \
- perl \
- pokefinder \
- roms \
- sound \
- timer \
- ui \
- unittests \
- z80
+noinst_PROGRAMS =
-DIST_SUBDIRS = data \
- debugger \
- hacking \
- lib \
- machines \
- man \
- peripherals \
- perl \
- pokefinder \
- roms \
- sound \
- timer \
- ui \
- unittests \
- z80
-
fuse_SOURCES = display.c \
event.c \
fuse.c \
@@ -83,94 +50,49 @@
snapshot.c \
sound.c \
spectrum.c \
+ svg.c \
tape.c \
ui.c \
uidisplay.c \
+ uimedia.c \
utils.c
-if COMPAT_DIRNAME
-fuse_SOURCES += compat/dirname.c
-endif
+fuse_LDADD = \
+ $(PTHREAD_LIBS) \
+ $(LIBSPEC_LIBS) \
+ $(GTK_LIBS) \
+ $(GLIB_LIBS) \
+ $(PNG_LIBS) \
+ $(SDL_LIBS) \
+ $(X_LIBS) \
+ $(XML_LIBS)
-if COMPAT_GETOPT
-fuse_SOURCES += compat/getopt.c compat/getopt1.c
-endif
+fuse_DEPENDENCIES =
-if COMPAT_MKSTEMP
-fuse_SOURCES += compat/mkstemp.c
-endif
+EXTRA_fuse_SOURCES =
-if COMPAT_WIN32
-fuse_SOURCES += windres.rc
-endif
-
-EXTRA_fuse_SOURCES = windres.rc
-
-fuse_LDADD = debugger/libdebugger.a \
-@UI_LIBS@ \
-debugger/libdebugger.a \
-machines/libmachines.a \
-peripherals/libperipherals.a \
-peripherals/disk/libdisk.a \
-peripherals/flash/libflash.a \
-peripherals/ide/libide.a \
-peripherals/nic/libnic.a \
-pokefinder/libpokefinder.a \
-sound/libsound.a \
-timer/libtimer.a \
-ui/scaler/libscaler.a \
-unittests/libunittests.a \
-z80/libz80.a \
-@LIBSPEC_LIBS@ \
-@GLIB_LIBS@ \
-@PNG_LIBS@ \
-@SOUND_LIBS@ \
-@SDL_LIBS@ \
-@X_LIBS@ \
-@XML_LIBS@ \
-compat/@COMPAT_OSNAME@/libcompatos.a \
-@WINDRES_OBJ@
-
-fuse_DEPENDENCIES = debugger/libdebugger.a \
-@UI_LIBS@ \
-debugger/libdebugger.a \
-machines/libmachines.a \
-peripherals/libperipherals.a \
-peripherals/disk/libdisk.a \
-peripherals/flash/libflash.a \
-peripherals/ide/libide.a \
-peripherals/nic/libnic.a \
-pokefinder/libpokefinder.a \
-sound/libsound.a \
-timer/libtimer.a \
-ui/scaler/libscaler.a \
-unittests/libunittests.a \
-z80/libz80.a \
-compat/@COMPAT_OSNAME@/libcompatos.a \
-@WINDRES_OBJ@
-
BUILT_SOURCES = options.h settings.c settings.h
-windres.o: windres.rc winfuse.ico ui/win32/*.rc
- @WINDRES@ -I$(srcdir) -I. $(srcdir)/windres.rc @LIBSPEC_CFLAGS@ @CPPFLAGS@ windres.o
-
settings.c: settings.pl settings.dat
- @PERL@ -I$(srcdir)/perl $(srcdir)/settings.pl $(srcdir)/settings.dat > $@.tmp && mv $@.tmp $@
+ $(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/settings.pl $(srcdir)/settings.dat > $@.tmp && mv $@.tmp $@
settings.h: settings-header.pl settings.dat
- @PERL@ -I$(srcdir)/perl $(srcdir)/settings-header.pl $(srcdir)/settings.dat > $@.tmp && mv $@.tmp $@
+ $(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/settings-header.pl $(srcdir)/settings.dat > $@.tmp && mv $@.tmp $@
-if WIDGET
-options.h: $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/@WIDGET@/options-header.pl $(srcdir)/ui/options.dat $(srcdir)/perl/Fuse.pm $(srcdir)/perl/Fuse/Dialog.pm
- @PERL@ $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/options.dat | @PERL@ -I$(srcdir)/perl $(srcdir)/ui/@WIDGET@/options-header.pl - public > $@.tmp && mv $@.tmp $@
-else
-options.h: $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/@UI@/options-header.pl $(srcdir)/ui/options.dat $(srcdir)/perl/Fuse.pm $(srcdir)/perl/Fuse/Dialog.pm
- @PERL@ $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/options.dat | @PERL@ -I$(srcdir)/perl $(srcdir)/ui/@UI@/options-header.pl - public > $@.tmp && mv $@.tmp $@
-endif
+options.h: $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/@OPTIONS_DIR@/options-header.pl $(srcdir)/ui/options.dat $(srcdir)/perl/Fuse.pm $(srcdir)/perl/Fuse/Dialog.pm
+ $(AM_V_GEN)$(PERL) $(srcdir)/perl/cpp-perl.pl config.h $(srcdir)/ui/options.dat | $(PERL) -I$(srcdir)/perl $(srcdir)/ui/@OPTIONS_DIR@/options-header.pl - public > $@.tmp && mv $@.tmp $@
-AM_CPPFLAGS = @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@ \
-@XML_CFLAGS@ -DFUSEDATADIR="\"${pkgdatadir}\"" @SDL_CFLAGS@
+AM_CPPFLAGS = \
+ $(GLIB_CFLAGS) \
+ $(GTK_CFLAGS) \
+ $(LIBSPEC_CFLAGS) \
+ $(XML_CFLAGS) \
+ -DFUSEDATADIR="\"${pkgdatadir}\"" \
+ $(SDL_CFLAGS) \
+ $(PNG_CFLAGS)
+AM_CFLAGS = $(WARN_CFLAGS) $(PTHREAD_CFLAGS)
+
noinst_HEADERS = bitmap.h \
compat.h \
display.h \
@@ -196,6 +118,7 @@
snapshot.h \
sound.h \
spectrum.h \
+ svg.h \
tape.h \
utils.h \
options.h \
@@ -208,6 +131,7 @@
THANKS \
keysyms.dat \
keysyms.pl \
+ m4/ax_pthread.m4 \
m4/glib-2.0.m4 \
m4/gtk-2.0.m4 \
m4/libxml.m4 \
@@ -215,115 +139,54 @@
m4/sdl.m4 \
menu_data.dat \
menu_data.pl \
+ settings.dat \
settings.pl \
- settings-header.pl \
- settings.dat \
- winfuse.ico
+ settings-header.pl
CLEANFILES = options.h \
settings.c \
settings.h
-include compat/Makefile.am
+DISTCLEANFILES =
-if COMPAT_WIN32
+pkgdata_DATA =
-package_win32=$(PACKAGE)-$(PACKAGE_VERSION)-win32
-top_win32dir=$(top_builddir)/$(package_win32)
-install-win32: all
- test -n "$(DESTDIR)" || { echo "ERROR: set DESTDIR path"; exit 1; }
- $(MKDIR_P) $(DESTDIR)/roms/ || exit 1
- $(MKDIR_P) $(DESTDIR)/lib/ || exit 1
- cp $(top_srcdir)/roms/*.rom $(DESTDIR)/roms
- cp $(top_srcdir)/roms/README.copyright $(DESTDIR)/roms
- cp $(top_srcdir)/lib/*.bmp $(DESTDIR)/lib
- cp $(top_srcdir)/lib/*.scr $(DESTDIR)/lib
- cp $(top_builddir)/lib/*.szx $(DESTDIR)/lib
-# Copy fuse executable (we should manually copy the required libraries)
- cp $(top_builddir)/.libs/fuse$(EXEEXT) $(DESTDIR) || \
- cp $(top_builddir)/fuse$(EXEEXT) $(DESTDIR)
-# Get text files
- for file in AUTHORS ChangeLog COPYING README; \
- do cp "$(top_srcdir)/$$file" "$(DESTDIR)/$$file.txt"; \
- done
-# Get manuals
- if test -n "$(MAN2HTML)"; then \
- $(MAN2HTML) -r $(top_srcdir)/man/fuse.1 | sed '1d' > $(DESTDIR)/fuse.html; \
- else \
- test -z "$(GROFF)" || $(GROFF) -Thtml -man $(top_srcdir)/man/fuse.1 > $(DESTDIR)/fuse.html; \
- fi
-# Convert to DOS line endings
- test -z "$(UNIX2DOS)" || find $(DESTDIR) -type f \( -name "*.txt" -or -name "*.html" -or -name "*.copyright" \) -exec $(UNIX2DOS) {} \;
+## Resources for Windows executables
+if COMPAT_WIN32
-install-win32-strip: install-win32
- test -z "$(STRIP)" || $(STRIP) $(DESTDIR)/fuse$(EXEEXT)
+fuse_SOURCES += windres.rc
+fuse_LDADD += windres.o
+fuse_DEPENDENCIES += windres.o
-dist-win32-dir:
- $(MAKE) DESTDIR="$(top_win32dir)" install-win32-strip
+windres.o: windres.rc data/win32/winfuse.ico data/win32/fuse.manifest $(ui_win32_res)
+ $(AM_V_GEN)$(WINDRES) -I$(srcdir) -I. $(srcdir)/windres.rc $(LIBSPEC_CFLAGS) $(CPPFLAGS) windres.o
-dist-win32-zip: dist-win32-dir
- rm -f -- $(top_builddir)/$(package_win32).zip
- rm -f -- $(top_builddir)/$(package_win32).zip.sha1
- test -n "$(top_win32dir)" || exit 1
- @test `find $(top_win32dir) -type f -name \*.dll -print | wc -l` -ne 0 || \
- { echo "ERROR: external libraries not found in $(top_win32dir). Please, manually copy them."; exit 1; }
- cd $(top_win32dir) && \
- zip -q -9 -r $(abs_top_builddir)/$(package_win32).zip .
- -sha1sum $(top_builddir)/$(package_win32).zip > $(top_builddir)/$(package_win32).zip.sha1 && \
- { test -z "$(UNIX2DOS)" || $(UNIX2DOS) $(top_builddir)/$(package_win32).zip.sha1; }
+endif
-dist-win32-7z: dist-win32-dir
- rm -f -- $(top_builddir)/$(package_win32).7z
- rm -f -- $(top_builddir)/$(package_win32).7z.sha1
- test -n "$(top_win32dir)" || exit 1
- @test `find $(top_win32dir) -type f -name \*.dll -print | wc -l` -ne 0 || \
- { echo "ERROR: external libraries not found in $(top_win32dir). Please, manually copy them."; exit 1; }
- cd $(top_win32dir) && \
- 7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on -bd $(abs_top_builddir)/$(package_win32).7z .
- -sha1sum $(top_builddir)/$(package_win32).7z > $(top_builddir)/$(package_win32).7z.sha1 && \
- { test -z "$(UNIX2DOS)" || $(UNIX2DOS) $(top_builddir)/$(package_win32).7z.sha1; }
-dist-win32-exe: dist-win32-dir
- rm -f -- $(top_builddir)/$(package_win32)-setup.exe
- rm -f -- $(top_builddir)/$(package_win32)-setup.exe.sha1
- test -n "$(top_win32dir)" || exit 1
- @test `find $(top_win32dir) -type f -name \*.dll -print | wc -l` -ne 0 || \
- { echo "ERROR: external libraries not found in $(top_win32dir). Please, manually copy them."; exit 1; }
-# Locate NSIS in system path, MSYS drive or Cygwin drive
- @NSISFILE="$(abs_top_builddir)/ui/win32/installer/fuse.nsi"; \
- if makensis -VERSION > /dev/null 2>&1; then \
- MAKENSIS="makensis"; \
- elif [ -x "/c/Program Files/NSIS/makensis" ]; then \
- MAKENSIS="/c/Program\ Files/NSIS/makensis"; \
- elif [ -x "/cygdrive/c/Program Files/NSIS/makensis" ]; then \
- MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis"; \
- else \
- echo 'ERROR: cannot locate makensis tool'; exit 1; \
- fi; \
- case "`uname -s`" in \
- CYGWIN*) NSISFILE=`cygpath -m $$NSISFILE`;; \
- esac; \
- cd $(top_win32dir); \
- eval "$$MAKENSIS -V2 -NOCD $$NSISFILE"
- mv $(top_win32dir)/$(package_win32)-setup.exe $(top_builddir)
- -sha1sum $(top_builddir)/$(package_win32)-setup.exe > $(top_builddir)/$(package_win32)-setup.exe.sha1 && \
- { test -z "$(UNIX2DOS)" || $(UNIX2DOS) $(top_builddir)/$(package_win32)-setup.exe.sha1; }
-
-dist-win32: dist-win32-zip dist-win32-7z dist-win32-exe
-
-distclean-win32:
- if test -d "$(top_builddir)/$(package_win32)"; then \
- rm -rf -- "$(top_builddir)/$(package_win32)"; \
- fi
- rm -f -- $(top_builddir)/$(package_win32).zip
- rm -f -- $(top_builddir)/$(package_win32).zip.sha1
- rm -f -- $(top_builddir)/$(package_win32).7z
- rm -f -- $(top_builddir)/$(package_win32).7z.sha1
- rm -f -- $(top_builddir)/$(package_win32)-setup.exe
- rm -f -- $(top_builddir)/$(package_win32)-setup.exe.sha1
-
-.PHONY: install-win32 install-win32-strip dist-win32 dist-win32-dir \
- dist-win32-zip dist-win32-7z dist-win32-exe distclean-win32
-
-endif
+include compat/Makefile.am
+include data/Makefile.am
+include debugger/Makefile.am
+include hacking/Makefile.am
+include lib/Makefile.am
+include machines/Makefile.am
+include man/Makefile.am
+include peripherals/Makefile.am
+include perl/Makefile.am
+include pokefinder/Makefile.am
+include roms/Makefile.am
+include sound/Makefile.am
+include timer/Makefile.am
+include ui/Makefile.am
+include ui/fb/Makefile.am
+include ui/gtk/Makefile.am
+include ui/scaler/Makefile.am
+include ui/sdl/Makefile.am
+include ui/svga/Makefile.am
+include ui/widget/Makefile.am
+include ui/wii/Makefile.am
+include ui/win32/Makefile.am
+include ui/xlib/Makefile.am
+include unittests/Makefile.am
+include z80/Makefile.am
Modified: vendor/fuse-emulator/current/fuse/README
===================================================================
--- vendor/fuse-emulator/current/fuse/README 2016-05-24 14:32:41 UTC (rev 800)
+++ vendor/fuse-emulator/current/fuse/README 2016-05-24 14:56:49 UTC (rev 801)
@@ -1,4 +1,4 @@
-The Free Unix Spectrum Emulator (Fuse) 1.1.1
+The Free Unix Spectrum Emulator (Fuse) 1.2.0
============================================
Fuse (the Free Unix Spectrum Emulator) was originally, and somewhat
@@ -25,7 +25,8 @@
* Support for the RZX input recording file format, including
rollback and 'competition mode'.
* Emulation of the DivIDE, Interface 1, Kempston mouse, Spectrum +3e,
- ZXATASP, ZXCF, Beta 128, Opus Discovery, +D and DISCiPLE interfaces.
+ ZXATASP, ZXCF, Beta 128, Opus Discovery, +D, DISCiPLE and Didaktik 80/40
+ interfaces.
Help! <xyz> doesn't work
------------------------
@@ -107,4 +108,4 @@
Philip Kendall <phi...@sh...>
24th May, 2013
-$Id: README 4995 2013-05-24 19:54:19Z zubzero $
+$Id: README 5403 2016-04-25 13:10:53Z fredm $
Modified: vendor/fuse-emulator/current/fuse/THANKS
===================================================================
--- vendor/fuse-emulator/current/fuse/THANKS 2016-05-24 14:32:41 UTC (rev 800)
+++ vendor/fuse-emulator/current/fuse/THANKS 2016-05-24 14:56:49 UTC (rev 801)
@@ -29,7 +29,7 @@
you've got an Amiga, you may well like to check out Ian's Spectrum
Emulator, ASp: http://www.lasernet.plus.com/asp.html
-* Shawn Hargreaves: for Allegro (http://alleg.sourceforge.net/)
+* Shawn Hargreaves: for Allegro (http://liballeg.org/)
(again, used by previous versions of Fuse for the graphical display)
* Steven Harrison: for helping track down why the SDL sound routines
@@ -44,7 +44,7 @@
emulations (see `AUTHORS')
* Gerton Lunter: his wonderful z80
- (ftp://ftp.worldofspectrum.org/pub/sinclair/emulators/pc/dos/z80-400.zip)
+ (http://www.worldofspectrum.org/pub/sinclair/emulators/pc/windows/z80-400.zip)
got me started on this emulation lark all those years ago...
* Anders Holmberg: for reporting a bug in the z80 v1.45 load routines. Anders
@@ -102,4 +102,4 @@
* Matan Ziv-Av: for various bits of code (see `AUTHORS')
-$Id: THANKS 4882 2013-02-15 23:47:37Z sbaldovi $
+$Id: THANKS 5357 2016-02-23 23:43:54Z sbaldovi $
Modified: vendor/fuse-emulator/current/fuse/autogen.sh
===================================================================
--- vendor/fuse-emulator/current/fuse/autogen.sh 2016-05-24 14:32:41 UTC (rev 800)
+++ vendor/fuse-emulator/current/fuse/autogen.sh 2016-05-24 14:56:49 UTC (rev 801)
@@ -2,8 +2,9 @@
# autogen.sh: autotools invocation
# Copyright (c) 2004 Philip Kendall
+# Copyright (c) 2014 Sergio Baldoví
-# $Id: autogen.sh 4749 2012-10-15 11:22:31Z fredm $
+# $Id: autogen.sh 5434 2016-05-01 04:22:45Z fredm $
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -28,7 +29,9 @@
aclocal -I m4
# Mac OS X: Use glibtoolize instead
-libtoolize --automake
+(glibtoolize --version) < /dev/null > /dev/null 2>&1 && LIBTOOLIZE=glibtoolize \
+ || LIBTOOLIZE=libtoolize
+$LIBTOOLIZE --automake
autoheader
automake --add-missing
autoconf
Modified: vendor/fuse-emulator/current/fuse/bitmap.h
===================================================================
--- vendor/fuse-emulator/current/fuse/bitmap.h 2016-05-24 14:32:41 UTC (rev 800)
+++ vendor/fuse-emulator/current/fuse/bitmap.h 2016-05-24 14:56:49 UTC (rev 801)
@@ -1,5 +1,5 @@
/* bitmap.h: Bitmap routines
- Copyright (c) 2007 Stuart Brady
+ Copyright (c) 2007-2015 Stuart Brady
$Id$
@@ -28,19 +28,19 @@
#ifndef FUSE_BITMAP_H
#define FUSE_BITMAP_H
-inline static void
+static inline void
bitmap_set( libspectrum_byte *b, const size_t n )
{
b[ n / 8 ] |= ( 1 << ( n % 8 ) );
}
-inline static void
+static inline void
bitmap_reset( libspectrum_byte *b, const size_t n )
{
b[ n / 8 ] &= ~( 1 << ( n % 8 ) );
}
-inline static int
+static inline int
bitmap_test( const libspectrum_byte *b, const size_t n )
{
return b[ n / 8 ] & ( 1 << ( n % 8 ) );
Modified: vendor/fuse-emulator/current/fuse/compat/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/Makefile.am 2016-05-24 14:32:41 UTC (rev 800)
+++ vendor/fuse-emulator/current/fuse/compat/Makefile.am 2016-05-24 14:56:49 UTC (rev 801)
@@ -1,7 +1,8 @@
## Process this file with automake to produce Makefile.in
-## Copyright (c) 2003-2012 Philip Kendall
+## Copyright (c) 2003-2013 Philip Kendall
+## Copyright (c) 2015 Sergio Baldoví
-## $Id: Makefile.am 4738 2012-10-03 13:15:31Z fredm $
+## $Id: Makefile.am 5434 2016-05-01 04:22:45Z fredm $
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -21,18 +22,93 @@
##
## E-mail: phi...@sh...
-AM_CPPFLAGS += -I$(srcdir)/compat
+noinst_HEADERS += compat/getopt.h
-DIST_SUBDIRS += compat/amiga \
- compat/linux \
- compat/morphos \
- compat/unix \
- compat/wii \
- compat/win32
+if COMPAT_DIRNAME
+fuse_SOURCES += compat/dirname.c
+endif
-EXTRA_fuse_SOURCES += compat/dirname.c \
- compat/getopt.c \
- compat/getopt1.c \
- compat/mkstemp.c
+if COMPAT_GETOPT
+fuse_SOURCES += compat/getopt.c compat/getopt1.c
+endif
-noinst_HEADERS += compat/getopt.h
+if COMPAT_MKSTEMP
+fuse_SOURCES += compat/mkstemp.c
+endif
+
+## Amiga routines
+if COMPAT_AMIGA
+fuse_SOURCES += \
+ compat/unix/dir.c \
+ compat/unix/file.c \
+ compat/amiga/osname.c \
+ compat/amiga/paths.c \
+ compat/unix/timer.c
+endif
+
+## Linux routines
+if COMPAT_LINUX
+fuse_SOURCES += \
+ compat/unix/dir.c \
+ compat/unix/file.c \
+ compat/unix/osname.c \
+ compat/linux/paths.c \
+ compat/unix/timer.c
+
+if HAVE_SOCKETS
+fuse_SOURCES += compat/unix/socket.c
+endif
+endif
+
+## Morphos routines
+if COMPAT_MORPHOS
+fuse_SOURCES += \
+ compat/unix/dir.c \
+ compat/unix/file.c \
+ compat/morphos/osname.c \
+ compat/amiga/paths.c \
+ compat/unix/timer.c
+endif
+
+## Unix routines
+if COMPAT_UNIX
+fuse_SOURCES += \
+ compat/unix/dir.c \
+ compat/unix/file.c \
+ compat/unix/osname.c \
+ compat/unix/paths.c \
+ compat/unix/timer.c
+
+if HAVE_SOCKETS
+fuse_SOURCES += compat/unix/socket.c
+endif
+endif
+
+## Wii routines
+if COMPAT_WII
+fuse_SOURCES += \
+ compat/wii/dir.c \
+ compat/unix/file.c \
+ compat/wii/osname.c \
+ compat/wii/paths.c \
+ compat/wii/timer.c
+endif
+
+## Windows routines
+if COMPAT_WIN32
+fuse_SOURCES += \
+ compat/unix/dir.c \
+ compat/unix/file.c \
+ compat/win32/osname.c \
+ compat/win32/paths.c \
+ compat/win32/timer.c
+
+if HAVE_SOCKETS
+fuse_SOURCES += compat/win32/socket.c
+endif
+endif
+
+## SpeccyBoot routines
+if HAVE_TUNTAP
+fuse_SOURCES += compat/unix/tuntap.c
+endif
Deleted: vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am 2016-05-24 14:32:41 UTC (rev 800)
+++ vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am 2016-05-24 14:56:49 UTC (rev 801)
@@ -1,41 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## Copyright (c) 2007-2012 Philip Kendall
-
-## $Id: Makefile.am 4898 2013-02-25 22:20:54Z pak21 $
-
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License along
-## with this program; if not, write to the Free Software Foundation, Inc.,
-## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-##
-## Author contact information:
-##
-## E-mail: phi...@sh...
-
-AUTOMAKE_OPTIONS = foreign
-
-AM_CPPFLAGS = -I$(srcdir)/../..
-
-noinst_LIBRARIES = libcompatos.a
-
-libcompatos_a_SOURCES = ../unix/dir.c \
- ../unix/file.c \
- osname.c \
- paths.c \
- ../unix/timer.c
-
-if HAVE_TUNTAP
-libcompatos_a_SOURCES += ../unix/tuntap.c
-endif
-
-AM_CPPFLAGS += @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@ \
--DFUSEDATADIR="\"${pkgdatadir}\""
Deleted: vendor/fuse-emulator/current/fuse/compat/linux/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/linux/Makefile.am 2016-05-24 14:32:41 UTC (rev 800)
+++ vendor/fuse-emulator/current/fuse/compat/linux/Makefile.am 2016-05-24 14:56:49 UTC (rev 801)
@@ -1,45 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## Copyright (c) 2012 Philip Kendall
-
-## $Id: Makefile.am 4898 2013-02-25 22:20:54Z pak21 $
-
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License along
-## with this program; if not, write to the Free Software Foundation, Inc.,
-## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-##
-## Author contact information:
-##
-## E-mail: phi...@sh...
-
-AUTOMAKE_OPTIONS = foreign
-
-AM_CPPFLAGS = -I$(srcdir)/../..
-
-noinst_LIBRARIES = libcompatos.a
-
-libcompatos_a_SOURCES = ../unix/dir.c \
- ../unix/file.c \
- ../unix/osname.c \
- paths.c \
- ../unix/timer.c
-
-if HAVE_SOCKETS
-libcompatos_a_SOURCES += ../unix/socket.c
-endif
-
-if HAVE_TUNTAP
-libcompatos_a_SOURCES += ../unix/tuntap.c
-endif
-
-AM_CPPFLAGS += @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@ \
--DFUSEDATADIR="\"${pkgdatadir}\""
Deleted: vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am 2016-05-24 14:32:41 UTC (rev 800)
+++ vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am 2016-05-24 14:56:49 UTC (rev 801)
@@ -1,40 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## Copyright (c) 2007-2008 Philip Kendall
-
-## $Id: Makefile.am 4898 2013-02-25 22:20:54Z pak21 $
-
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License along
-## with this program; if not, write to the Free Software Foundation, Inc.,
-## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-##
-## Author contact information:
-##
-## E-mail: phi...@sh...
-
-AUTOMAKE_OPTIONS = foreign
-
-AM_CPPFLAGS = -I$(srcdir)/../..
-
-noinst_LIBRARIES = libcompatos.a
-
-libcompatos_a_SOURCES = ../unix/dir.c \
- ../unix/file.c \
- osname.c \
- ../amiga/paths.c \
- ../unix/timer.c
-
-if HAVE_TUNTAP
-libcompatos_a_SOURCES += ../unix/tuntap.c
-endif
-
-AM_CPPFLAGS += @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@
Deleted: vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am 2016-05-24 14:32:41 UTC (rev 800)
+++ vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am 2016-05-24 14:56:49 UTC (rev 801)
@@ -1,45 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## Copyright (c) 2007-2012 Philip Kendall
-
-## $Id: Makefile.am 4898 2013-02-25 22:20:54Z pak21 $
-
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License along
-## with this program; if not, write to the Free Software Foundation, Inc.,
-## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-##
-## Author contact information:
-##
-## E-mail: phi...@sh...
-
-AUTOMAKE_OPTIONS = foreign
-
-AM_CPPFLAGS = -I$(srcdir)/../..
-
-noinst_LIBRARIES = libcompatos.a
-
-libcompatos_a_SOURCES = dir.c \
- file.c \
- osname.c \
- paths.c \
- timer.c
-
-if HAVE_SOCKETS
-libcompatos_a_SOURCES += socket.c
-endif
-
-if HAVE_TUNTAP
-libcompatos_a_SOURCES += tuntap.c
-endif
-
-AM_CPPFLAGS += @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBSPEC_CFLAGS@ \
--DFUSEDATADIR="\"${pkgdatadir}\""
Modified: vendor/fuse-emulator/current/fuse/compat/unix/socket.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/socket.c 2016-05-24 14:32:41 UTC (rev 800)
+++ vendor/fuse-emulator/current/fuse/compat/unix/socket.c 2016-05-24 14:56:49 UTC (rev 801)
@@ -1,5 +1,5 @@
/* socket.c: Socket-related compatibility routines
- Copyright (c) 2011-2012 Philip Kendall
+ Copyright (c) 2011-2015 Philip Kendall
$Id$
@@ -75,11 +75,8 @@
int error;
int pipefd[2];
- compat_socket_selfpipe_t *self = malloc( sizeof( *self ) );
- if( !self ) {
- ui_error( UI_ERROR_ERROR, "%s: %d: out of memory", __FILE__, __LINE__ );
- fuse_abort();
- }
+ compat_socket_selfpipe_t *self =
+ libspectrum_new( compat_socket_selfpipe_t, 1 );
error = pipe( pipefd );
if( error ) {
@@ -97,7 +94,7 @@
{
close( self->read_fd );
close( self->write_fd );
- free( self );
+ libspectrum_free( self );
}
compat_socket_t compat_socket_selfpipe_get_read_fd( compat_socket_selfpipe...
[truncated message content] |
|
From: <fr...@us...> - 2016-05-24 14:32:43
|
Revision: 800
http://sourceforge.net/p/fuse-for-macosx/code/800
Author: fredm
Date: 2016-05-24 14:32:41 +0000 (Tue, 24 May 2016)
Log Message:
-----------
Set svn:mime-type to application/octet-stream to match vendor.
Property Changed:
----------------
vendor/fuse-emulator/current/libspectrum/test/invalid-hardwareinfo.tzx
vendor/fuse-emulator/current/libspectrum/test/invalid.tzx
vendor/fuse-emulator/current/libspectrum/test/loopend.tzx
Index: vendor/fuse-emulator/current/libspectrum/test/invalid-hardwareinfo.tzx
===================================================================
--- vendor/fuse-emulator/current/libspectrum/test/invalid-hardwareinfo.tzx 2016-05-24 14:25:27 UTC (rev 799)
+++ vendor/fuse-emulator/current/libspectrum/test/invalid-hardwareinfo.tzx 2016-05-24 14:32:41 UTC (rev 800)
Property changes on: vendor/fuse-emulator/current/libspectrum/test/invalid-hardwareinfo.tzx
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/test/invalid.tzx
===================================================================
--- vendor/fuse-emulator/current/libspectrum/test/invalid.tzx 2016-05-24 14:25:27 UTC (rev 799)
+++ vendor/fuse-emulator/current/libspectrum/test/invalid.tzx 2016-05-24 14:32:41 UTC (rev 800)
Property changes on: vendor/fuse-emulator/current/libspectrum/test/invalid.tzx
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/test/loopend.tzx
===================================================================
--- vendor/fuse-emulator/current/libspectrum/test/loopend.tzx 2016-05-24 14:25:27 UTC (rev 799)
+++ vendor/fuse-emulator/current/libspectrum/test/loopend.tzx 2016-05-24 14:32:41 UTC (rev 800)
Property changes on: vendor/fuse-emulator/current/libspectrum/test/loopend.tzx
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2016-05-24 14:25:29
|
Revision: 799
http://sourceforge.net/p/fuse-for-macosx/code/799
Author: fredm
Date: 2016-05-24 14:25:27 +0000 (Tue, 24 May 2016)
Log Message:
-----------
Set more vendor svn:eol-style and svn:keywords properties to match vendor
source.
Property Changed:
----------------
vendor/fuse-emulator/current/fuse/man/fuse.1
vendor/fuse-emulator/current/fuse-utils/man/audio2tape.1
vendor/fuse-emulator/current/fuse-utils/man/createhdf.1
vendor/fuse-emulator/current/fuse-utils/man/fmfconv.1
vendor/fuse-emulator/current/fuse-utils/man/fuse-utils.1
vendor/fuse-emulator/current/fuse-utils/man/listbasic.1
vendor/fuse-emulator/current/fuse-utils/man/profile2map.1
vendor/fuse-emulator/current/fuse-utils/man/raw2hdf.1
vendor/fuse-emulator/current/fuse-utils/man/rzxcheck.1
vendor/fuse-emulator/current/fuse-utils/man/rzxdump.1
vendor/fuse-emulator/current/fuse-utils/man/rzxtool.1
vendor/fuse-emulator/current/fuse-utils/man/scl2trd.1
vendor/fuse-emulator/current/fuse-utils/man/snap2tzx.1
vendor/fuse-emulator/current/fuse-utils/man/snapconv.1
vendor/fuse-emulator/current/fuse-utils/man/tape2wav.1
vendor/fuse-emulator/current/fuse-utils/man/tapeconv.1
vendor/fuse-emulator/current/fuse-utils/man/tzxlist.1
vendor/fuse-emulator/current/gdos-tools/man/gdos-tools.1
Index: vendor/fuse-emulator/current/fuse/man/fuse.1
===================================================================
--- vendor/fuse-emulator/current/fuse/man/fuse.1 2016-05-24 14:23:56 UTC (rev 798)
+++ vendor/fuse-emulator/current/fuse/man/fuse.1 2016-05-24 14:25:27 UTC (rev 799)
Property changes on: vendor/fuse-emulator/current/fuse/man/fuse.1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse-utils/man/audio2tape.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/audio2tape.1 2016-05-24 14:23:56 UTC (rev 798)
+++ vendor/fuse-emulator/current/fuse-utils/man/audio2tape.1 2016-05-24 14:25:27 UTC (rev 799)
Property changes on: vendor/fuse-emulator/current/fuse-utils/man/audio2tape.1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse-utils/man/createhdf.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/createhdf.1 2016-05-24 14:23:56 UTC (rev 798)
+++ vendor/fuse-emulator/current/fuse-utils/man/createhdf.1 2016-05-24 14:25:27 UTC (rev 799)
Property changes on: vendor/fuse-emulator/current/fuse-utils/man/createhdf.1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse-utils/man/fmfconv.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/fmfconv.1 2016-05-24 14:23:56 UTC (rev 798)
+++ vendor/fuse-emulator/current/fuse-utils/man/fmfconv.1 2016-05-24 14:25:27 UTC (rev 799)
Property changes on: vendor/fuse-emulator/current/fuse-utils/man/fmfconv.1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse-utils/man/fuse-utils.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/fuse-utils.1 2016-05-24 14:23:56 UTC (rev 798)
+++ vendor/fuse-emulator/current/fuse-utils/man/fuse-utils.1 2016-05-24 14:25:27 UTC (rev 799)
Property changes on: vendor/fuse-emulator/current/fuse-utils/man/fuse-utils.1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse-utils/man/listbasic.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/listbasic.1 2016-05-24 14:23:56 UTC (rev 798)
+++ vendor/fuse-emulator/current/fuse-utils/man/listbasic.1 2016-05-24 14:25:27 UTC (rev 799)
Property changes on: vendor/fuse-emulator/current/fuse-utils/man/listbasic.1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse-utils/man/profile2map.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/profile2map.1 2016-05-24 14:23:56 UTC (rev 798)
+++ vendor/fuse-emulator/current/fuse-utils/man/profile2map.1 2016-05-24 14:25:27 UTC (rev 799)
Property changes on: vendor/fuse-emulator/current/fuse-utils/man/profile2map.1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse-utils/man/raw2hdf.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/raw2hdf.1 2016-05-24 14:23:56 UTC (rev 798)
+++ vendor/fuse-emulator/current/fuse-utils/man/raw2hdf.1 2016-05-24 14:25:27 UTC (rev 799)
Property changes on: vendor/fuse-emulator/current/fuse-utils/man/raw2hdf.1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse-utils/man/rzxcheck.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/rzxcheck.1 2016-05-24 14:23:56 UTC (rev 798)
+++ vendor/fuse-emulator/current/fuse-utils/man/rzxcheck.1 2016-05-24 14:25:27 UTC (rev 799)
Property changes on: vendor/fuse-emulator/current/fuse-utils/man/rzxcheck.1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse-utils/man/rzxdump.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/rzxdump.1 2016-05-24 14:23:56 UTC (rev 798)
+++ vendor/fuse-emulator/current/fuse-utils/man/rzxdump.1 2016-05-24 14:25:27 UTC (rev 799)
Property changes on: vendor/fuse-emulator/current/fuse-utils/man/rzxdump.1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse-utils/man/rzxtool.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/rzxtool.1 2016-05-24 14:23:56 UTC (rev 798)
+++ vendor/fuse-emulator/current/fuse-utils/man/rzxtool.1 2016-05-24 14:25:27 UTC (rev 799)
Property changes on: vendor/fuse-emulator/current/fuse-utils/man/rzxtool.1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse-utils/man/scl2trd.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/scl2trd.1 2016-05-24 14:23:56 UTC (rev 798)
+++ vendor/fuse-emulator/current/fuse-utils/man/scl2trd.1 2016-05-24 14:25:27 UTC (rev 799)
Property changes on: vendor/fuse-emulator/current/fuse-utils/man/scl2trd.1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse-utils/man/snap2tzx.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/snap2tzx.1 2016-05-24 14:23:56 UTC (rev 798)
+++ vendor/fuse-emulator/current/fuse-utils/man/snap2tzx.1 2016-05-24 14:25:27 UTC (rev 799)
Property changes on: vendor/fuse-emulator/current/fuse-utils/man/snap2tzx.1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse-utils/man/snapconv.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/snapconv.1 2016-05-24 14:23:56 UTC (rev 798)
+++ vendor/fuse-emulator/current/fuse-utils/man/snapconv.1 2016-05-24 14:25:27 UTC (rev 799)
Property changes on: vendor/fuse-emulator/current/fuse-utils/man/snapconv.1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse-utils/man/tape2wav.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/tape2wav.1 2016-05-24 14:23:56 UTC (rev 798)
+++ vendor/fuse-emulator/current/fuse-utils/man/tape2wav.1 2016-05-24 14:25:27 UTC (rev 799)
Property changes on: vendor/fuse-emulator/current/fuse-utils/man/tape2wav.1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse-utils/man/tapeconv.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/tapeconv.1 2016-05-24 14:23:56 UTC (rev 798)
+++ vendor/fuse-emulator/current/fuse-utils/man/tapeconv.1 2016-05-24 14:25:27 UTC (rev 799)
Property changes on: vendor/fuse-emulator/current/fuse-utils/man/tapeconv.1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse-utils/man/tzxlist.1
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/man/tzxlist.1 2016-05-24 14:23:56 UTC (rev 798)
+++ vendor/fuse-emulator/current/fuse-utils/man/tzxlist.1 2016-05-24 14:25:27 UTC (rev 799)
Property changes on: vendor/fuse-emulator/current/fuse-utils/man/tzxlist.1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/gdos-tools/man/gdos-tools.1
===================================================================
--- vendor/fuse-emulator/current/gdos-tools/man/gdos-tools.1 2016-05-24 14:23:56 UTC (rev 798)
+++ vendor/fuse-emulator/current/gdos-tools/man/gdos-tools.1 2016-05-24 14:25:27 UTC (rev 799)
Property changes on: vendor/fuse-emulator/current/gdos-tools/man/gdos-tools.1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2016-05-24 14:23:58
|
Revision: 798
http://sourceforge.net/p/fuse-for-macosx/code/798
Author: fredm
Date: 2016-05-24 14:23:56 +0000 (Tue, 24 May 2016)
Log Message:
-----------
Set more vendor svn:eol-style and svn:keywords properties to match vendor
source.
Property Changed:
----------------
vendor/fuse-emulator/current/fuse/m4/ax_pthread.m4
vendor/fuse-emulator/current/fuse/m4/glib-2.0.m4
vendor/fuse-emulator/current/fuse/m4/gtk-2.0.m4
vendor/fuse-emulator/current/fuse/m4/libxml.m4
vendor/fuse-emulator/current/fuse/m4/pkg.m4
vendor/fuse-emulator/current/fuse/m4/sdl.m4
vendor/fuse-emulator/current/fuse-utils/m4/audiofile.m4
vendor/fuse-emulator/current/fuse-utils/m4/glib-1.0.m4
vendor/fuse-emulator/current/fuse-utils/m4/glib-2.0.m4
vendor/fuse-emulator/current/fuse-utils/m4/iconv.m4
vendor/fuse-emulator/current/libspectrum/m4/audiofile.m4
Index: vendor/fuse-emulator/current/fuse/m4/ax_pthread.m4
===================================================================
--- vendor/fuse-emulator/current/fuse/m4/ax_pthread.m4 2016-05-24 14:22:14 UTC (rev 797)
+++ vendor/fuse-emulator/current/fuse/m4/ax_pthread.m4 2016-05-24 14:23:56 UTC (rev 798)
Property changes on: vendor/fuse-emulator/current/fuse/m4/ax_pthread.m4
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/m4/glib-2.0.m4
===================================================================
--- vendor/fuse-emulator/current/fuse/m4/glib-2.0.m4 2016-05-24 14:22:14 UTC (rev 797)
+++ vendor/fuse-emulator/current/fuse/m4/glib-2.0.m4 2016-05-24 14:23:56 UTC (rev 798)
Property changes on: vendor/fuse-emulator/current/fuse/m4/glib-2.0.m4
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/m4/gtk-2.0.m4
===================================================================
--- vendor/fuse-emulator/current/fuse/m4/gtk-2.0.m4 2016-05-24 14:22:14 UTC (rev 797)
+++ vendor/fuse-emulator/current/fuse/m4/gtk-2.0.m4 2016-05-24 14:23:56 UTC (rev 798)
Property changes on: vendor/fuse-emulator/current/fuse/m4/gtk-2.0.m4
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/m4/libxml.m4
===================================================================
--- vendor/fuse-emulator/current/fuse/m4/libxml.m4 2016-05-24 14:22:14 UTC (rev 797)
+++ vendor/fuse-emulator/current/fuse/m4/libxml.m4 2016-05-24 14:23:56 UTC (rev 798)
Property changes on: vendor/fuse-emulator/current/fuse/m4/libxml.m4
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/m4/pkg.m4
===================================================================
--- vendor/fuse-emulator/current/fuse/m4/pkg.m4 2016-05-24 14:22:14 UTC (rev 797)
+++ vendor/fuse-emulator/current/fuse/m4/pkg.m4 2016-05-24 14:23:56 UTC (rev 798)
Property changes on: vendor/fuse-emulator/current/fuse/m4/pkg.m4
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/m4/sdl.m4
===================================================================
--- vendor/fuse-emulator/current/fuse/m4/sdl.m4 2016-05-24 14:22:14 UTC (rev 797)
+++ vendor/fuse-emulator/current/fuse/m4/sdl.m4 2016-05-24 14:23:56 UTC (rev 798)
Property changes on: vendor/fuse-emulator/current/fuse/m4/sdl.m4
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse-utils/m4/audiofile.m4
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/m4/audiofile.m4 2016-05-24 14:22:14 UTC (rev 797)
+++ vendor/fuse-emulator/current/fuse-utils/m4/audiofile.m4 2016-05-24 14:23:56 UTC (rev 798)
Property changes on: vendor/fuse-emulator/current/fuse-utils/m4/audiofile.m4
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse-utils/m4/glib-1.0.m4
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/m4/glib-1.0.m4 2016-05-24 14:22:14 UTC (rev 797)
+++ vendor/fuse-emulator/current/fuse-utils/m4/glib-1.0.m4 2016-05-24 14:23:56 UTC (rev 798)
Property changes on: vendor/fuse-emulator/current/fuse-utils/m4/glib-1.0.m4
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse-utils/m4/glib-2.0.m4
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/m4/glib-2.0.m4 2016-05-24 14:22:14 UTC (rev 797)
+++ vendor/fuse-emulator/current/fuse-utils/m4/glib-2.0.m4 2016-05-24 14:23:56 UTC (rev 798)
Property changes on: vendor/fuse-emulator/current/fuse-utils/m4/glib-2.0.m4
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse-utils/m4/iconv.m4
===================================================================
--- vendor/fuse-emulator/current/fuse-utils/m4/iconv.m4 2016-05-24 14:22:14 UTC (rev 797)
+++ vendor/fuse-emulator/current/fuse-utils/m4/iconv.m4 2016-05-24 14:23:56 UTC (rev 798)
Property changes on: vendor/fuse-emulator/current/fuse-utils/m4/iconv.m4
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/m4/audiofile.m4
===================================================================
--- vendor/fuse-emulator/current/libspectrum/m4/audiofile.m4 2016-05-24 14:22:14 UTC (rev 797)
+++ vendor/fuse-emulator/current/libspectrum/m4/audiofile.m4 2016-05-24 14:23:56 UTC (rev 798)
Property changes on: vendor/fuse-emulator/current/libspectrum/m4/audiofile.m4
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2016-05-24 14:22:17
|
Revision: 797
http://sourceforge.net/p/fuse-for-macosx/code/797
Author: fredm
Date: 2016-05-24 14:22:14 +0000 (Tue, 24 May 2016)
Log Message:
-----------
Set more vendor svn:eol-style and svn:keywords properties to match vendor
source.
Property Changed:
----------------
vendor/fuse-emulator/current/fuse/AUTHORS
vendor/fuse-emulator/current/fuse/COPYING
vendor/fuse-emulator/current/fuse/ChangeLog
vendor/fuse-emulator/current/fuse/INSTALL
vendor/fuse-emulator/current/fuse/Makefile.am
vendor/fuse-emulator/current/fuse/PORTING
vendor/fuse-emulator/current/fuse/README
vendor/fuse-emulator/current/fuse/THANKS
vendor/fuse-emulator/current/fuse/autogen.sh
vendor/fuse-emulator/current/fuse/compat/Makefile.am
vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am
vendor/fuse-emulator/current/fuse/compat/linux/Makefile.am
vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am
vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am
vendor/fuse-emulator/current/fuse/compat/wii/Makefile.am
vendor/fuse-emulator/current/fuse/compat/win32/Makefile.am
vendor/fuse-emulator/current/fuse/configure.ac
vendor/fuse-emulator/current/fuse/data/Makefile.am
vendor/fuse-emulator/current/fuse/debugger/Makefile.am
vendor/fuse-emulator/current/fuse/hacking/Makefile.am
vendor/fuse-emulator/current/fuse/keysyms.dat
vendor/fuse-emulator/current/fuse/keysyms.pl
vendor/fuse-emulator/current/fuse/lib/Makefile.am
vendor/fuse-emulator/current/fuse/machines/Makefile.am
vendor/fuse-emulator/current/fuse/man/Makefile.am
vendor/fuse-emulator/current/fuse/menu_data.dat
vendor/fuse-emulator/current/fuse/menu_data.pl
vendor/fuse-emulator/current/fuse/peripherals/Makefile.am
vendor/fuse-emulator/current/fuse/peripherals/disk/Makefile.am
vendor/fuse-emulator/current/fuse/peripherals/flash/Makefile.am
vendor/fuse-emulator/current/fuse/peripherals/ide/Makefile.am
vendor/fuse-emulator/current/fuse/peripherals/nic/Makefile.am
vendor/fuse-emulator/current/fuse/perl/Fuse/Makefile.am
vendor/fuse-emulator/current/fuse/perl/Makefile.am
vendor/fuse-emulator/current/fuse/perl/cpp-perl.pl
vendor/fuse-emulator/current/fuse/pokefinder/Makefile.am
vendor/fuse-emulator/current/fuse/roms/Makefile.am
vendor/fuse-emulator/current/fuse/settings-header.pl
vendor/fuse-emulator/current/fuse/settings.dat
vendor/fuse-emulator/current/fuse/settings.pl
vendor/fuse-emulator/current/fuse/sound/Makefile.am
vendor/fuse-emulator/current/fuse/timer/Makefile.am
vendor/fuse-emulator/current/fuse/ui/Makefile.am
vendor/fuse-emulator/current/fuse/ui/fb/Makefile.am
vendor/fuse-emulator/current/fuse/ui/gtk/Makefile.am
vendor/fuse-emulator/current/fuse/ui/gtk/options-header.pl
vendor/fuse-emulator/current/fuse/ui/gtk/options.pl
vendor/fuse-emulator/current/fuse/ui/options.dat
vendor/fuse-emulator/current/fuse/ui/scaler/Makefile.am
vendor/fuse-emulator/current/fuse/ui/sdl/Makefile.am
vendor/fuse-emulator/current/fuse/ui/svga/Makefile.am
vendor/fuse-emulator/current/fuse/ui/widget/Makefile.am
vendor/fuse-emulator/current/fuse/ui/widget/mkfusefont.pl
vendor/fuse-emulator/current/fuse/ui/widget/options-header.pl
vendor/fuse-emulator/current/fuse/ui/widget/options.pl
vendor/fuse-emulator/current/fuse/ui/wii/Makefile.am
vendor/fuse-emulator/current/fuse/ui/win32/Makefile.am
vendor/fuse-emulator/current/fuse/ui/win32/icons/Makefile.am
vendor/fuse-emulator/current/fuse/ui/win32/options-header.pl
vendor/fuse-emulator/current/fuse/ui/win32/options-resource.pl
vendor/fuse-emulator/current/fuse/ui/win32/options.pl
vendor/fuse-emulator/current/fuse/ui/xlib/Makefile.am
vendor/fuse-emulator/current/fuse/ui/xlib/xstatusbar.pl
vendor/fuse-emulator/current/fuse/unittests/Makefile.am
vendor/fuse-emulator/current/fuse/windres.rc
vendor/fuse-emulator/current/fuse/z80/Makefile.am
vendor/fuse-emulator/current/fuse/z80/opcodes_base.dat
vendor/fuse-emulator/current/fuse/z80/opcodes_cb.dat
vendor/fuse-emulator/current/fuse/z80/opcodes_ddfd.dat
vendor/fuse-emulator/current/fuse/z80/opcodes_ddfdcb.dat
vendor/fuse-emulator/current/fuse/z80/opcodes_ed.dat
vendor/fuse-emulator/current/fuse/z80/tests/Makefile.am
vendor/fuse-emulator/current/fuse/z80/z80.pl
vendor/fuse-emulator/current/libspectrum/AUTHORS
vendor/fuse-emulator/current/libspectrum/COPYING
vendor/fuse-emulator/current/libspectrum/ChangeLog
vendor/fuse-emulator/current/libspectrum/Makefile.am
vendor/fuse-emulator/current/libspectrum/README
vendor/fuse-emulator/current/libspectrum/THANKS
vendor/fuse-emulator/current/libspectrum/accessor.pl
vendor/fuse-emulator/current/libspectrum/autogen.sh
vendor/fuse-emulator/current/libspectrum/configure.ac
vendor/fuse-emulator/current/libspectrum/doc/Makefile.am
vendor/fuse-emulator/current/libspectrum/generate.pl.in
vendor/fuse-emulator/current/libspectrum/hacking/Makefile.am
vendor/fuse-emulator/current/libspectrum/libspectrum.h.in
vendor/fuse-emulator/current/libspectrum/libspectrum.qpg.in
vendor/fuse-emulator/current/libspectrum/myglib/Makefile.am
vendor/fuse-emulator/current/libspectrum/snap_accessors.txt
vendor/fuse-emulator/current/libspectrum/tape_accessors.pl
vendor/fuse-emulator/current/libspectrum/tape_accessors.txt
vendor/fuse-emulator/current/libspectrum/tape_set.pl
vendor/fuse-emulator/current/libspectrum/test/Makefile.am
vendor/fuse-emulator/current/libspectrum/test/complete-tzx.pl
vendor/fuse-emulator/current/libspectrum/windres.rc
Index: vendor/fuse-emulator/current/fuse/AUTHORS
===================================================================
--- vendor/fuse-emulator/current/fuse/AUTHORS 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/AUTHORS 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/AUTHORS
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/COPYING
===================================================================
--- vendor/fuse-emulator/current/fuse/COPYING 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/COPYING 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/COPYING
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/fuse/ChangeLog 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/ChangeLog 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/ChangeLog
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/INSTALL
===================================================================
--- vendor/fuse-emulator/current/fuse/INSTALL 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/INSTALL 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/INSTALL
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/PORTING
===================================================================
--- vendor/fuse-emulator/current/fuse/PORTING 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/PORTING 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/PORTING
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/README
===================================================================
--- vendor/fuse-emulator/current/fuse/README 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/README 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/README
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/THANKS
===================================================================
--- vendor/fuse-emulator/current/fuse/THANKS 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/THANKS 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/THANKS
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/autogen.sh
===================================================================
--- vendor/fuse-emulator/current/fuse/autogen.sh 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/autogen.sh 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/autogen.sh
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/compat/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/compat/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/compat/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/compat/amiga/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/compat/linux/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/linux/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/compat/linux/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/compat/linux/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/compat/morphos/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/compat/unix/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/compat/wii/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/wii/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/compat/wii/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/compat/wii/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/compat/win32/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/win32/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/compat/win32/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/compat/win32/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/configure.ac
===================================================================
--- vendor/fuse-emulator/current/fuse/configure.ac 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/configure.ac 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/configure.ac
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/data/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/data/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/data/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/data/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/debugger/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/debugger/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/debugger/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/debugger/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/hacking/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/hacking/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/hacking/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/hacking/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/keysyms.dat
===================================================================
--- vendor/fuse-emulator/current/fuse/keysyms.dat 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/keysyms.dat 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/keysyms.dat
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/keysyms.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/keysyms.pl 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/keysyms.pl 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/keysyms.pl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/lib/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/lib/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/lib/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/lib/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/machines/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/machines/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/machines/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/machines/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/man/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/man/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/man/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/man/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/menu_data.dat
===================================================================
--- vendor/fuse-emulator/current/fuse/menu_data.dat 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/menu_data.dat 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/menu_data.dat
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/menu_data.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/menu_data.pl 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/menu_data.pl 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/menu_data.pl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/peripherals/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/peripherals/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/peripherals/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/peripherals/disk/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/disk/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/peripherals/disk/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/peripherals/disk/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/peripherals/flash/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/flash/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/peripherals/flash/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/peripherals/flash/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/peripherals/ide/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/ide/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/peripherals/ide/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/peripherals/ide/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/peripherals/nic/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/peripherals/nic/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/peripherals/nic/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/peripherals/nic/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/perl/Fuse/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/perl/Fuse/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/perl/Fuse/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/perl/Fuse/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/perl/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/perl/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/perl/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/perl/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/perl/cpp-perl.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/perl/cpp-perl.pl 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/perl/cpp-perl.pl 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/perl/cpp-perl.pl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/pokefinder/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/pokefinder/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/pokefinder/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/pokefinder/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/roms/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/roms/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/roms/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/roms/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/settings-header.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/settings-header.pl 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/settings-header.pl 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/settings-header.pl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/settings.dat
===================================================================
--- vendor/fuse-emulator/current/fuse/settings.dat 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/settings.dat 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/settings.dat
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/settings.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/settings.pl 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/settings.pl 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/settings.pl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/sound/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/sound/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/sound/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/sound/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/timer/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/timer/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/timer/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/timer/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/ui/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/ui/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/ui/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/ui/fb/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/fb/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/ui/fb/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/ui/fb/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/ui/gtk/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/gtk/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/ui/gtk/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/ui/gtk/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/ui/gtk/options-header.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/gtk/options-header.pl 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/ui/gtk/options-header.pl 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/ui/gtk/options-header.pl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/ui/gtk/options.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/gtk/options.pl 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/ui/gtk/options.pl 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/ui/gtk/options.pl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/ui/options.dat
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/options.dat 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/ui/options.dat 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/ui/options.dat
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/ui/scaler/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/scaler/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/ui/scaler/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/ui/scaler/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/ui/sdl/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/sdl/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/ui/sdl/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/ui/sdl/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/ui/svga/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/svga/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/ui/svga/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/ui/svga/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/ui/widget/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/widget/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/ui/widget/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/ui/widget/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/ui/widget/mkfusefont.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/widget/mkfusefont.pl 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/ui/widget/mkfusefont.pl 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/ui/widget/mkfusefont.pl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/ui/widget/options-header.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/widget/options-header.pl 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/ui/widget/options-header.pl 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/ui/widget/options-header.pl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/ui/widget/options.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/widget/options.pl 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/ui/widget/options.pl 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/ui/widget/options.pl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/ui/wii/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/wii/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/ui/wii/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/ui/wii/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/ui/win32/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/win32/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/ui/win32/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/ui/win32/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/ui/win32/icons/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/win32/icons/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/ui/win32/icons/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/ui/win32/icons/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/ui/win32/options-header.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/win32/options-header.pl 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/ui/win32/options-header.pl 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/ui/win32/options-header.pl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/ui/win32/options-resource.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/win32/options-resource.pl 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/ui/win32/options-resource.pl 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/ui/win32/options-resource.pl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/ui/win32/options.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/win32/options.pl 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/ui/win32/options.pl 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/ui/win32/options.pl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/ui/xlib/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/xlib/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/ui/xlib/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/ui/xlib/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/ui/xlib/xstatusbar.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/xlib/xstatusbar.pl 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/ui/xlib/xstatusbar.pl 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/ui/xlib/xstatusbar.pl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/unittests/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/unittests/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/unittests/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/unittests/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/windres.rc
===================================================================
--- vendor/fuse-emulator/current/fuse/windres.rc 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/windres.rc 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/windres.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/z80/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/z80/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/z80/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/z80/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/z80/opcodes_base.dat
===================================================================
--- vendor/fuse-emulator/current/fuse/z80/opcodes_base.dat 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/z80/opcodes_base.dat 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/z80/opcodes_base.dat
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/z80/opcodes_cb.dat
===================================================================
--- vendor/fuse-emulator/current/fuse/z80/opcodes_cb.dat 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/z80/opcodes_cb.dat 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/z80/opcodes_cb.dat
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/z80/opcodes_ddfd.dat
===================================================================
--- vendor/fuse-emulator/current/fuse/z80/opcodes_ddfd.dat 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/z80/opcodes_ddfd.dat 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/z80/opcodes_ddfd.dat
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/z80/opcodes_ddfdcb.dat
===================================================================
--- vendor/fuse-emulator/current/fuse/z80/opcodes_ddfdcb.dat 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/z80/opcodes_ddfdcb.dat 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/z80/opcodes_ddfdcb.dat
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/z80/opcodes_ed.dat
===================================================================
--- vendor/fuse-emulator/current/fuse/z80/opcodes_ed.dat 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/z80/opcodes_ed.dat 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/z80/opcodes_ed.dat
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/z80/tests/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/fuse/z80/tests/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/z80/tests/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/z80/tests/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/z80/z80.pl
===================================================================
--- vendor/fuse-emulator/current/fuse/z80/z80.pl 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/fuse/z80/z80.pl 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/fuse/z80/z80.pl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/AUTHORS
===================================================================
--- vendor/fuse-emulator/current/libspectrum/AUTHORS 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/libspectrum/AUTHORS 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/libspectrum/AUTHORS
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/COPYING
===================================================================
--- vendor/fuse-emulator/current/libspectrum/COPYING 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/libspectrum/COPYING 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/libspectrum/COPYING
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/ChangeLog
===================================================================
--- vendor/fuse-emulator/current/libspectrum/ChangeLog 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/libspectrum/ChangeLog 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/libspectrum/ChangeLog
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/libspectrum/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/libspectrum/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/libspectrum/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/README
===================================================================
--- vendor/fuse-emulator/current/libspectrum/README 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/libspectrum/README 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/libspectrum/README
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/THANKS
===================================================================
--- vendor/fuse-emulator/current/libspectrum/THANKS 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/libspectrum/THANKS 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/libspectrum/THANKS
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/accessor.pl
===================================================================
--- vendor/fuse-emulator/current/libspectrum/accessor.pl 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/libspectrum/accessor.pl 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/libspectrum/accessor.pl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/autogen.sh
===================================================================
--- vendor/fuse-emulator/current/libspectrum/autogen.sh 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/libspectrum/autogen.sh 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/libspectrum/autogen.sh
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/configure.ac
===================================================================
--- vendor/fuse-emulator/current/libspectrum/configure.ac 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/libspectrum/configure.ac 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/libspectrum/configure.ac
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/doc/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/libspectrum/doc/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/libspectrum/doc/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/libspectrum/doc/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/generate.pl.in
===================================================================
--- vendor/fuse-emulator/current/libspectrum/generate.pl.in 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/libspectrum/generate.pl.in 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/libspectrum/generate.pl.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/hacking/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/libspectrum/hacking/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/libspectrum/hacking/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/libspectrum/hacking/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/libspectrum.h.in
===================================================================
--- vendor/fuse-emulator/current/libspectrum/libspectrum.h.in 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/libspectrum/libspectrum.h.in 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/libspectrum/libspectrum.h.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/libspectrum.qpg.in
===================================================================
--- vendor/fuse-emulator/current/libspectrum/libspectrum.qpg.in 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/libspectrum/libspectrum.qpg.in 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/libspectrum/libspectrum.qpg.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/myglib/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/libspectrum/myglib/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/libspectrum/myglib/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/libspectrum/myglib/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/snap_accessors.txt
===================================================================
--- vendor/fuse-emulator/current/libspectrum/snap_accessors.txt 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/libspectrum/snap_accessors.txt 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/libspectrum/snap_accessors.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/tape_accessors.pl
===================================================================
--- vendor/fuse-emulator/current/libspectrum/tape_accessors.pl 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/libspectrum/tape_accessors.pl 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/libspectrum/tape_accessors.pl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/tape_accessors.txt
===================================================================
--- vendor/fuse-emulator/current/libspectrum/tape_accessors.txt 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/libspectrum/tape_accessors.txt 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/libspectrum/tape_accessors.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/tape_set.pl
===================================================================
--- vendor/fuse-emulator/current/libspectrum/tape_set.pl 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/libspectrum/tape_set.pl 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/libspectrum/tape_set.pl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/test/Makefile.am
===================================================================
--- vendor/fuse-emulator/current/libspectrum/test/Makefile.am 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/libspectrum/test/Makefile.am 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/libspectrum/test/Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/test/complete-tzx.pl
===================================================================
--- vendor/fuse-emulator/current/libspectrum/test/complete-tzx.pl 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/libspectrum/test/complete-tzx.pl 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/libspectrum/test/complete-tzx.pl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/libspectrum/windres.rc
===================================================================
--- vendor/fuse-emulator/current/libspectrum/windres.rc 2016-05-24 14:16:36 UTC (rev 796)
+++ vendor/fuse-emulator/current/libspectrum/windres.rc 2016-05-24 14:22:14 UTC (rev 797)
Property changes on: vendor/fuse-emulator/current/libspectrum/windres.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2016-05-24 14:16:42
|
Revision: 796
http://sourceforge.net/p/fuse-for-macosx/code/796
Author: fredm
Date: 2016-05-24 14:16:36 +0000 (Tue, 24 May 2016)
Log Message:
-----------
Set vendor svn:eol-style and svn:keywords properties to match vendor source.
Modified Paths:
--------------
vendor/fuse-emulator/current/fuse/bitmap.h
vendor/fuse-emulator/current/fuse/compat/amiga/osname.c
vendor/fuse-emulator/current/fuse/compat/amiga/paths.c
vendor/fuse-emulator/current/fuse/compat/linux/paths.c
vendor/fuse-emulator/current/fuse/compat/morphos/osname.c
vendor/fuse-emulator/current/fuse/compat/unix/dir.c
vendor/fuse-emulator/current/fuse/compat/unix/file.c
vendor/fuse-emulator/current/fuse/compat/unix/osname.c
vendor/fuse-emulator/current/fuse/compat/unix/paths.c
vendor/fuse-emulator/current/fuse/compat/unix/socket.c
vendor/fuse-emulator/current/fuse/compat/unix/timer.c
vendor/fuse-emulator/current/fuse/compat/unix/tuntap.c
vendor/fuse-emulator/current/fuse/compat/wii/dir.c
vendor/fuse-emulator/current/fuse/compat/wii/osname.c
vendor/fuse-emulator/current/fuse/compat/wii/paths.c
vendor/fuse-emulator/current/fuse/compat/wii/timer.c
vendor/fuse-emulator/current/fuse/compat/win32/osname.c
vendor/fuse-emulator/current/fuse/compat/win32/paths.c
vendor/fuse-emulator/current/fuse/compat/win32/socket.c
vendor/fuse-emulator/current/fuse/compat/win32/timer.c
vendor/fuse-emulator/current/fuse/compat.h
vendor/fuse-emulator/current/fuse/debugger/breakpoint.c
vendor/fuse-emulator/current/fuse/debugger/breakpoint.h
vendor/fuse-emulator/current/fuse/debugger/command.c
vendor/fuse-emulator/current/fuse/debugger/debugger.c
vendor/fuse-emulator/current/fuse/debugger/debugger.h
vendor/fuse-emulator/current/fuse/debugger/debugger_internals.h
vendor/fuse-emulator/current/fuse/debugger/disassemble.c
vendor/fuse-emulator/current/fuse/debugger/event.c
vendor/fuse-emulator/current/fuse/debugger/expression.c
vendor/fuse-emulator/current/fuse/debugger/variable.c
vendor/fuse-emulator/current/fuse/display.c
vendor/fuse-emulator/current/fuse/display.h
vendor/fuse-emulator/current/fuse/event.c
vendor/fuse-emulator/current/fuse/event.h
vendor/fuse-emulator/current/fuse/fuse.c
vendor/fuse-emulator/current/fuse/fuse.h
vendor/fuse-emulator/current/fuse/input.c
vendor/fuse-emulator/current/fuse/input.h
vendor/fuse-emulator/current/fuse/keyboard.c
vendor/fuse-emulator/current/fuse/keyboard.h
vendor/fuse-emulator/current/fuse/loader.c
vendor/fuse-emulator/current/fuse/loader.h
vendor/fuse-emulator/current/fuse/machine.c
vendor/fuse-emulator/current/fuse/machine.h
vendor/fuse-emulator/current/fuse/machines/machines.h
vendor/fuse-emulator/current/fuse/machines/machines_periph.c
vendor/fuse-emulator/current/fuse/machines/machines_periph.h
vendor/fuse-emulator/current/fuse/machines/pentagon.c
vendor/fuse-emulator/current/fuse/machines/pentagon.h
vendor/fuse-emulator/current/fuse/machines/pentagon1024.c
vendor/fuse-emulator/current/fuse/machines/pentagon512.c
vendor/fuse-emulator/current/fuse/machines/scorpion.c
vendor/fuse-emulator/current/fuse/machines/scorpion.h
vendor/fuse-emulator/current/fuse/machines/spec128.c
vendor/fuse-emulator/current/fuse/machines/spec128.h
vendor/fuse-emulator/current/fuse/machines/spec16.c
vendor/fuse-emulator/current/fuse/machines/spec48.c
vendor/fuse-emulator/current/fuse/machines/spec48.h
vendor/fuse-emulator/current/fuse/machines/spec48_ntsc.c
vendor/fuse-emulator/current/fuse/machines/spec_se.c
vendor/fuse-emulator/current/fuse/machines/specplus2.c
vendor/fuse-emulator/current/fuse/machines/specplus2a.c
vendor/fuse-emulator/current/fuse/machines/specplus3.c
vendor/fuse-emulator/current/fuse/machines/specplus3.h
vendor/fuse-emulator/current/fuse/machines/specplus3e.c
vendor/fuse-emulator/current/fuse/machines/tc2048.c
vendor/fuse-emulator/current/fuse/machines/tc2068.c
vendor/fuse-emulator/current/fuse/machines/tc2068.h
vendor/fuse-emulator/current/fuse/machines/ts2068.c
vendor/fuse-emulator/current/fuse/memory.c
vendor/fuse-emulator/current/fuse/memory.h
vendor/fuse-emulator/current/fuse/mempool.c
vendor/fuse-emulator/current/fuse/mempool.h
vendor/fuse-emulator/current/fuse/menu.c
vendor/fuse-emulator/current/fuse/menu.h
vendor/fuse-emulator/current/fuse/module.c
vendor/fuse-emulator/current/fuse/module.h
vendor/fuse-emulator/current/fuse/movie.c
vendor/fuse-emulator/current/fuse/movie.h
vendor/fuse-emulator/current/fuse/movie_tables.h
vendor/fuse-emulator/current/fuse/periph.c
vendor/fuse-emulator/current/fuse/periph.h
vendor/fuse-emulator/current/fuse/peripherals/ay.c
vendor/fuse-emulator/current/fuse/peripherals/ay.h
vendor/fuse-emulator/current/fuse/peripherals/dck.c
vendor/fuse-emulator/current/fuse/peripherals/dck.h
vendor/fuse-emulator/current/fuse/peripherals/disk/beta.c
vendor/fuse-emulator/current/fuse/peripherals/disk/beta.h
vendor/fuse-emulator/current/fuse/peripherals/disk/crc.c
vendor/fuse-emulator/current/fuse/peripherals/disk/crc.h
vendor/fuse-emulator/current/fuse/peripherals/disk/disciple.c
vendor/fuse-emulator/current/fuse/peripherals/disk/disciple.h
vendor/fuse-emulator/current/fuse/peripherals/disk/disk.c
vendor/fuse-emulator/current/fuse/peripherals/disk/disk.h
vendor/fuse-emulator/current/fuse/peripherals/disk/fdd.c
vendor/fuse-emulator/current/fuse/peripherals/disk/fdd.h
vendor/fuse-emulator/current/fuse/peripherals/disk/opus.c
vendor/fuse-emulator/current/fuse/peripherals/disk/opus.h
vendor/fuse-emulator/current/fuse/peripherals/disk/plusd.c
vendor/fuse-emulator/current/fuse/peripherals/disk/plusd.h
vendor/fuse-emulator/current/fuse/peripherals/disk/upd_fdc.c
vendor/fuse-emulator/current/fuse/peripherals/disk/upd_fdc.h
vendor/fuse-emulator/current/fuse/peripherals/disk/wd_fdc.c
vendor/fuse-emulator/current/fuse/peripherals/disk/wd_fdc.h
vendor/fuse-emulator/current/fuse/peripherals/flash/am29f010.c
vendor/fuse-emulator/current/fuse/peripherals/flash/am29f010.h
vendor/fuse-emulator/current/fuse/peripherals/fuller.c
vendor/fuse-emulator/current/fuse/peripherals/fuller.h
vendor/fuse-emulator/current/fuse/peripherals/ide/divide.c
vendor/fuse-emulator/current/fuse/peripherals/ide/divide.h
vendor/fuse-emulator/current/fuse/peripherals/ide/ide.c
vendor/fuse-emulator/current/fuse/peripherals/ide/ide.h
vendor/fuse-emulator/current/fuse/peripherals/ide/simpleide.c
vendor/fuse-emulator/current/fuse/peripherals/ide/simpleide.h
vendor/fuse-emulator/current/fuse/peripherals/ide/zxatasp.c
vendor/fuse-emulator/current/fuse/peripherals/ide/zxatasp.h
vendor/fuse-emulator/current/fuse/peripherals/ide/zxcf.c
vendor/fuse-emulator/current/fuse/peripherals/ide/zxcf.h
vendor/fuse-emulator/current/fuse/peripherals/if1.c
vendor/fuse-emulator/current/fuse/peripherals/if1.h
vendor/fuse-emulator/current/fuse/peripherals/if2.c
vendor/fuse-emulator/current/fuse/peripherals/if2.h
vendor/fuse-emulator/current/fuse/peripherals/joystick.c
vendor/fuse-emulator/current/fuse/peripherals/joystick.h
vendor/fuse-emulator/current/fuse/peripherals/kempmouse.c
vendor/fuse-emulator/current/fuse/peripherals/kempmouse.h
vendor/fuse-emulator/current/fuse/peripherals/melodik.c
vendor/fuse-emulator/current/fuse/peripherals/melodik.h
vendor/fuse-emulator/current/fuse/peripherals/nic/enc28j60.c
vendor/fuse-emulator/current/fuse/peripherals/nic/enc28j60.h
vendor/fuse-emulator/current/fuse/peripherals/nic/w5100.c
vendor/fuse-emulator/current/fuse/peripherals/nic/w5100.h
vendor/fuse-emulator/current/fuse/peripherals/nic/w5100_internals.h
vendor/fuse-emulator/current/fuse/peripherals/nic/w5100_socket.c
vendor/fuse-emulator/current/fuse/peripherals/printer.c
vendor/fuse-emulator/current/fuse/peripherals/printer.h
vendor/fuse-emulator/current/fuse/peripherals/scld.c
vendor/fuse-emulator/current/fuse/peripherals/scld.h
vendor/fuse-emulator/current/fuse/peripherals/speccyboot.c
vendor/fuse-emulator/current/fuse/peripherals/speccyboot.h
vendor/fuse-emulator/current/fuse/peripherals/specdrum.c
vendor/fuse-emulator/current/fuse/peripherals/specdrum.h
vendor/fuse-emulator/current/fuse/peripherals/spectranet.c
vendor/fuse-emulator/current/fuse/peripherals/spectranet.h
vendor/fuse-emulator/current/fuse/peripherals/ula.c
vendor/fuse-emulator/current/fuse/peripherals/ula.h
vendor/fuse-emulator/current/fuse/pokefinder/pokefinder.c
vendor/fuse-emulator/current/fuse/pokefinder/pokefinder.h
vendor/fuse-emulator/current/fuse/pokefinder/pokemem.c
vendor/fuse-emulator/current/fuse/pokefinder/pokemem.h
vendor/fuse-emulator/current/fuse/profile.c
vendor/fuse-emulator/current/fuse/profile.h
vendor/fuse-emulator/current/fuse/psg.c
vendor/fuse-emulator/current/fuse/psg.h
vendor/fuse-emulator/current/fuse/rectangle.c
vendor/fuse-emulator/current/fuse/rectangle.h
vendor/fuse-emulator/current/fuse/rzx.c
vendor/fuse-emulator/current/fuse/rzx.h
vendor/fuse-emulator/current/fuse/screenshot.c
vendor/fuse-emulator/current/fuse/screenshot.h
vendor/fuse-emulator/current/fuse/slt.c
vendor/fuse-emulator/current/fuse/slt.h
vendor/fuse-emulator/current/fuse/snapshot.c
vendor/fuse-emulator/current/fuse/snapshot.h
vendor/fuse-emulator/current/fuse/sound/alsasound.c
vendor/fuse-emulator/current/fuse/sound/aosound.c
vendor/fuse-emulator/current/fuse/sound/dxsound.c
vendor/fuse-emulator/current/fuse/sound/hpsound.c
vendor/fuse-emulator/current/fuse/sound/nullsound.c
vendor/fuse-emulator/current/fuse/sound/osssound.c
vendor/fuse-emulator/current/fuse/sound/sdlsound.c
vendor/fuse-emulator/current/fuse/sound/sunsound.c
vendor/fuse-emulator/current/fuse/sound/wiisound.c
vendor/fuse-emulator/current/fuse/sound/win32sound.c
vendor/fuse-emulator/current/fuse/sound.c
vendor/fuse-emulator/current/fuse/sound.h
vendor/fuse-emulator/current/fuse/spectrum.c
vendor/fuse-emulator/current/fuse/spectrum.h
vendor/fuse-emulator/current/fuse/tape.c
vendor/fuse-emulator/current/fuse/tape.h
vendor/fuse-emulator/current/fuse/timer/native.c
vendor/fuse-emulator/current/fuse/timer/sdl.c
vendor/fuse-emulator/current/fuse/timer/timer.c
vendor/fuse-emulator/current/fuse/timer/timer.h
vendor/fuse-emulator/current/fuse/ui/fb/fbdisplay.c
vendor/fuse-emulator/current/fuse/ui/fb/fbdisplay.h
vendor/fuse-emulator/current/fuse/ui/fb/fbjoystick.c
vendor/fuse-emulator/current/fuse/ui/fb/fbkeyboard.c
vendor/fuse-emulator/current/fuse/ui/fb/fbkeyboard.h
vendor/fuse-emulator/current/fuse/ui/fb/fbmouse.c
vendor/fuse-emulator/current/fuse/ui/fb/fbmouse.h
vendor/fuse-emulator/current/fuse/ui/fb/fbui.c
vendor/fuse-emulator/current/fuse/ui/gtk/binary.c
vendor/fuse-emulator/current/fuse/ui/gtk/browse.c
vendor/fuse-emulator/current/fuse/ui/gtk/confirm.c
vendor/fuse-emulator/current/fuse/ui/gtk/debugger.c
vendor/fuse-emulator/current/fuse/ui/gtk/fileselector.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkcompat.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkcompat.h
vendor/fuse-emulator/current/fuse/ui/gtk/gtkdisplay.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkinternals.h
vendor/fuse-emulator/current/fuse/ui/gtk/gtkjoystick.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkkeyboard.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkmouse.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkui.c
vendor/fuse-emulator/current/fuse/ui/gtk/memory.c
vendor/fuse-emulator/current/fuse/ui/gtk/picture.c
vendor/fuse-emulator/current/fuse/ui/gtk/pixmaps.c
vendor/fuse-emulator/current/fuse/ui/gtk/pokefinder.c
vendor/fuse-emulator/current/fuse/ui/gtk/pokemem.c
vendor/fuse-emulator/current/fuse/ui/gtk/rollback.c
vendor/fuse-emulator/current/fuse/ui/gtk/roms.c
vendor/fuse-emulator/current/fuse/ui/gtk/statusbar.c
vendor/fuse-emulator/current/fuse/ui/gtk/stock.c
vendor/fuse-emulator/current/fuse/ui/scaler/scaler.c
vendor/fuse-emulator/current/fuse/ui/scaler/scaler_hq2x.c
vendor/fuse-emulator/current/fuse/ui/scaler/scaler_hq3x.c
vendor/fuse-emulator/current/fuse/ui/scaler/scaler_internals.h
vendor/fuse-emulator/current/fuse/ui/scaler/scalers.c
vendor/fuse-emulator/current/fuse/ui/sdl/sdldisplay.c
vendor/fuse-emulator/current/fuse/ui/sdl/sdldisplay.h
vendor/fuse-emulator/current/fuse/ui/sdl/sdljoystick.c
vendor/fuse-emulator/current/fuse/ui/sdl/sdljoystick.h
vendor/fuse-emulator/current/fuse/ui/sdl/sdlkeyboard.c
vendor/fuse-emulator/current/fuse/ui/sdl/sdlkeyboard.h
vendor/fuse-emulator/current/fuse/ui/sdl/sdlui.c
vendor/fuse-emulator/current/fuse/ui/svga/svgadisplay.c
vendor/fuse-emulator/current/fuse/ui/svga/svgadisplay.h
vendor/fuse-emulator/current/fuse/ui/svga/svgajoystick.c
vendor/fuse-emulator/current/fuse/ui/svga/svgakeyboard.c
vendor/fuse-emulator/current/fuse/ui/svga/svgakeyboard.h
vendor/fuse-emulator/current/fuse/ui/svga/svgaui.c
vendor/fuse-emulator/current/fuse/ui/ui.h
vendor/fuse-emulator/current/fuse/ui/uidisplay.h
vendor/fuse-emulator/current/fuse/ui/uijoystick.c
vendor/fuse-emulator/current/fuse/ui/uijoystick.h
vendor/fuse-emulator/current/fuse/ui/widget/browse.c
vendor/fuse-emulator/current/fuse/ui/widget/debugger.c
vendor/fuse-emulator/current/fuse/ui/widget/error.c
vendor/fuse-emulator/current/fuse/ui/widget/filesel.c
vendor/fuse-emulator/current/fuse/ui/widget/memory.c
vendor/fuse-emulator/current/fuse/ui/widget/menu.c
vendor/fuse-emulator/current/fuse/ui/widget/picture.c
vendor/fuse-emulator/current/fuse/ui/widget/pokefinder.c
vendor/fuse-emulator/current/fuse/ui/widget/pokemem.c
vendor/fuse-emulator/current/fuse/ui/widget/query.c
vendor/fuse-emulator/current/fuse/ui/widget/roms.c
vendor/fuse-emulator/current/fuse/ui/widget/select.c
vendor/fuse-emulator/current/fuse/ui/widget/text.c
vendor/fuse-emulator/current/fuse/ui/widget/widget.c
vendor/fuse-emulator/current/fuse/ui/widget/widget.h
vendor/fuse-emulator/current/fuse/ui/widget/widget_internals.h
vendor/fuse-emulator/current/fuse/ui/wii/wiidisplay.c
vendor/fuse-emulator/current/fuse/ui/wii/wiidisplay.h
vendor/fuse-emulator/current/fuse/ui/wii/wiijoystick.c
vendor/fuse-emulator/current/fuse/ui/wii/wiikeyboard.c
vendor/fuse-emulator/current/fuse/ui/wii/wiikeyboard.h
vendor/fuse-emulator/current/fuse/ui/wii/wiikeysyms.h
vendor/fuse-emulator/current/fuse/ui/wii/wiimouse.c
vendor/fuse-emulator/current/fuse/ui/wii/wiimouse.h
vendor/fuse-emulator/current/fuse/ui/wii/wiiui.c
vendor/fuse-emulator/current/fuse/ui/win32/about.c
vendor/fuse-emulator/current/fuse/ui/win32/about.h
vendor/fuse-emulator/current/fuse/ui/win32/binary.c
vendor/fuse-emulator/current/fuse/ui/win32/binary.h
vendor/fuse-emulator/current/fuse/ui/win32/browse.c
vendor/fuse-emulator/current/fuse/ui/win32/browse.h
vendor/fuse-emulator/current/fuse/ui/win32/confirm.c
vendor/fuse-emulator/current/fuse/ui/win32/debugger.c
vendor/fuse-emulator/current/fuse/ui/win32/debugger.h
vendor/fuse-emulator/current/fuse/ui/win32/fileselector.c
vendor/fuse-emulator/current/fuse/ui/win32/hyperlinks.c
vendor/fuse-emulator/current/fuse/ui/win32/hyperlinks.h
vendor/fuse-emulator/current/fuse/ui/win32/memorybrowser.c
vendor/fuse-emulator/current/fuse/ui/win32/memorybrowser.h
vendor/fuse-emulator/current/fuse/ui/win32/picture.c
vendor/fuse-emulator/current/fuse/ui/win32/picture.h
vendor/fuse-emulator/current/fuse/ui/win32/pokefinder.c
vendor/fuse-emulator/current/fuse/ui/win32/pokefinder.h
vendor/fuse-emulator/current/fuse/ui/win32/pokemem.c
vendor/fuse-emulator/current/fuse/ui/win32/pokemem.h
vendor/fuse-emulator/current/fuse/ui/win32/rollback.c
vendor/fuse-emulator/current/fuse/ui/win32/rollback.h
vendor/fuse-emulator/current/fuse/ui/win32/roms.c
vendor/fuse-emulator/current/fuse/ui/win32/roms.h
vendor/fuse-emulator/current/fuse/ui/win32/statusbar.c
vendor/fuse-emulator/current/fuse/ui/win32/win32display.c
vendor/fuse-emulator/current/fuse/ui/win32/win32internals.h
vendor/fuse-emulator/current/fuse/ui/win32/win32joystick.c
vendor/fuse-emulator/current/fuse/ui/win32/win32joystick.h
vendor/fuse-emulator/current/fuse/ui/win32/win32keyboard.c
vendor/fuse-emulator/current/fuse/ui/win32/win32mouse.c
vendor/fuse-emulator/current/fuse/ui/win32/win32ui.c
vendor/fuse-emulator/current/fuse/ui/xlib/xdisplay.c
vendor/fuse-emulator/current/fuse/ui/xlib/xdisplay.h
vendor/fuse-emulator/current/fuse/ui/xlib/xerror.c
vendor/fuse-emulator/current/fuse/ui/xlib/xjoystick.c
vendor/fuse-emulator/current/fuse/ui/xlib/xkeyboard.c
vendor/fuse-emulator/current/fuse/ui/xlib/xkeyboard.h
vendor/fuse-emulator/current/fuse/ui/xlib/xui.c
vendor/fuse-emulator/current/fuse/ui/xlib/xui.h
vendor/fuse-emulator/current/fuse/ui.c
vendor/fuse-emulator/current/fuse/uidisplay.c
vendor/fuse-emulator/current/fuse/unittests/unittests.c
vendor/fuse-emulator/current/fuse/unittests/unittests.h
vendor/fuse-emulator/current/fuse/utils.c
vendor/fuse-emulator/current/fuse/utils.h
vendor/fuse-emulator/current/fuse/z80/coretest.c
vendor/fuse-emulator/current/fuse/z80/z80.h
vendor/fuse-emulator/current/fuse/z80/z80_macros.h
vendor/fuse-emulator/current/fuse/z80/z80_ops.c
vendor/fuse-emulator/current/libspectrum/bzip2.c
vendor/fuse-emulator/current/libspectrum/creator.c
vendor/fuse-emulator/current/libspectrum/crypto.c
vendor/fuse-emulator/current/libspectrum/csw.c
vendor/fuse-emulator/current/libspectrum/dck.c
vendor/fuse-emulator/current/libspectrum/dll.c
vendor/fuse-emulator/current/libspectrum/ide.c
vendor/fuse-emulator/current/libspectrum/internals.h
vendor/fuse-emulator/current/libspectrum/libspectrum.c
vendor/fuse-emulator/current/libspectrum/make-perl.c
vendor/fuse-emulator/current/libspectrum/memory.c
vendor/fuse-emulator/current/libspectrum/microdrive.c
vendor/fuse-emulator/current/libspectrum/myglib/garray.c
vendor/fuse-emulator/current/libspectrum/myglib/ghash.c
vendor/fuse-emulator/current/libspectrum/myglib/gslist.c
vendor/fuse-emulator/current/libspectrum/plusd.c
vendor/fuse-emulator/current/libspectrum/pzx_read.c
vendor/fuse-emulator/current/libspectrum/rzx.c
vendor/fuse-emulator/current/libspectrum/sna.c
vendor/fuse-emulator/current/libspectrum/snapshot.c
vendor/fuse-emulator/current/libspectrum/snp.c
vendor/fuse-emulator/current/libspectrum/sp.c
vendor/fuse-emulator/current/libspectrum/symbol_table.c
vendor/fuse-emulator/current/libspectrum/szx.c
vendor/fuse-emulator/current/libspectrum/tap.c
vendor/fuse-emulator/current/libspectrum/tape.c
vendor/fuse-emulator/current/libspectrum/tape_block.c
vendor/fuse-emulator/current/libspectrum/tape_block.h
vendor/fuse-emulator/current/libspectrum/timings.c
vendor/fuse-emulator/current/libspectrum/tzx_read.c
vendor/fuse-emulator/current/libspectrum/tzx_write.c
vendor/fuse-emulator/current/libspectrum/utilities.c
vendor/fuse-emulator/current/libspectrum/warajevo_read.c
vendor/fuse-emulator/current/libspectrum/wav.c
vendor/fuse-emulator/current/libspectrum/z80.c
vendor/fuse-emulator/current/libspectrum/z80em.c
vendor/fuse-emulator/current/libspectrum/zlib.c
vendor/fuse-emulator/current/libspectrum/zxs.c
Property Changed:
----------------
vendor/fuse-emulator/current/fuse/bitmap.h
vendor/fuse-emulator/current/fuse/compat/amiga/osname.c
vendor/fuse-emulator/current/fuse/compat/amiga/paths.c
vendor/fuse-emulator/current/fuse/compat/dirname.c
vendor/fuse-emulator/current/fuse/compat/getopt.c
vendor/fuse-emulator/current/fuse/compat/getopt.h
vendor/fuse-emulator/current/fuse/compat/getopt1.c
vendor/fuse-emulator/current/fuse/compat/linux/paths.c
vendor/fuse-emulator/current/fuse/compat/mkstemp.c
vendor/fuse-emulator/current/fuse/compat/morphos/osname.c
vendor/fuse-emulator/current/fuse/compat/unix/dir.c
vendor/fuse-emulator/current/fuse/compat/unix/file.c
vendor/fuse-emulator/current/fuse/compat/unix/osname.c
vendor/fuse-emulator/current/fuse/compat/unix/paths.c
vendor/fuse-emulator/current/fuse/compat/unix/socket.c
vendor/fuse-emulator/current/fuse/compat/unix/timer.c
vendor/fuse-emulator/current/fuse/compat/unix/tuntap.c
vendor/fuse-emulator/current/fuse/compat/wii/dir.c
vendor/fuse-emulator/current/fuse/compat/wii/osname.c
vendor/fuse-emulator/current/fuse/compat/wii/paths.c
vendor/fuse-emulator/current/fuse/compat/wii/timer.c
vendor/fuse-emulator/current/fuse/compat/win32/osname.c
vendor/fuse-emulator/current/fuse/compat/win32/paths.c
vendor/fuse-emulator/current/fuse/compat/win32/socket.c
vendor/fuse-emulator/current/fuse/compat/win32/timer.c
vendor/fuse-emulator/current/fuse/compat.h
vendor/fuse-emulator/current/fuse/debugger/breakpoint.c
vendor/fuse-emulator/current/fuse/debugger/breakpoint.h
vendor/fuse-emulator/current/fuse/debugger/command.c
vendor/fuse-emulator/current/fuse/debugger/debugger.c
vendor/fuse-emulator/current/fuse/debugger/debugger.h
vendor/fuse-emulator/current/fuse/debugger/debugger_internals.h
vendor/fuse-emulator/current/fuse/debugger/disassemble.c
vendor/fuse-emulator/current/fuse/debugger/event.c
vendor/fuse-emulator/current/fuse/debugger/expression.c
vendor/fuse-emulator/current/fuse/debugger/variable.c
vendor/fuse-emulator/current/fuse/display.c
vendor/fuse-emulator/current/fuse/display.h
vendor/fuse-emulator/current/fuse/event.c
vendor/fuse-emulator/current/fuse/event.h
vendor/fuse-emulator/current/fuse/fuse.c
vendor/fuse-emulator/current/fuse/fuse.h
vendor/fuse-emulator/current/fuse/input.c
vendor/fuse-emulator/current/fuse/input.h
vendor/fuse-emulator/current/fuse/keyboard.c
vendor/fuse-emulator/current/fuse/keyboard.h
vendor/fuse-emulator/current/fuse/loader.c
vendor/fuse-emulator/current/fuse/loader.h
vendor/fuse-emulator/current/fuse/machine.c
vendor/fuse-emulator/current/fuse/machine.h
vendor/fuse-emulator/current/fuse/machines/machines.h
vendor/fuse-emulator/current/fuse/machines/machines_periph.c
vendor/fuse-emulator/current/fuse/machines/machines_periph.h
vendor/fuse-emulator/current/fuse/machines/pentagon.c
vendor/fuse-emulator/current/fuse/machines/pentagon.h
vendor/fuse-emulator/current/fuse/machines/pentagon1024.c
vendor/fuse-emulator/current/fuse/machines/pentagon512.c
vendor/fuse-emulator/current/fuse/machines/scorpion.c
vendor/fuse-emulator/current/fuse/machines/scorpion.h
vendor/fuse-emulator/current/fuse/machines/spec128.c
vendor/fuse-emulator/current/fuse/machines/spec128.h
vendor/fuse-emulator/current/fuse/machines/spec16.c
vendor/fuse-emulator/current/fuse/machines/spec48.c
vendor/fuse-emulator/current/fuse/machines/spec48.h
vendor/fuse-emulator/current/fuse/machines/spec48_ntsc.c
vendor/fuse-emulator/current/fuse/machines/spec_se.c
vendor/fuse-emulator/current/fuse/machines/specplus2.c
vendor/fuse-emulator/current/fuse/machines/specplus2a.c
vendor/fuse-emulator/current/fuse/machines/specplus3.c
vendor/fuse-emulator/current/fuse/machines/specplus3.h
vendor/fuse-emulator/current/fuse/machines/specplus3e.c
vendor/fuse-emulator/current/fuse/machines/tc2048.c
vendor/fuse-emulator/current/fuse/machines/tc2068.c
vendor/fuse-emulator/current/fuse/machines/tc2068.h
vendor/fuse-emulator/current/fuse/machines/ts2068.c
vendor/fuse-emulator/current/fuse/memory.c
vendor/fuse-emulator/current/fuse/memory.h
vendor/fuse-emulator/current/fuse/mempool.c
vendor/fuse-emulator/current/fuse/mempool.h
vendor/fuse-emulator/current/fuse/menu.c
vendor/fuse-emulator/current/fuse/menu.h
vendor/fuse-emulator/current/fuse/module.c
vendor/fuse-emulator/current/fuse/module.h
vendor/fuse-emulator/current/fuse/movie.c
vendor/fuse-emulator/current/fuse/movie.h
vendor/fuse-emulator/current/fuse/movie_tables.h
vendor/fuse-emulator/current/fuse/periph.c
vendor/fuse-emulator/current/fuse/periph.h
vendor/fuse-emulator/current/fuse/peripherals/ay.c
vendor/fuse-emulator/current/fuse/peripherals/ay.h
vendor/fuse-emulator/current/fuse/peripherals/dck.c
vendor/fuse-emulator/current/fuse/peripherals/dck.h
vendor/fuse-emulator/current/fuse/peripherals/disk/beta.c
vendor/fuse-emulator/current/fuse/peripherals/disk/beta.h
vendor/fuse-emulator/current/fuse/peripherals/disk/crc.c
vendor/fuse-emulator/current/fuse/peripherals/disk/crc.h
vendor/fuse-emulator/current/fuse/peripherals/disk/disciple.c
vendor/fuse-emulator/current/fuse/peripherals/disk/disciple.h
vendor/fuse-emulator/current/fuse/peripherals/disk/disk.c
vendor/fuse-emulator/current/fuse/peripherals/disk/disk.h
vendor/fuse-emulator/current/fuse/peripherals/disk/fdd.c
vendor/fuse-emulator/current/fuse/peripherals/disk/fdd.h
vendor/fuse-emulator/current/fuse/peripherals/disk/opus.c
vendor/fuse-emulator/current/fuse/peripherals/disk/opus.h
vendor/fuse-emulator/current/fuse/peripherals/disk/plusd.c
vendor/fuse-emulator/current/fuse/peripherals/disk/plusd.h
vendor/fuse-emulator/current/fuse/peripherals/disk/upd_fdc.c
vendor/fuse-emulator/current/fuse/peripherals/disk/upd_fdc.h
vendor/fuse-emulator/current/fuse/peripherals/disk/wd_fdc.c
vendor/fuse-emulator/current/fuse/peripherals/disk/wd_fdc.h
vendor/fuse-emulator/current/fuse/peripherals/flash/am29f010.c
vendor/fuse-emulator/current/fuse/peripherals/flash/am29f010.h
vendor/fuse-emulator/current/fuse/peripherals/fuller.c
vendor/fuse-emulator/current/fuse/peripherals/fuller.h
vendor/fuse-emulator/current/fuse/peripherals/ide/divide.c
vendor/fuse-emulator/current/fuse/peripherals/ide/divide.h
vendor/fuse-emulator/current/fuse/peripherals/ide/ide.c
vendor/fuse-emulator/current/fuse/peripherals/ide/ide.h
vendor/fuse-emulator/current/fuse/peripherals/ide/simpleide.c
vendor/fuse-emulator/current/fuse/peripherals/ide/simpleide.h
vendor/fuse-emulator/current/fuse/peripherals/ide/zxatasp.c
vendor/fuse-emulator/current/fuse/peripherals/ide/zxatasp.h
vendor/fuse-emulator/current/fuse/peripherals/ide/zxcf.c
vendor/fuse-emulator/current/fuse/peripherals/ide/zxcf.h
vendor/fuse-emulator/current/fuse/peripherals/if1.c
vendor/fuse-emulator/current/fuse/peripherals/if1.h
vendor/fuse-emulator/current/fuse/peripherals/if2.c
vendor/fuse-emulator/current/fuse/peripherals/if2.h
vendor/fuse-emulator/current/fuse/peripherals/joystick.c
vendor/fuse-emulator/current/fuse/peripherals/joystick.h
vendor/fuse-emulator/current/fuse/peripherals/kempmouse.c
vendor/fuse-emulator/current/fuse/peripherals/kempmouse.h
vendor/fuse-emulator/current/fuse/peripherals/melodik.c
vendor/fuse-emulator/current/fuse/peripherals/melodik.h
vendor/fuse-emulator/current/fuse/peripherals/nic/enc28j60.c
vendor/fuse-emulator/current/fuse/peripherals/nic/enc28j60.h
vendor/fuse-emulator/current/fuse/peripherals/nic/w5100.c
vendor/fuse-emulator/current/fuse/peripherals/nic/w5100.h
vendor/fuse-emulator/current/fuse/peripherals/nic/w5100_internals.h
vendor/fuse-emulator/current/fuse/peripherals/nic/w5100_socket.c
vendor/fuse-emulator/current/fuse/peripherals/printer.c
vendor/fuse-emulator/current/fuse/peripherals/printer.h
vendor/fuse-emulator/current/fuse/peripherals/scld.c
vendor/fuse-emulator/current/fuse/peripherals/scld.h
vendor/fuse-emulator/current/fuse/peripherals/speccyboot.c
vendor/fuse-emulator/current/fuse/peripherals/speccyboot.h
vendor/fuse-emulator/current/fuse/peripherals/specdrum.c
vendor/fuse-emulator/current/fuse/peripherals/specdrum.h
vendor/fuse-emulator/current/fuse/peripherals/spectranet.c
vendor/fuse-emulator/current/fuse/peripherals/spectranet.h
vendor/fuse-emulator/current/fuse/peripherals/ula.c
vendor/fuse-emulator/current/fuse/peripherals/ula.h
vendor/fuse-emulator/current/fuse/pokefinder/pokefinder.c
vendor/fuse-emulator/current/fuse/pokefinder/pokefinder.h
vendor/fuse-emulator/current/fuse/pokefinder/pokemem.c
vendor/fuse-emulator/current/fuse/pokefinder/pokemem.h
vendor/fuse-emulator/current/fuse/profile.c
vendor/fuse-emulator/current/fuse/profile.h
vendor/fuse-emulator/current/fuse/psg.c
vendor/fuse-emulator/current/fuse/psg.h
vendor/fuse-emulator/current/fuse/rectangle.c
vendor/fuse-emulator/current/fuse/rectangle.h
vendor/fuse-emulator/current/fuse/rzx.c
vendor/fuse-emulator/current/fuse/rzx.h
vendor/fuse-emulator/current/fuse/screenshot.c
vendor/fuse-emulator/current/fuse/screenshot.h
vendor/fuse-emulator/current/fuse/slt.c
vendor/fuse-emulator/current/fuse/slt.h
vendor/fuse-emulator/current/fuse/snapshot.c
vendor/fuse-emulator/current/fuse/snapshot.h
vendor/fuse-emulator/current/fuse/sound/alsasound.c
vendor/fuse-emulator/current/fuse/sound/aosound.c
vendor/fuse-emulator/current/fuse/sound/blipbuffer.c
vendor/fuse-emulator/current/fuse/sound/blipbuffer.h
vendor/fuse-emulator/current/fuse/sound/coreaudiosound.c
vendor/fuse-emulator/current/fuse/sound/dxsound.c
vendor/fuse-emulator/current/fuse/sound/hpsound.c
vendor/fuse-emulator/current/fuse/sound/nullsound.c
vendor/fuse-emulator/current/fuse/sound/osssound.c
vendor/fuse-emulator/current/fuse/sound/sdlsound.c
vendor/fuse-emulator/current/fuse/sound/sfifo.c
vendor/fuse-emulator/current/fuse/sound/sfifo.h
vendor/fuse-emulator/current/fuse/sound/sunsound.c
vendor/fuse-emulator/current/fuse/sound/wiisound.c
vendor/fuse-emulator/current/fuse/sound/win32sound.c
vendor/fuse-emulator/current/fuse/sound.c
vendor/fuse-emulator/current/fuse/sound.h
vendor/fuse-emulator/current/fuse/spectrum.c
vendor/fuse-emulator/current/fuse/spectrum.h
vendor/fuse-emulator/current/fuse/tape.c
vendor/fuse-emulator/current/fuse/tape.h
vendor/fuse-emulator/current/fuse/timer/native.c
vendor/fuse-emulator/current/fuse/timer/sdl.c
vendor/fuse-emulator/current/fuse/timer/timer.c
vendor/fuse-emulator/current/fuse/timer/timer.h
vendor/fuse-emulator/current/fuse/ui/fb/fbdisplay.c
vendor/fuse-emulator/current/fuse/ui/fb/fbdisplay.h
vendor/fuse-emulator/current/fuse/ui/fb/fbjoystick.c
vendor/fuse-emulator/current/fuse/ui/fb/fbkeyboard.c
vendor/fuse-emulator/current/fuse/ui/fb/fbkeyboard.h
vendor/fuse-emulator/current/fuse/ui/fb/fbmouse.c
vendor/fuse-emulator/current/fuse/ui/fb/fbmouse.h
vendor/fuse-emulator/current/fuse/ui/fb/fbui.c
vendor/fuse-emulator/current/fuse/ui/gtk/binary.c
vendor/fuse-emulator/current/fuse/ui/gtk/browse.c
vendor/fuse-emulator/current/fuse/ui/gtk/confirm.c
vendor/fuse-emulator/current/fuse/ui/gtk/debugger.c
vendor/fuse-emulator/current/fuse/ui/gtk/fileselector.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkcompat.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkcompat.h
vendor/fuse-emulator/current/fuse/ui/gtk/gtkdisplay.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkinternals.h
vendor/fuse-emulator/current/fuse/ui/gtk/gtkjoystick.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkkeyboard.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkmouse.c
vendor/fuse-emulator/current/fuse/ui/gtk/gtkui.c
vendor/fuse-emulator/current/fuse/ui/gtk/memory.c
vendor/fuse-emulator/current/fuse/ui/gtk/picture.c
vendor/fuse-emulator/current/fuse/ui/gtk/pixmaps.c
vendor/fuse-emulator/current/fuse/ui/gtk/pokefinder.c
vendor/fuse-emulator/current/fuse/ui/gtk/pokemem.c
vendor/fuse-emulator/current/fuse/ui/gtk/rollback.c
vendor/fuse-emulator/current/fuse/ui/gtk/roms.c
vendor/fuse-emulator/current/fuse/ui/gtk/statusbar.c
vendor/fuse-emulator/current/fuse/ui/gtk/stock.c
vendor/fuse-emulator/current/fuse/ui/scaler/scaler.c
vendor/fuse-emulator/current/fuse/ui/scaler/scaler.h
vendor/fuse-emulator/current/fuse/ui/scaler/scaler_hq2x.c
vendor/fuse-emulator/current/fuse/ui/scaler/scaler_hq3x.c
vendor/fuse-emulator/current/fuse/ui/scaler/scaler_internals.h
vendor/fuse-emulator/current/fuse/ui/scaler/scalers.c
vendor/fuse-emulator/current/fuse/ui/sdl/sdldisplay.c
vendor/fuse-emulator/current/fuse/ui/sdl/sdldisplay.h
vendor/fuse-emulator/current/fuse/ui/sdl/sdljoystick.c
vendor/fuse-emulator/current/fuse/ui/sdl/sdljoystick.h
vendor/fuse-emulator/current/fuse/ui/sdl/sdlkeyboard.c
vendor/fuse-emulator/current/fuse/ui/sdl/sdlkeyboard.h
vendor/fuse-emulator/current/fuse/ui/sdl/sdlui.c
vendor/fuse-emulator/current/fuse/ui/svga/svgadisplay.c
vendor/fuse-emulator/current/fuse/ui/svga/svgadisplay.h
vendor/fuse-emulator/current/fuse/ui/svga/svgajoystick.c
vendor/fuse-emulator/current/fuse/ui/svga/svgakeyboard.c
vendor/fuse-emulator/current/fuse/ui/svga/svgakeyboard.h
vendor/fuse-emulator/current/fuse/ui/svga/svgaui.c
vendor/fuse-emulator/current/fuse/ui/ui.h
vendor/fuse-emulator/current/fuse/ui/uidisplay.h
vendor/fuse-emulator/current/fuse/ui/uijoystick.c
vendor/fuse-emulator/current/fuse/ui/uijoystick.h
vendor/fuse-emulator/current/fuse/ui/widget/browse.c
vendor/fuse-emulator/current/fuse/ui/widget/debugger.c
vendor/fuse-emulator/current/fuse/ui/widget/error.c
vendor/fuse-emulator/current/fuse/ui/widget/filesel.c
vendor/fuse-emulator/current/fuse/ui/widget/memory.c
vendor/fuse-emulator/current/fuse/ui/widget/menu.c
vendor/fuse-emulator/current/fuse/ui/widget/picture.c
vendor/fuse-emulator/current/fuse/ui/widget/pokefinder.c
vendor/fuse-emulator/current/fuse/ui/widget/pokemem.c
vendor/fuse-emulator/current/fuse/ui/widget/query.c
vendor/fuse-emulator/current/fuse/ui/widget/roms.c
vendor/fuse-emulator/current/fuse/ui/widget/select.c
vendor/fuse-emulator/current/fuse/ui/widget/text.c
vendor/fuse-emulator/current/fuse/ui/widget/widget.c
vendor/fuse-emulator/current/fuse/ui/widget/widget.h
vendor/fuse-emulator/current/fuse/ui/widget/widget_internals.h
vendor/fuse-emulator/current/fuse/ui/wii/wiidisplay.c
vendor/fuse-emulator/current/fuse/ui/wii/wiidisplay.h
vendor/fuse-emulator/current/fuse/ui/wii/wiijoystick.c
vendor/fuse-emulator/current/fuse/ui/wii/wiikeyboard.c
vendor/fuse-emulator/current/fuse/ui/wii/wiikeyboard.h
vendor/fuse-emulator/current/fuse/ui/wii/wiikeysyms.h
vendor/fuse-emulator/current/fuse/ui/wii/wiimouse.c
vendor/fuse-emulator/current/fuse/ui/wii/wiimouse.h
vendor/fuse-emulator/current/fuse/ui/wii/wiiui.c
vendor/fuse-emulator/current/fuse/ui/win32/about.c
vendor/fuse-emulator/current/fuse/ui/win32/about.h
vendor/fuse-emulator/current/fuse/ui/win32/binary.c
vendor/fuse-emulator/current/fuse/ui/win32/binary.h
vendor/fuse-emulator/current/fuse/ui/win32/browse.c
vendor/fuse-emulator/current/fuse/ui/win32/browse.h
vendor/fuse-emulator/current/fuse/ui/win32/confirm.c
vendor/fuse-emulator/current/fuse/ui/win32/debugger.c
vendor/fuse-emulator/current/fuse/ui/win32/debugger.h
vendor/fuse-emulator/current/fuse/ui/win32/fileselector.c
vendor/fuse-emulator/current/fuse/ui/win32/hyperlinks.c
vendor/fuse-emulator/current/fuse/ui/win32/hyperlinks.h
vendor/fuse-emulator/current/fuse/ui/win32/memorybrowser.c
vendor/fuse-emulator/current/fuse/ui/win32/memorybrowser.h
vendor/fuse-emulator/current/fuse/ui/win32/picture.c
vendor/fuse-emulator/current/fuse/ui/win32/picture.h
vendor/fuse-emulator/current/fuse/ui/win32/pokefinder.c
vendor/fuse-emulator/current/fuse/ui/win32/pokefinder.h
vendor/fuse-emulator/current/fuse/ui/win32/pokemem.c
vendor/fuse-emulator/current/fuse/ui/win32/pokemem.h
vendor/fuse-emulator/current/fuse/ui/win32/rollback.c
vendor/fuse-emulator/current/fuse/ui/win32/rollback.h
vendor/fuse-emulator/current/fuse/ui/win32/roms.c
vendor/fuse-emulator/current/fuse/ui/win32/roms.h
vendor/fuse-emulator/current/fuse/ui/win32/select_template.h
vendor/fuse-emulator/current/fuse/ui/win32/statusbar.c
vendor/fuse-emulator/current/fuse/ui/win32/win32display.c
vendor/fuse-emulator/current/fuse/ui/win32/win32internals.h
vendor/fuse-emulator/current/fuse/ui/win32/win32joystick.c
vendor/fuse-emulator/current/fuse/ui/win32/win32joystick.h
vendor/fuse-emulator/current/fuse/ui/win32/win32keyboard.c
vendor/fuse-emulator/current/fuse/ui/win32/win32mouse.c
vendor/fuse-emulator/current/fuse/ui/win32/win32ui.c
vendor/fuse-emulator/current/fuse/ui/xlib/xdisplay.c
vendor/fuse-emulator/current/fuse/ui/xlib/xdisplay.h
vendor/fuse-emulator/current/fuse/ui/xlib/xerror.c
vendor/fuse-emulator/current/fuse/ui/xlib/xjoystick.c
vendor/fuse-emulator/current/fuse/ui/xlib/xkeyboard.c
vendor/fuse-emulator/current/fuse/ui/xlib/xkeyboard.h
vendor/fuse-emulator/current/fuse/ui/xlib/xui.c
vendor/fuse-emulator/current/fuse/ui/xlib/xui.h
vendor/fuse-emulator/current/fuse/ui.c
vendor/fuse-emulator/current/fuse/uidisplay.c
vendor/fuse-emulator/current/fuse/unittests/unittests.c
vendor/fuse-emulator/current/fuse/unittests/unittests.h
vendor/fuse-emulator/current/fuse/utils.c
vendor/fuse-emulator/current/fuse/utils.h
vendor/fuse-emulator/current/fuse/z80/coretest.c
vendor/fuse-emulator/current/fuse/z80/z80.c
vendor/fuse-emulator/current/fuse/z80/z80.h
vendor/fuse-emulator/current/fuse/z80/z80_checks.h
vendor/fuse-emulator/current/fuse/z80/z80_macros.h
vendor/fuse-emulator/current/fuse/z80/z80_ops.c
vendor/fuse-emulator/current/libspectrum/bzip2.c
vendor/fuse-emulator/current/libspectrum/creator.c
vendor/fuse-emulator/current/libspectrum/crypto.c
vendor/fuse-emulator/current/libspectrum/csw.c
vendor/fuse-emulator/current/libspectrum/dck.c
vendor/fuse-emulator/current/libspectrum/dll.c
vendor/fuse-emulator/current/libspectrum/ide.c
vendor/fuse-emulator/current/libspectrum/internals.h
vendor/fuse-emulator/current/libspectrum/libspectrum.c
vendor/fuse-emulator/current/libspectrum/make-perl.c
vendor/fuse-emulator/current/libspectrum/memory.c
vendor/fuse-emulator/current/libspectrum/microdrive.c
vendor/fuse-emulator/current/libspectrum/myglib/garray.c
vendor/fuse-emulator/current/libspectrum/myglib/ghash.c
vendor/fuse-emulator/current/libspectrum/myglib/gslist.c
vendor/fuse-emulator/current/libspectrum/plusd.c
vendor/fuse-emulator/current/libspectrum/pzx_read.c
vendor/fuse-emulator/current/libspectrum/rzx.c
vendor/fuse-emulator/current/libspectrum/sna.c
vendor/fuse-emulator/current/libspectrum/snapshot.c
vendor/fuse-emulator/current/libspectrum/snp.c
vendor/fuse-emulator/current/libspectrum/sp.c
vendor/fuse-emulator/current/libspectrum/symbol_table.c
vendor/fuse-emulator/current/libspectrum/szx.c
vendor/fuse-emulator/current/libspectrum/tap.c
vendor/fuse-emulator/current/libspectrum/tape.c
vendor/fuse-emulator/current/libspectrum/tape_block.c
vendor/fuse-emulator/current/libspectrum/tape_block.h
vendor/fuse-emulator/current/libspectrum/test/edges.c
vendor/fuse-emulator/current/libspectrum/test/test.c
vendor/fuse-emulator/current/libspectrum/test/test.h
vendor/fuse-emulator/current/libspectrum/test/test15.c
vendor/fuse-emulator/current/libspectrum/timings.c
vendor/fuse-emulator/current/libspectrum/tzx_read.c
vendor/fuse-emulator/current/libspectrum/tzx_write.c
vendor/fuse-emulator/current/libspectrum/utilities.c
vendor/fuse-emulator/current/libspectrum/warajevo_read.c
vendor/fuse-emulator/current/libspectrum/wav.c
vendor/fuse-emulator/current/libspectrum/z80.c
vendor/fuse-emulator/current/libspectrum/z80em.c
vendor/fuse-emulator/current/libspectrum/zlib.c
vendor/fuse-emulator/current/libspectrum/zxs.c
Modified: vendor/fuse-emulator/current/fuse/bitmap.h
===================================================================
--- vendor/fuse-emulator/current/fuse/bitmap.h 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/bitmap.h 2016-05-24 14:16:36 UTC (rev 796)
@@ -1,7 +1,7 @@
/* bitmap.h: Bitmap routines
Copyright (c) 2007 Stuart Brady
- $Id: bitmap.h 4343 2011-04-04 19:32:23Z zubzero $
+ $Id$
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Property changes on: vendor/fuse-emulator/current/fuse/bitmap.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: vendor/fuse-emulator/current/fuse/compat/amiga/osname.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/amiga/osname.c 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/compat/amiga/osname.c 2016-05-24 14:16:36 UTC (rev 796)
@@ -1,7 +1,7 @@
/* osname.c: Get a representation of the OS we're running on
Copyright (c) 1999-2007 Philip Kendall
- $Id: osname.c 3578 2008-03-22 20:51:36Z zubzero $
+ $Id$
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Property changes on: vendor/fuse-emulator/current/fuse/compat/amiga/osname.c
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: vendor/fuse-emulator/current/fuse/compat/amiga/paths.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/amiga/paths.c 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/compat/amiga/paths.c 2016-05-24 14:16:36 UTC (rev 796)
@@ -1,7 +1,7 @@
/* paths.c: Path-related compatibility routines
Copyright (c) 1999-2012 Philip Kendall
- $Id: paths.c 4738 2012-10-03 13:15:31Z fredm $
+ $Id$
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Property changes on: vendor/fuse-emulator/current/fuse/compat/amiga/paths.c
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/compat/dirname.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/dirname.c 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/compat/dirname.c 2016-05-24 14:16:36 UTC (rev 796)
Property changes on: vendor/fuse-emulator/current/fuse/compat/dirname.c
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/compat/getopt.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/getopt.c 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/compat/getopt.c 2016-05-24 14:16:36 UTC (rev 796)
Property changes on: vendor/fuse-emulator/current/fuse/compat/getopt.c
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/compat/getopt.h
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/getopt.h 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/compat/getopt.h 2016-05-24 14:16:36 UTC (rev 796)
Property changes on: vendor/fuse-emulator/current/fuse/compat/getopt.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/compat/getopt1.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/getopt1.c 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/compat/getopt1.c 2016-05-24 14:16:36 UTC (rev 796)
Property changes on: vendor/fuse-emulator/current/fuse/compat/getopt1.c
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: vendor/fuse-emulator/current/fuse/compat/linux/paths.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/linux/paths.c 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/compat/linux/paths.c 2016-05-24 14:16:36 UTC (rev 796)
@@ -1,7 +1,7 @@
/* paths.c: Path-related compatibility routines
Copyright (c) 2012 Philip Kendall
- $Id: paths.c 4739 2012-10-10 12:14:56Z fredm $
+ $Id$
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Property changes on: vendor/fuse-emulator/current/fuse/compat/linux/paths.c
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: vendor/fuse-emulator/current/fuse/compat/mkstemp.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/mkstemp.c 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/compat/mkstemp.c 2016-05-24 14:16:36 UTC (rev 796)
Property changes on: vendor/fuse-emulator/current/fuse/compat/mkstemp.c
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: vendor/fuse-emulator/current/fuse/compat/morphos/osname.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/morphos/osname.c 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/compat/morphos/osname.c 2016-05-24 14:16:36 UTC (rev 796)
@@ -1,7 +1,7 @@
/* osname.c: Get a representation of the OS we're running on
Copyright (c) 1999-2007 Philip Kendall
- $Id: osname.c 3922 2008-12-31 19:01:31Z zubzero $
+ $Id$
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Property changes on: vendor/fuse-emulator/current/fuse/compat/morphos/osname.c
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: vendor/fuse-emulator/current/fuse/compat/unix/dir.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/dir.c 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/compat/unix/dir.c 2016-05-24 14:16:36 UTC (rev 796)
@@ -1,7 +1,7 @@
/* dir.c: Directory-related compatibility routines
Copyright (c) 2009 Philip Kendall
- $Id: dir.c 3945 2009-01-10 18:44:42Z zubzero $
+ $Id$
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Property changes on: vendor/fuse-emulator/current/fuse/compat/unix/dir.c
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: vendor/fuse-emulator/current/fuse/compat/unix/file.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/file.c 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/compat/unix/file.c 2016-05-24 14:16:36 UTC (rev 796)
@@ -1,7 +1,7 @@
/* file.c: File-related compatibility routines
Copyright (c) 2008 Philip Kendall
- $Id: file.c 4624 2012-01-09 20:59:35Z pak21 $
+ $Id$
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Property changes on: vendor/fuse-emulator/current/fuse/compat/unix/file.c
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: vendor/fuse-emulator/current/fuse/compat/unix/osname.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/osname.c 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/compat/unix/osname.c 2016-05-24 14:16:36 UTC (rev 796)
@@ -1,7 +1,7 @@
/* osname.c: Get a representation of the OS we're running on
Copyright (c) 1999-2007 Philip Kendall
- $Id: osname.c 3922 2008-12-31 19:01:31Z zubzero $
+ $Id$
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Property changes on: vendor/fuse-emulator/current/fuse/compat/unix/osname.c
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: vendor/fuse-emulator/current/fuse/compat/unix/paths.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/paths.c 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/compat/unix/paths.c 2016-05-24 14:16:36 UTC (rev 796)
@@ -1,7 +1,7 @@
/* paths.c: Path-related compatibility routines
Copyright (c) 1999-2012 Philip Kendall
- $Id: paths.c 4738 2012-10-03 13:15:31Z fredm $
+ $Id$
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Property changes on: vendor/fuse-emulator/current/fuse/compat/unix/paths.c
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: vendor/fuse-emulator/current/fuse/compat/unix/socket.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/socket.c 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/compat/unix/socket.c 2016-05-24 14:16:36 UTC (rev 796)
@@ -1,7 +1,7 @@
/* socket.c: Socket-related compatibility routines
Copyright (c) 2011-2012 Philip Kendall
- $Id: socket.c 4828 2012-12-30 19:43:37Z pak21 $
+ $Id$
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Property changes on: vendor/fuse-emulator/current/fuse/compat/unix/socket.c
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: vendor/fuse-emulator/current/fuse/compat/unix/timer.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/timer.c 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/compat/unix/timer.c 2016-05-24 14:16:36 UTC (rev 796)
@@ -1,7 +1,7 @@
/* timer.c: UNIX speed routines for Fuse
Copyright (c) 1999-2008 Philip Kendall, Marek Januszewski, Fredrick Meunier
- $Id: timer.c 3982 2009-02-11 12:00:22Z fredm $
+ $Id$
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Property changes on: vendor/fuse-emulator/current/fuse/compat/unix/timer.c
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: vendor/fuse-emulator/current/fuse/compat/unix/tuntap.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/unix/tuntap.c 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/compat/unix/tuntap.c 2016-05-24 14:16:36 UTC (rev 796)
@@ -1,7 +1,7 @@
/* tuntap.c: TUN/TAP compatability layer
Copyright (c) 2009-2010 Patrik Persson, Philip Kendall
- $Id: tuntap.c 4898 2013-02-25 22:20:54Z pak21 $
+ $Id$
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Property changes on: vendor/fuse-emulator/current/fuse/compat/unix/tuntap.c
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: vendor/fuse-emulator/current/fuse/compat/wii/dir.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/wii/dir.c 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/compat/wii/dir.c 2016-05-24 14:16:36 UTC (rev 796)
@@ -1,7 +1,7 @@
/* dir.c: Directory-related compatibility routines
Copyright (c) 2009 Philip Kendall
- $Id: dir.c 3945 2009-01-10 18:44:42Z zubzero $
+ $Id$
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Property changes on: vendor/fuse-emulator/current/fuse/compat/wii/dir.c
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: vendor/fuse-emulator/current/fuse/compat/wii/osname.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/wii/osname.c 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/compat/wii/osname.c 2016-05-24 14:16:36 UTC (rev 796)
@@ -1,7 +1,7 @@
/* osname.c: Get a representation of the OS we're running on
Copyright (c) 1999-2009 Philip Kendall, Bjoern Giesler
- $Id: osname.c 3945 2009-01-10 18:44:42Z zubzero $
+ $Id$
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Property changes on: vendor/fuse-emulator/current/fuse/compat/wii/osname.c
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: vendor/fuse-emulator/current/fuse/compat/wii/paths.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/wii/paths.c 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/compat/wii/paths.c 2016-05-24 14:16:36 UTC (rev 796)
@@ -1,7 +1,7 @@
/* paths.c: Path-related compatibility routines
Copyright (c) 1999-2012 Philip Kendall, Bjoern Giesler
- $Id: paths.c 4738 2012-10-03 13:15:31Z fredm $
+ $Id$
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Property changes on: vendor/fuse-emulator/current/fuse/compat/wii/paths.c
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: vendor/fuse-emulator/current/fuse/compat/wii/timer.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/wii/timer.c 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/compat/wii/timer.c 2016-05-24 14:16:36 UTC (rev 796)
@@ -1,7 +1,7 @@
/* unix.c: UNIX speed routines for Fuse
Copyright (c) 1999-2007 Philip Kendall, Marek Januszewski, Fredrick Meunier
- $Id: timer.c 3944 2009-01-10 18:17:04Z pak21 $
+ $Id$
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Property changes on: vendor/fuse-emulator/current/fuse/compat/wii/timer.c
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: vendor/fuse-emulator/current/fuse/compat/win32/osname.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/win32/osname.c 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/compat/win32/osname.c 2016-05-24 14:16:36 UTC (rev 796)
@@ -1,7 +1,7 @@
/* osname.c: Get a representation of the OS we're running on
Copyright (c) 1999-2007 Philip Kendall
- $Id: osname.c 3922 2008-12-31 19:01:31Z zubzero $
+ $Id$
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Property changes on: vendor/fuse-emulator/current/fuse/compat/win32/osname.c
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: vendor/fuse-emulator/current/fuse/compat/win32/paths.c
===================================================================
--- vendor/fuse-emulator/current/fuse/compat/win32/paths.c 2016-05-24 14:04:16 UTC (rev 795)
+++ vendor/fuse-emulator/current/fuse/compat/win32/paths.c 2016-05-24 14:16:36 UTC (rev 796)
@@ -1,7 +1,7 @@
/* paths.c: Path-related compatibility routines
Copyright (c) 1999-2012 Philip Kendall
- $Id: paths.c 4882 2013-02-15 23:47:37Z sbaldovi $
+ $Id$
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Property changes on: vendor/fuse-emulator/current/fuse/compat/win32/paths.c
__________...
[truncated message content] |
|
From: <fr...@us...> - 2016-05-24 14:04:18
|
Revision: 795
http://sourceforge.net/p/fuse-for-macosx/code/795
Author: fredm
Date: 2016-05-24 14:04:16 +0000 (Tue, 24 May 2016)
Log Message:
-----------
To prepare to load . into vendor/fuse-emulator/current, perform 3
renames.
* vendor/fuse-emulator/current/fuse/data/win32/fuse.manifest.in:
Renamed from
vendor/fuse-emulator/current/fuse/ui/win32/fuse.manifest.in.
* vendor/fuse-emulator/current/fuse/data/win32/installer.nsi.in:
Renamed from
vendor/fuse-emulator/current/fuse/ui/win32/installer/fuse.nsi.in.
* vendor/fuse-emulator/current/fuse/data/win32/winfuse.ico: Renamed
from vendor/fuse-emulator/current/fuse/winfuse.ico.
Added Paths:
-----------
vendor/fuse-emulator/current/fuse/data/win32/
vendor/fuse-emulator/current/fuse/data/win32/fuse.manifest.in
vendor/fuse-emulator/current/fuse/data/win32/installer.nsi.in
vendor/fuse-emulator/current/fuse/data/win32/winfuse.ico
Removed Paths:
-------------
vendor/fuse-emulator/current/fuse/ui/win32/fuse.manifest.in
vendor/fuse-emulator/current/fuse/ui/win32/installer/fuse.nsi.in
vendor/fuse-emulator/current/fuse/winfuse.ico
Copied: vendor/fuse-emulator/current/fuse/data/win32/fuse.manifest.in (from rev 794, vendor/fuse-emulator/current/fuse/ui/win32/fuse.manifest.in)
===================================================================
--- vendor/fuse-emulator/current/fuse/data/win32/fuse.manifest.in (rev 0)
+++ vendor/fuse-emulator/current/fuse/data/win32/fuse.manifest.in 2016-05-24 14:04:16 UTC (rev 795)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity
+ version="@FUSE_FULL_VERSION@"
+ processorArchitecture="*"
+ name="fuse.exe"
+ type="win32"
+/>
+<description>Fuse (Free Unix Spectrum Emulator)</description>
+<dependency>
+ <dependentAssembly>
+ <assemblyIdentity
+ type="win32"
+ name="Microsoft.Windows.Common-Controls"
+ version="6.0.0.0"
+ processorArchitecture="*"
+ publicKeyToken="6595b64144ccf1df"
+ language="*"
+ />
+ </dependentAssembly>
+</dependency>
+</assembly>
Copied: vendor/fuse-emulator/current/fuse/data/win32/installer.nsi.in (from rev 794, vendor/fuse-emulator/current/fuse/ui/win32/installer/fuse.nsi.in)
===================================================================
--- vendor/fuse-emulator/current/fuse/data/win32/installer.nsi.in (rev 0)
+++ vendor/fuse-emulator/current/fuse/data/win32/installer.nsi.in 2016-05-24 14:04:16 UTC (rev 795)
@@ -0,0 +1,384 @@
+## NSIS (nsis.sf.net) script to produce installer for win32 platform
+## Copyright (c) 2009 Marek Januszewski
+
+## $Id: fuse.nsi.in 5010 2013-05-31 18:32:45Z sbaldovi $
+
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License along
+## with this program; if not, write to the Free Software Foundation, Inc.,
+## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+##
+## Author contact information:
+##
+## E-mail: phi...@sh...
+
+!define FUSE_VERSION "@PACKAGE_VERSION@" ; could have letters like -RC1
+!define FUSE_FULL_VERSION "@FUSE_FULL_VERSION@" ; must have four numeric tokens
+!define DISPLAY_NAME "Free Unix Spectrum Emulator (Fuse) ${FUSE_VERSION}"
+!define SETUP_FILENAME "@PACKAGE@-${FUSE_VERSION}-win32-setup"
+!define SETUP_FILE "${SETUP_FILENAME}.exe"
+!define HKLM_REG_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\Fuse"
+!define PROG_ID "Fuse.Files.1"
+
+;Include Modern UI
+!include "MUI2.nsh"
+!include "Sections.nsh"
+!include "Util.nsh"
+
+;--------------------------------
+;General
+
+Name "${DISPLAY_NAME}"
+outFile "${SETUP_FILE}"
+Caption "${DISPLAY_NAME}"
+
+installDir "$PROGRAMFILES\Fuse"
+
+; [Additional Installer Settings ]
+XPStyle on
+SetCompress force
+SetCompressor lzma
+
+;--------------------------------
+;Interface Settings
+
+ !define MUI_ABORTWARNING
+
+;--------------------------------
+;Pages
+
+ !insertmacro MUI_PAGE_LICENSE "COPYING.txt"
+ !define MUI_COMPONENTSPAGE_SMALLDESC
+ !insertmacro MUI_PAGE_COMPONENTS
+ !insertmacro MUI_PAGE_DIRECTORY
+ !insertmacro MUI_PAGE_INSTFILES
+ !define MUI_FINISHPAGE_RUN "$INSTDIR\fuse.exe"
+ !define MUI_FINISHPAGE_NOREBOOTSUPPORT
+ !insertmacro MUI_PAGE_FINISH
+
+ !insertmacro MUI_UNPAGE_CONFIRM
+ !insertmacro MUI_UNPAGE_INSTFILES
+ !define MUI_FINISHPAGE_SHOWREADME_CHECKED
+ !define MUI_FINISHPAGE_SHOWREADME ""
+ !define MUI_FINISHPAGE_SHOWREADME_TEXT "Delete configuration file"
+ !define MUI_FINISHPAGE_SHOWREADME_FUNCTION un.DeleteConfigFile
+ !insertmacro MUI_UNPAGE_FINISH
+
+;--------------------------------
+;Languages
+
+ !insertmacro MUI_LANGUAGE "English"
+
+;--------------------------------
+;Version Information
+
+ VIProductVersion ${FUSE_FULL_VERSION}
+ VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" ""
+ VIAddVersionKey /LANG=${LANG_ENGLISH} "InternalName" "${SETUP_FILENAME}"
+ VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "@FUSE_COPYRIGHT@"
+ VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "Fuse"
+ VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${FUSE_VERSION}"
+ VIAddVersionKey /LANG=${LANG_ENGLISH} "OriginalFilename" "${SETUP_FILE}"
+ VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "Fuse - the Free Unix Spectrum Emulator"
+ VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "${FUSE_VERSION}"
+
+;--------------------------------
+;File association functions
+
+!macro SelectUnregisteredExtCall _EXTENSION _SECTION
+ Push `${_EXTENSION}`
+ Push `${_SECTION}`
+ ${CallArtificialFunction} SelectUnregisteredExt_
+!macroend
+
+!macro NewSecExtensionCall _EXTENSION _DESCRIPTION
+ Section /o "${_DESCRIPTION} File" SEC_${_DESCRIPTION}
+ ${registerExtension} "${_EXTENSION}"
+ SectionEnd
+!macroend
+
+!macro RegisterExtensionCall _EXTENSION
+ Push `${_EXTENSION}`
+ ${CallArtificialFunction} RegisterExtension_
+!macroend
+
+!macro UnRegisterExtensionCall _EXTENSION
+ Push "${_EXTENSION}"
+ ${CallArtificialFunction} UnRegisterExtension_
+!macroend
+
+!macro SelectUnregisteredExt_
+ Exch $R1 ;section
+ Exch
+ Exch $R0 ;extension
+ Exch
+ Push $0
+
+ ReadRegStr $0 HKLM "Software\Classes\$R0" ""
+ ;Select if already associated with FUSE, i.e., reinstallation
+ StrCmp $0 "${PROG_ID}" Select 0
+ ;Select if available
+ StrCmp $0 "" Select NoSelect
+
+Select:
+ !insertmacro SelectSection $R1
+
+NoSelect:
+ Pop $0
+ Pop $R1
+ Pop $R0
+!macroend
+
+!macro RegisterExtension_
+ Exch $R0 ;extension
+ Push $0
+
+ ; Recommend Fuse in the Open With list
+ WriteRegStr HKLM "Software\Classes\$R0\OpenWithProgids" "${PROG_ID}" ""
+
+ ; Read global file association
+ ReadRegStr $0 HKLM "Software\Classes\$R0" ""
+ StrCmp "$0" "" NoBackup ; is it empty
+ StrCmp "$0" "${PROG_ID}" NoBackup ; is it our own
+ ; Backup current value
+ WriteRegStr HKLM "Software\Classes\$R0" "backup_val" "$0"
+
+NoBackup:
+ ; Set global file association
+ WriteRegStr HKLM "Software\Classes\$R0" "" "${PROG_ID}"
+
+ ; Set current user (custom) file association
+ ReadRegStr $0 HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\$R0" "Progid"
+ StrCmp "$0" "" NoLocalBackup ; is it empty
+ StrCmp "$0" "${PROG_ID}" NoLocalBackup ; is it our own
+ WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\$R0" "backup_val" "$0"
+ WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\$R0" "Progid" "${PROG_ID}"
+
+NoLocalBackup:
+ Pop $0
+ Pop $R0
+!macroend
+
+!macro UnRegisterExtension_
+ Exch $R0 ;extension
+ Push $0
+
+ ; Unregister OpenWith recommendation
+ DeleteRegValue HKLM "Software\Classes\$R0\OpenWithProgids" "${PROG_ID}"
+
+ ; Try to delete current file association
+ ReadRegStr $0 HKLM "Software\Classes\$R0" ""
+ StrCmp $0 ${PROG_ID} 0 NoOwn ; only do this if we own it
+ ReadRegStr $0 HKLM "Software\Classes\$R0" "backup_val"
+ StrCmp $0 "" 0 Restore ; if backup="" then delete the whole key
+ DeleteRegKey HKLM "Software\Classes\$R0"
+ Goto NoOwn
+
+Restore:
+ WriteRegStr HKLM "Software\Classes\$R0" "" $0
+ DeleteRegValue HKLM "Software\Classes\$R0" "backup_val"
+
+NoOwn:
+ ; Delete programmatic identifier
+ DeleteRegKey HKLM "Software\Classes\${PROG_ID}";
+
+ ; Delete current user (custom) file association
+ ReadRegStr $0 HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\$R0" "Progid"
+ StrCmp "$0" "" NoLocalRestore ; is it empty
+ StrCmp "$0" "${PROG_ID}" 0 NoLocalRestore ; is it our own
+ ReadRegStr $0 HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\$R0" "backup_val"
+ StrCmp "$0" "" 0 +2 ; if no backup -> delete
+ DeleteRegKey HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\$R0"
+ WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\$R0" "Progid" "$0"
+ DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\$R0" "backup_val"
+
+NoLocalRestore:
+ Pop $0
+ Pop $R0
+!macroend
+
+!define NewSecExtension `!insertmacro NewSecExtensionCall`
+!define SelectUnregisteredExt `!insertmacro SelectUnregisteredExtCall`
+!define RegisterExtension `!insertmacro RegisterExtensionCall`
+!define UnRegisterExtension `!insertmacro UnRegisterExtensionCall`
+
+;--------------------------------
+; Uninstall previous version
+
+ Section "" SecUninstallPrevious
+
+ Push $R0
+ ReadRegStr $R0 HKLM "${HKLM_REG_KEY}" "UninstallString"
+
+ ; Check if we are upgrading a previous installation
+ ${If} $R0 == '"$INSTDIR\uninstall.exe"'
+ DetailPrint "Removing previous installation..."
+
+ ; Run the uninstaller silently
+ ExecWait '"$INSTDIR\uninstall.exe" /S _?=$INSTDIR'
+ ${EndIf}
+
+ Pop $R0
+
+SectionEnd
+
+;--------------------------------
+; start default section
+
+section "!Fuse Core Files (required)" SecCore
+
+ SectionIn RO
+ DetailPrint "Installing Fuse Core Files..."
+
+ ; set the installation directory as the destination for the following actions
+ setOutPath "$INSTDIR"
+
+ ; Installation files
+ File "AUTHORS.txt"
+ File "ChangeLog.txt"
+ File "COPYING.txt"
+ File "fuse.exe"
+ File "fuse.html"
+ File "README.txt"
+ File /nonfatal "README-win32.txt"
+ File "*.dll"
+ SetOutPath $INSTDIR\lib
+ File "lib\*"
+ SetOutPath "$INSTDIR\roms"
+ File "roms\*"
+
+ ; create the uninstaller
+ writeUninstaller "$INSTDIR\uninstall.exe"
+
+ ; Write the uninstall keys for Windows
+ WriteRegStr HKLM "${HKLM_REG_KEY}" "DisplayName" "${DISPLAY_NAME}"
+ WriteRegStr HKLM "${HKLM_REG_KEY}" "DisplayVersion" "${FUSE_VERSION}"
+ WriteRegStr HKLM "${HKLM_REG_KEY}" "HelpLink" "@PACKAGE_URL@"
+ WriteRegStr HKLM "${HKLM_REG_KEY}" "UninstallString" '"$INSTDIR\uninstall.exe"'
+ WriteRegDWORD HKLM "${HKLM_REG_KEY}" "NoModify" 1
+ WriteRegDWORD HKLM "${HKLM_REG_KEY}" "NoRepair" 1
+
+sectionEnd
+
+;--------------------------------
+; Create shortcuts
+
+section "Start Menu and Desktop links" SecShortcuts
+
+ DetailPrint "Creating Shortcuts..."
+ CreateDirectory "$SMPROGRAMS\Fuse"
+ CreateShortCut "$SMPROGRAMS\Fuse\Fuse.lnk" "$INSTDIR\fuse.exe"
+ CreateShortCut "$SMPROGRAMS\Fuse\Manual.lnk" "$INSTDIR\fuse.html"
+ CreateShortCut "$SMPROGRAMS\Fuse\Readme.lnk" "$INSTDIR\README.txt"
+ CreateShortCut "$SMPROGRAMS\Fuse\Uninstall.lnk" "$INSTDIR\uninstall.exe"
+ CreateShortCut "$DESKTOP\Fuse.lnk" "$INSTDIR\fuse.exe"
+
+sectionEnd
+
+;--------------------------------
+; Register common file extensions
+
+SectionGroup /e "Register File Extensions" SecFileExt
+ ${NewSecExtension} ".pzx" "PZX"
+ ${NewSecExtension} ".rzx" "RZX"
+ ${NewSecExtension} ".sna" "SNA"
+ ${NewSecExtension} ".szx" "SZX"
+ ${NewSecExtension} ".tap" "TAP"
+ ${NewSecExtension} ".tzx" "TZX"
+ ${NewSecExtension} ".z80" "Z80"
+SectionGroupEnd
+
+Section "-Register Application"
+ WriteRegStr HKLM "Software\Classes\${PROG_ID}\shell" "" "open"
+ WriteRegStr HKLM "Software\Classes\${PROG_ID}\DefaultIcon" "" "$INSTDIR\fuse.exe,0"
+ WriteRegStr HKLM "Software\Classes\${PROG_ID}\shell\open\command" "" '"$INSTDIR\fuse.exe" "%1"'
+ WriteRegStr HKLM "Software\Classes\Applications\fuse.exe" "NoOpenWith" ""
+
+ System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
+SectionEnd
+
+Function .onInit
+ ; Select extensions not associated with other applications
+ ${SelectUnregisteredExt} ".pzx" ${SEC_PZX}
+ ${SelectUnregisteredExt} ".rzx" ${SEC_RZX}
+ ${SelectUnregisteredExt} ".sna" ${SEC_SNA}
+ ${SelectUnregisteredExt} ".szx" ${SEC_SZX}
+ ${SelectUnregisteredExt} ".tap" ${SEC_TAP}
+ ${SelectUnregisteredExt} ".tzx" ${SEC_TZX}
+ ${SelectUnregisteredExt} ".z80" ${SEC_Z80}
+FunctionEnd
+
+;--------------------------------
+; uninstaller section start
+
+section "uninstall"
+
+ ; Unregister file extensions association (if owned)
+ DetailPrint "Deleting Registry Keys..."
+ ${unregisterExtension} ".pzx"
+ ${unregisterExtension} ".rzx"
+ ${unregisterExtension} ".sna"
+ ${unregisterExtension} ".szx"
+ ${unregisterExtension} ".tap"
+ ${unregisterExtension} ".tzx"
+ ${unregisterExtension} ".z80"
+
+ ; Unregister Application
+ DeleteRegKey HKLM "Software\Classes\${PROG_ID}"
+ DeleteRegKey HKLM "Software\Classes\Applications\fuse.exe"
+
+ System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
+
+ ; Delete the links
+ DetailPrint "Deleting Shortcuts..."
+ Delete "$SMPROGRAMS\Fuse\Fuse.lnk"
+ Delete "$SMPROGRAMS\Fuse\Manual.lnk"
+ Delete "$SMPROGRAMS\Fuse\Readme.lnk"
+ Delete "$SMPROGRAMS\Fuse\Uninstall.lnk"
+ RMDir "$SMPROGRAMS\Fuse"
+ Delete "$DESKTOP\Fuse.lnk"
+
+ ; Installation files
+ DetailPrint "Deleting Files..."
+ Delete "$INSTDIR\lib\*"
+ RMDir "$INSTDIR\lib"
+ Delete "$INSTDIR\roms\*"
+ RMDir "$INSTDIR\roms"
+ Delete "$INSTDIR\AUTHORS.txt"
+ Delete "$INSTDIR\ChangeLog.txt"
+ Delete "$INSTDIR\COPYING.txt"
+ Delete "$INSTDIR\fuse.exe"
+ Delete "$INSTDIR\fuse.html"
+ Delete "$INSTDIR\README.txt"
+ Delete "$INSTDIR\README-win32.txt"
+ Delete "$INSTDIR\*.dll"
+ RMDir "$INSTDIR"
+
+ ; Delete the uninstaller and remove the uninstall keys for Windows
+ DetailPrint "Deleting Uninstaller..."
+ Delete "$INSTDIR\uninstall.exe"
+ DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Fuse"
+
+sectionEnd
+
+Function un.DeleteConfigFile
+ Delete "$PROFILE\fuse.cfg"
+FunctionEnd
+
+;--------------------------------
+;Descriptions
+
+!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "The core files required to use Fuse (program, libraries, ROMs, etc.)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecShortcuts} "Adds icons to your start menu and your desktop for easy access"
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecFileExt} "Register common file extensions with Fuse: pzx, rzx, sna, szx, tap, tzx and z80"
+!insertmacro MUI_FUNCTION_DESCRIPTION_END
Copied: vendor/fuse-emulator/current/fuse/data/win32/winfuse.ico (from rev 794, vendor/fuse-emulator/current/fuse/winfuse.ico)
===================================================================
(Binary files differ)
Deleted: vendor/fuse-emulator/current/fuse/ui/win32/fuse.manifest.in
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/win32/fuse.manifest.in 2016-05-24 11:04:28 UTC (rev 794)
+++ vendor/fuse-emulator/current/fuse/ui/win32/fuse.manifest.in 2016-05-24 14:04:16 UTC (rev 795)
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<assemblyIdentity
- version="@FUSE_FULL_VERSION@"
- processorArchitecture="*"
- name="fuse.exe"
- type="win32"
-/>
-<description>Fuse (Free Unix Spectrum Emulator)</description>
-<dependency>
- <dependentAssembly>
- <assemblyIdentity
- type="win32"
- name="Microsoft.Windows.Common-Controls"
- version="6.0.0.0"
- processorArchitecture="*"
- publicKeyToken="6595b64144ccf1df"
- language="*"
- />
- </dependentAssembly>
-</dependency>
-</assembly>
Deleted: vendor/fuse-emulator/current/fuse/ui/win32/installer/fuse.nsi.in
===================================================================
--- vendor/fuse-emulator/current/fuse/ui/win32/installer/fuse.nsi.in 2016-05-24 11:04:28 UTC (rev 794)
+++ vendor/fuse-emulator/current/fuse/ui/win32/installer/fuse.nsi.in 2016-05-24 14:04:16 UTC (rev 795)
@@ -1,384 +0,0 @@
-## NSIS (nsis.sf.net) script to produce installer for win32 platform
-## Copyright (c) 2009 Marek Januszewski
-
-## $Id: fuse.nsi.in 5010 2013-05-31 18:32:45Z sbaldovi $
-
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License along
-## with this program; if not, write to the Free Software Foundation, Inc.,
-## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-##
-## Author contact information:
-##
-## E-mail: phi...@sh...
-
-!define FUSE_VERSION "@PACKAGE_VERSION@" ; could have letters like -RC1
-!define FUSE_FULL_VERSION "@FUSE_FULL_VERSION@" ; must have four numeric tokens
-!define DISPLAY_NAME "Free Unix Spectrum Emulator (Fuse) ${FUSE_VERSION}"
-!define SETUP_FILENAME "@PACKAGE@-${FUSE_VERSION}-win32-setup"
-!define SETUP_FILE "${SETUP_FILENAME}.exe"
-!define HKLM_REG_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\Fuse"
-!define PROG_ID "Fuse.Files.1"
-
-;Include Modern UI
-!include "MUI2.nsh"
-!include "Sections.nsh"
-!include "Util.nsh"
-
-;--------------------------------
-;General
-
-Name "${DISPLAY_NAME}"
-outFile "${SETUP_FILE}"
-Caption "${DISPLAY_NAME}"
-
-installDir "$PROGRAMFILES\Fuse"
-
-; [Additional Installer Settings ]
-XPStyle on
-SetCompress force
-SetCompressor lzma
-
-;--------------------------------
-;Interface Settings
-
- !define MUI_ABORTWARNING
-
-;--------------------------------
-;Pages
-
- !insertmacro MUI_PAGE_LICENSE "COPYING.txt"
- !define MUI_COMPONENTSPAGE_SMALLDESC
- !insertmacro MUI_PAGE_COMPONENTS
- !insertmacro MUI_PAGE_DIRECTORY
- !insertmacro MUI_PAGE_INSTFILES
- !define MUI_FINISHPAGE_RUN "$INSTDIR\fuse.exe"
- !define MUI_FINISHPAGE_NOREBOOTSUPPORT
- !insertmacro MUI_PAGE_FINISH
-
- !insertmacro MUI_UNPAGE_CONFIRM
- !insertmacro MUI_UNPAGE_INSTFILES
- !define MUI_FINISHPAGE_SHOWREADME_CHECKED
- !define MUI_FINISHPAGE_SHOWREADME ""
- !define MUI_FINISHPAGE_SHOWREADME_TEXT "Delete configuration file"
- !define MUI_FINISHPAGE_SHOWREADME_FUNCTION un.DeleteConfigFile
- !insertmacro MUI_UNPAGE_FINISH
-
-;--------------------------------
-;Languages
-
- !insertmacro MUI_LANGUAGE "English"
-
-;--------------------------------
-;Version Information
-
- VIProductVersion ${FUSE_FULL_VERSION}
- VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" ""
- VIAddVersionKey /LANG=${LANG_ENGLISH} "InternalName" "${SETUP_FILENAME}"
- VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "@FUSE_COPYRIGHT@"
- VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "Fuse"
- VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${FUSE_VERSION}"
- VIAddVersionKey /LANG=${LANG_ENGLISH} "OriginalFilename" "${SETUP_FILE}"
- VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "Fuse - the Free Unix Spectrum Emulator"
- VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "${FUSE_VERSION}"
-
-;--------------------------------
-;File association functions
-
-!macro SelectUnregisteredExtCall _EXTENSION _SECTION
- Push `${_EXTENSION}`
- Push `${_SECTION}`
- ${CallArtificialFunction} SelectUnregisteredExt_
-!macroend
-
-!macro NewSecExtensionCall _EXTENSION _DESCRIPTION
- Section /o "${_DESCRIPTION} File" SEC_${_DESCRIPTION}
- ${registerExtension} "${_EXTENSION}"
- SectionEnd
-!macroend
-
-!macro RegisterExtensionCall _EXTENSION
- Push `${_EXTENSION}`
- ${CallArtificialFunction} RegisterExtension_
-!macroend
-
-!macro UnRegisterExtensionCall _EXTENSION
- Push "${_EXTENSION}"
- ${CallArtificialFunction} UnRegisterExtension_
-!macroend
-
-!macro SelectUnregisteredExt_
- Exch $R1 ;section
- Exch
- Exch $R0 ;extension
- Exch
- Push $0
-
- ReadRegStr $0 HKLM "Software\Classes\$R0" ""
- ;Select if already associated with FUSE, i.e., reinstallation
- StrCmp $0 "${PROG_ID}" Select 0
- ;Select if available
- StrCmp $0 "" Select NoSelect
-
-Select:
- !insertmacro SelectSection $R1
-
-NoSelect:
- Pop $0
- Pop $R1
- Pop $R0
-!macroend
-
-!macro RegisterExtension_
- Exch $R0 ;extension
- Push $0
-
- ; Recommend Fuse in the Open With list
- WriteRegStr HKLM "Software\Classes\$R0\OpenWithProgids" "${PROG_ID}" ""
-
- ; Read global file association
- ReadRegStr $0 HKLM "Software\Classes\$R0" ""
- StrCmp "$0" "" NoBackup ; is it empty
- StrCmp "$0" "${PROG_ID}" NoBackup ; is it our own
- ; Backup current value
- WriteRegStr HKLM "Software\Classes\$R0" "backup_val" "$0"
-
-NoBackup:
- ; Set global file association
- WriteRegStr HKLM "Software\Classes\$R0" "" "${PROG_ID}"
-
- ; Set current user (custom) file association
- ReadRegStr $0 HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\$R0" "Progid"
- StrCmp "$0" "" NoLocalBackup ; is it empty
- StrCmp "$0" "${PROG_ID}" NoLocalBackup ; is it our own
- WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\$R0" "backup_val" "$0"
- WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\$R0" "Progid" "${PROG_ID}"
-
-NoLocalBackup:
- Pop $0
- Pop $R0
-!macroend
-
-!macro UnRegisterExtension_
- Exch $R0 ;extension
- Push $0
-
- ; Unregister OpenWith recommendation
- DeleteRegValue HKLM "Software\Classes\$R0\OpenWithProgids" "${PROG_ID}"
-
- ; Try to delete current file association
- ReadRegStr $0 HKLM "Software\Classes\$R0" ""
- StrCmp $0 ${PROG_ID} 0 NoOwn ; only do this if we own it
- ReadRegStr $0 HKLM "Software\Classes\$R0" "backup_val"
- StrCmp $0 "" 0 Restore ; if backup="" then delete the whole key
- DeleteRegKey HKLM "Software\Classes\$R0"
- Goto NoOwn
-
-Restore:
- WriteRegStr HKLM "Software\Classes\$R0" "" $0
- DeleteRegValue HKLM "Software\Classes\$R0" "backup_val"
-
-NoOwn:
- ; Delete programmatic identifier
- DeleteRegKey HKLM "Software\Classes\${PROG_ID}";
-
- ; Delete current user (custom) file association
- ReadRegStr $0 HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\$R0" "Progid"
- StrCmp "$0" "" NoLocalRestore ; is it empty
- StrCmp "$0" "${PROG_ID}" 0 NoLocalRestore ; is it our own
- ReadRegStr $0 HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\$R0" "backup_val"
- StrCmp "$0" "" 0 +2 ; if no backup -> delete
- DeleteRegKey HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\$R0"
- WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\$R0" "Progid" "$0"
- DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\$R0" "backup_val"
-
-NoLocalRestore:
- Pop $0
- Pop $R0
-!macroend
-
-!define NewSecExtension `!insertmacro NewSecExtensionCall`
-!define SelectUnregisteredExt `!insertmacro SelectUnregisteredExtCall`
-!define RegisterExtension `!insertmacro RegisterExtensionCall`
-!define UnRegisterExtension `!insertmacro UnRegisterExtensionCall`
-
-;--------------------------------
-; Uninstall previous version
-
- Section "" SecUninstallPrevious
-
- Push $R0
- ReadRegStr $R0 HKLM "${HKLM_REG_KEY}" "UninstallString"
-
- ; Check if we are upgrading a previous installation
- ${If} $R0 == '"$INSTDIR\uninstall.exe"'
- DetailPrint "Removing previous installation..."
-
- ; Run the uninstaller silently
- ExecWait '"$INSTDIR\uninstall.exe" /S _?=$INSTDIR'
- ${EndIf}
-
- Pop $R0
-
-SectionEnd
-
-;--------------------------------
-; start default section
-
-section "!Fuse Core Files (required)" SecCore
-
- SectionIn RO
- DetailPrint "Installing Fuse Core Files..."
-
- ; set the installation directory as the destination for the following actions
- setOutPath "$INSTDIR"
-
- ; Installation files
- File "AUTHORS.txt"
- File "ChangeLog.txt"
- File "COPYING.txt"
- File "fuse.exe"
- File "fuse.html"
- File "README.txt"
- File /nonfatal "README-win32.txt"
- File "*.dll"
- SetOutPath $INSTDIR\lib
- File "lib\*"
- SetOutPath "$INSTDIR\roms"
- File "roms\*"
-
- ; create the uninstaller
- writeUninstaller "$INSTDIR\uninstall.exe"
-
- ; Write the uninstall keys for Windows
- WriteRegStr HKLM "${HKLM_REG_KEY}" "DisplayName" "${DISPLAY_NAME}"
- WriteRegStr HKLM "${HKLM_REG_KEY}" "DisplayVersion" "${FUSE_VERSION}"
- WriteRegStr HKLM "${HKLM_REG_KEY}" "HelpLink" "@PACKAGE_URL@"
- WriteRegStr HKLM "${HKLM_REG_KEY}" "UninstallString" '"$INSTDIR\uninstall.exe"'
- WriteRegDWORD HKLM "${HKLM_REG_KEY}" "NoModify" 1
- WriteRegDWORD HKLM "${HKLM_REG_KEY}" "NoRepair" 1
-
-sectionEnd
-
-;--------------------------------
-; Create shortcuts
-
-section "Start Menu and Desktop links" SecShortcuts
-
- DetailPrint "Creating Shortcuts..."
- CreateDirectory "$SMPROGRAMS\Fuse"
- CreateShortCut "$SMPROGRAMS\Fuse\Fuse.lnk" "$INSTDIR\fuse.exe"
- CreateShortCut "$SMPROGRAMS\Fuse\Manual.lnk" "$INSTDIR\fuse.html"
- CreateShortCut "$SMPROGRAMS\Fuse\Readme.lnk" "$INSTDIR\README.txt"
- CreateShortCut "$SMPROGRAMS\Fuse\Uninstall.lnk" "$INSTDIR\uninstall.exe"
- CreateShortCut "$DESKTOP\Fuse.lnk" "$INSTDIR\fuse.exe"
-
-sectionEnd
-
-;--------------------------------
-; Register common file extensions
-
-SectionGroup /e "Register File Extensions" SecFileExt
- ${NewSecExtension} ".pzx" "PZX"
- ${NewSecExtension} ".rzx" "RZX"
- ${NewSecExtension} ".sna" "SNA"
- ${NewSecExtension} ".szx" "SZX"
- ${NewSecExtension} ".tap" "TAP"
- ${NewSecExtension} ".tzx" "TZX"
- ${NewSecExtension} ".z80" "Z80"
-SectionGroupEnd
-
-Section "-Register Application"
- WriteRegStr HKLM "Software\Classes\${PROG_ID}\shell" "" "open"
- WriteRegStr HKLM "Software\Classes\${PROG_ID}\DefaultIcon" "" "$INSTDIR\fuse.exe,0"
- WriteRegStr HKLM "Software\Classes\${PROG_ID}\shell\open\command" "" '"$INSTDIR\fuse.exe" "%1"'
- WriteRegStr HKLM "Software\Classes\Applications\fuse.exe" "NoOpenWith" ""
-
- System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
-SectionEnd
-
-Function .onInit
- ; Select extensions not associated with other applications
- ${SelectUnregisteredExt} ".pzx" ${SEC_PZX}
- ${SelectUnregisteredExt} ".rzx" ${SEC_RZX}
- ${SelectUnregisteredExt} ".sna" ${SEC_SNA}
- ${SelectUnregisteredExt} ".szx" ${SEC_SZX}
- ${SelectUnregisteredExt} ".tap" ${SEC_TAP}
- ${SelectUnregisteredExt} ".tzx" ${SEC_TZX}
- ${SelectUnregisteredExt} ".z80" ${SEC_Z80}
-FunctionEnd
-
-;--------------------------------
-; uninstaller section start
-
-section "uninstall"
-
- ; Unregister file extensions association (if owned)
- DetailPrint "Deleting Registry Keys..."
- ${unregisterExtension} ".pzx"
- ${unregisterExtension} ".rzx"
- ${unregisterExtension} ".sna"
- ${unregisterExtension} ".szx"
- ${unregisterExtension} ".tap"
- ${unregisterExtension} ".tzx"
- ${unregisterExtension} ".z80"
-
- ; Unregister Application
- DeleteRegKey HKLM "Software\Classes\${PROG_ID}"
- DeleteRegKey HKLM "Software\Classes\Applications\fuse.exe"
-
- System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
-
- ; Delete the links
- DetailPrint "Deleting Shortcuts..."
- Delete "$SMPROGRAMS\Fuse\Fuse.lnk"
- Delete "$SMPROGRAMS\Fuse\Manual.lnk"
- Delete "$SMPROGRAMS\Fuse\Readme.lnk"
- Delete "$SMPROGRAMS\Fuse\Uninstall.lnk"
- RMDir "$SMPROGRAMS\Fuse"
- Delete "$DESKTOP\Fuse.lnk"
-
- ; Installation files
- DetailPrint "Deleting Files..."
- Delete "$INSTDIR\lib\*"
- RMDir "$INSTDIR\lib"
- Delete "$INSTDIR\roms\*"
- RMDir "$INSTDIR\roms"
- Delete "$INSTDIR\AUTHORS.txt"
- Delete "$INSTDIR\ChangeLog.txt"
- Delete "$INSTDIR\COPYING.txt"
- Delete "$INSTDIR\fuse.exe"
- Delete "$INSTDIR\fuse.html"
- Delete "$INSTDIR\README.txt"
- Delete "$INSTDIR\README-win32.txt"
- Delete "$INSTDIR\*.dll"
- RMDir "$INSTDIR"
-
- ; Delete the uninstaller and remove the uninstall keys for Windows
- DetailPrint "Deleting Uninstaller..."
- Delete "$INSTDIR\uninstall.exe"
- DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Fuse"
-
-sectionEnd
-
-Function un.DeleteConfigFile
- Delete "$PROFILE\fuse.cfg"
-FunctionEnd
-
-;--------------------------------
-;Descriptions
-
-!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
- !insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "The core files required to use Fuse (program, libraries, ROMs, etc.)"
- !insertmacro MUI_DESCRIPTION_TEXT ${SecShortcuts} "Adds icons to your start menu and your desktop for easy access"
- !insertmacro MUI_DESCRIPTION_TEXT ${SecFileExt} "Register common file extensions with Fuse: pzx, rzx, sna, szx, tap, tzx and z80"
-!insertmacro MUI_FUNCTION_DESCRIPTION_END
Deleted: vendor/fuse-emulator/current/fuse/winfuse.ico
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2016-05-24 11:04:31
|
Revision: 794
http://sourceforge.net/p/fuse-for-macosx/code/794
Author: fredm
Date: 2016-05-24 11:04:28 +0000 (Tue, 24 May 2016)
Log Message:
-----------
Bump SDK to 10.11 and deployment targets to 10.8
Modified Paths:
--------------
trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
trunk/fuse/fusepb/xibs/JoystickConfiguration.xib
trunk/fuse/fusepb/xibs/Keyboard.xib
trunk/fuse/fusepb/xibs/LoadBinary.xib
trunk/fuse/fusepb/xibs/MainMenu.xib
trunk/fuse/fusepb/xibs/MemoryBrowser.xib
trunk/fuse/fusepb/xibs/PokeFinder.xib
trunk/fuse/fusepb/xibs/PokeMemory.xib
trunk/fuse/fusepb/xibs/Rollback.xib
trunk/fuse/fusepb/xibs/SaveBinary.xib
trunk/fuse/fusepb/xibs/SavePanelAccessoryView.xib
trunk/fuse/fusepb/xibs/TapeBrowser.xib
Modified: trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
===================================================================
--- trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2016-03-25 09:56:36 UTC (rev 793)
+++ trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2016-05-24 11:04:28 UTC (rev 794)
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 46;
+ objectVersion = 47;
objects = {
/* Begin PBXBuildFile section */
@@ -1555,7 +1555,7 @@
LastUpgradeCheck = 0730;
};
buildConfigurationList = B63319B3086803BA00732AA3 /* Build configuration list for PBXProject "Fuse" */;
- compatibilityVersion = "Xcode 3.2";
+ compatibilityVersion = "Xcode 6.3";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
@@ -1902,7 +1902,7 @@
PRODUCT_BUNDLE_IDENTIFIER = FusePreferences;
PRODUCT_NAME = Fuse;
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
- SDKROOT = macosx;
+ SDKROOT = macosx10.11;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "-Wall";
WRAPPER_EXTENSION = app;
@@ -1947,7 +1947,7 @@
PRODUCT_BUNDLE_IDENTIFIER = FusePreferences;
PRODUCT_NAME = Fuse;
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
- SDKROOT = macosx;
+ SDKROOT = macosx10.11;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "-Wall";
WRAPPER_EXTENSION = app;
@@ -1991,7 +1991,7 @@
PRODUCT_BUNDLE_IDENTIFIER = FusePreferences;
PRODUCT_NAME = Fuse;
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
- SDKROOT = macosx;
+ SDKROOT = macosx10.11;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "-Wall";
WRAPPER_EXTENSION = app;
@@ -2018,7 +2018,7 @@
MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
RUN_CLANG_STATIC_ANALYZER = YES;
- SDKROOT = macosx;
+ SDKROOT = macosx10.11;
YACCFLAGS = "-d";
YACC_GENERATED_FILE_STEM = InputFileStem;
ZERO_LINK = YES;
@@ -2043,7 +2043,7 @@
LLVM_LTO = YES;
MACOSX_DEPLOYMENT_TARGET = 10.8;
RUN_CLANG_STATIC_ANALYZER = YES;
- SDKROOT = macosx;
+ SDKROOT = macosx10.11;
YACCFLAGS = "-d";
YACC_GENERATED_FILE_STEM = InputFileStem;
ZERO_LINK = NO;
@@ -2066,7 +2066,7 @@
LLVM_LTO = YES;
MACOSX_DEPLOYMENT_TARGET = 10.8;
RUN_CLANG_STATIC_ANALYZER = YES;
- SDKROOT = macosx;
+ SDKROOT = macosx10.11;
YACCFLAGS = "-d";
YACC_GENERATED_FILE_STEM = InputFileStem;
ZERO_LINK = NO;
Modified: trunk/fuse/fusepb/xibs/JoystickConfiguration.xib
===================================================================
--- trunk/fuse/fusepb/xibs/JoystickConfiguration.xib 2016-03-25 09:56:36 UTC (rev 793)
+++ trunk/fuse/fusepb/xibs/JoystickConfiguration.xib 2016-05-24 11:04:28 UTC (rev 794)
@@ -1,2567 +1,445 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
- <data>
- <int key="IBDocument.SystemTarget">1070</int>
- <string key="IBDocument.SystemVersion">12D78</string>
- <string key="IBDocument.InterfaceBuilderVersion">3084</string>
- <string key="IBDocument.AppKitVersion">1187.37</string>
- <string key="IBDocument.HIToolboxVersion">626.00</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">3084</string>
- </object>
- <array key="IBDocument.IntegratedClassDependencies">
- <string>NSButton</string>
- <string>NSButtonCell</string>
- <string>NSCustomObject</string>
- <string>NSMenu</string>
- <string>NSMenuItem</string>
- <string>NSPopUpButton</string>
- <string>NSPopUpButtonCell</string>
- <string>NSTextField</string>
- <string>NSTextFieldCell</string>
- <string>NSView</string>
- <string>NSWindowTemplate</string>
- </array>
- <array key="IBDocument.PluginDependencies">
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- </array>
- <object class="NSMutableDictionary" key="IBDocument.Metadata">
- <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
- <integer value="1" key="NS.object.0"/>
- </object>
- <array class="NSMutableArray" key="IBDocument.RootObjects" id="386087761">
- <object class="NSCustomObject" id="59248293">
- <string key="NSClassName">JoystickConfigurationController</string>
- </object>
- <object class="NSCustomObject" id="124468593">
- <string key="NSClassName">FirstResponder</string>
- </object>
- <object class="NSCustomObject" id="186367009">
- <string key="NSClassName">NSApplication</string>
- </object>
- <object class="NSWindowTemplate" id="60768200">
- <int key="NSWindowStyleMask">3</int>
- <int key="NSWindowBacking">2</int>
- <string key="NSWindowRect">{{82, 198}, {644, 262}}</string>
- <int key="NSWTFlags">-260571136</int>
- <string key="NSWindowTitle">Real Joystick Setup</string>
- <string key="NSWindowClass">NSPanel</string>
- <object class="NSMutableString" key="NSViewClass">
- <characters key="NS.bytes">View</characters>
- </object>
- <nil key="NSUserInterfaceItemIdentifier"/>
- <string key="NSWindowContentMinSize">{213, 107}</string>
- <object class="NSView" key="NSWindowView" id="126771939">
- <reference key="NSNextResponder"/>
- <int key="NSvFlags">256</int>
- <array class="NSMutableArray" key="NSSubviews">
- <object class="NSPopUpButton" id="826895574">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{94, 82}, {125, 26}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="724868534"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="1064004325">
- <int key="NSCellFlags">-2076180416</int>
- <int key="NSCellFlags2">1024</int>
- <object class="NSFont" key="NSSupport" id="632387013">
- <string key="NSName">LucidaGrande</string>
- <double key="NSSize">13</double>
- <int key="NSfFlags">1044</int>
- </object>
- <reference key="NSControlView" ref="826895574"/>
- <int key="NSButtonFlags">-2038284288</int>
- <int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="632387013"/>
- <string key="NSAlternateContents"/>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="985653288">
- <reference key="NSMenu" ref="176052470"/>
- <string key="NSTitle">Item1</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <int key="NSState">1</int>
- <object class="NSCustomResource" key="NSOnImage" id="344018069">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSMenuCheckmark</string>
- </object>
- <object class="NSCustomResource" key="NSMixedImage" id="876485964">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSMenuMixedState</string>
- </object>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="1064004325"/>
- </object>
- <bool key="NSMenuItemRespectAlignment">YES</bool>
- <object class="NSMenu" key="NSMenu" id="176052470">
- <object class="NSMutableString" key="NSTitle">
- <characters key="NS.bytes">OtherViews</characters>
- </object>
- <array class="NSMutableArray" key="NSMenuItems">
- <reference ref="985653288"/>
- </array>
- </object>
- <int key="NSPreferredEdge">3</int>
- <bool key="NSUsesItemFromMenu">YES</bool>
- <bool key="NSAltersState">YES</bool>
- <int key="NSArrowPosition">1</int>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSTextField" id="724868534">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{17, 64}, {75, 17}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="975210892"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="7600202">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">4194304</int>
- <string key="NSContents">Y Axis:</string>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="724868534"/>
- <object class="NSColor" key="NSBackgroundColor" id="203591743">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">controlColor</string>
- <object class="NSColor" key="NSColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
- </object>
- </object>
- <object class="NSColor" key="NSTextColor" id="72727719">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">controlTextColor</string>
- <object class="NSColor" key="NSColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MAA</bytes>
- </object>
- </object>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSPopUpButton" id="975210892">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{94, 57}, {125, 26}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="846109233"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="996235996">
- <int key="NSCellFlags">-2076180416</int>
- <int key="NSCellFlags2">1024</int>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="975210892"/>
- <int key="NSButtonFlags">-2038284288</int>
- <int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="632387013"/>
- <string key="NSAlternateContents"/>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="178741259">
- <reference key="NSMenu" ref="347079809"/>
- <string key="NSTitle">Item1</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <int key="NSState">1</int>
- <reference key="NSOnImage" ref="344018069"/>
- <reference key="NSMixedImage" ref="876485964"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="996235996"/>
- </object>
- <bool key="NSMenuItemRespectAlignment">YES</bool>
- <object class="NSMenu" key="NSMenu" id="347079809">
- <object class="NSMutableString" key="NSTitle">
- <characters key="NS.bytes">OtherViews</characters>
- </object>
- <array class="NSMutableArray" key="NSMenuItems">
- <reference ref="178741259"/>
- </array>
- </object>
- <int key="NSPreferredEdge">3</int>
- <bool key="NSUsesItemFromMenu">YES</bool>
- <bool key="NSAltersState">YES</bool>
- <int key="NSArrowPosition">1</int>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSTextField" id="437828712">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{17, 89}, {75, 17}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="826895574"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="686144872">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">4194304</int>
- <string key="NSContents">X Axis:</string>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="437828712"/>
- <reference key="NSBackgroundColor" ref="203591743"/>
- <reference key="NSTextColor" ref="72727719"/>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSTextField" id="762360309">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{17, 224}, {75, 17}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="63947136"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="765042169">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">4194304</int>
- <string key="NSContents">Button 1:</string>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="762360309"/>
- <reference key="NSBackgroundColor" ref="203591743"/>
- <reference key="NSTextColor" ref="72727719"/>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSPopUpButton" id="63947136">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{94, 218}, {125, 26}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="464710259"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="976972296">
- <int key="NSCellFlags">-2076180416</int>
- <int key="NSCellFlags2">1024</int>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="63947136"/>
- <int key="NSButtonFlags">-2038284288</int>
- <int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="632387013"/>
- <string key="NSAlternateContents"/>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="203505031">
- <reference key="NSMenu" ref="864974259"/>
- <string key="NSTitle">Joystick Fire</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <int key="NSState">1</int>
- <reference key="NSOnImage" ref="344018069"/>
- <reference key="NSMixedImage" ref="876485964"/>
- <string key="NSAction">_popUpItemAction:</string>
- <int key="NSTag">4096</int>
- <reference key="NSTarget" ref="976972296"/>
- </object>
- <bool key="NSMenuItemRespectAlignment">YES</bool>
- <object class="NSMenu" key="NSMenu" id="864974259">
- <object class="NSMutableString" key="NSTitle">
- <characters key="NS.bytes">OtherViews</characters>
- </object>
- <array class="NSMutableArray" key="NSMenuItems">
- <reference ref="203505031"/>
- </array>
- </object>
- <int key="NSPreferredEdge">3</int>
- <bool key="NSUsesItemFromMenu">YES</bool>
- <bool key="NSAltersState">YES</bool>
- <int key="NSArrowPosition">1</int>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSTextField" id="842999689">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{17, 198}, {75, 17}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="938582266"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="941195128">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">4194304</int>
- <string key="NSContents">Button 2:</string>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="842999689"/>
- <reference key="NSBackgroundColor" ref="203591743"/>
- <reference key="NSTextColor" ref="72727719"/>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSPopUpButton" id="938582266">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{94, 192}, {125, 26}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="65221300"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="864091162">
- <int key="NSCellFlags">-2076180416</int>
- <int key="NSCellFlags2">1024</int>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="938582266"/>
- <int key="NSButtonFlags">-2038284288</int>
- <int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="632387013"/>
- <string key="NSAlternateContents"/>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="426575927">
- <reference key="NSMenu" ref="384085349"/>
- <string key="NSTitle">Joystick Fire</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <int key="NSState">1</int>
- <reference key="NSOnImage" ref="344018069"/>
- <reference key="NSMixedImage" ref="876485964"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="864091162"/>
- </object>
- <bool key="NSMenuItemRespectAlignment">YES</bool>
- <object class="NSMenu" key="NSMenu" id="384085349">
- <object class="NSMutableString" key="NSTitle">
- <characters key="NS.bytes">OtherViews</characters>
- </object>
- <array class="NSMutableArray" key="NSMenuItems">
- <reference ref="426575927"/>
- </array>
- </object>
- <int key="NSPreferredEdge">3</int>
- <bool key="NSUsesItemFromMenu">YES</bool>
- <bool key="NSAltersState">YES</bool>
- <int key="NSArrowPosition">1</int>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSPopUpButton" id="602628857">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{94, 166}, {125, 26}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="94893971"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="78403917">
- <int key="NSCellFlags">-2076180416</int>
- <int key="NSCellFlags2">1024</int>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="602628857"/>
- <int key="NSButtonFlags">-2038284288</int>
- <int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="632387013"/>
- <string key="NSAlternateContents"/>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="617597837">
- <reference key="NSMenu" ref="425932685"/>
- <string key="NSTitle">Joystick Fire</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <int key="NSState">1</int>
- <reference key="NSOnImage" ref="344018069"/>
- <reference key="NSMixedImage" ref="876485964"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="78403917"/>
- </object>
- <bool key="NSMenuItemRespectAlignment">YES</bool>
- <object class="NSMenu" key="NSMenu" id="425932685">
- <object class="NSMutableString" key="NSTitle">
- <characters key="NS.bytes">OtherViews</characters>
- </object>
- <array class="NSMutableArray" key="NSMenuItems">
- <reference ref="617597837"/>
- </array>
- </object>
- <int key="NSPreferredEdge">3</int>
- <bool key="NSUsesItemFromMenu">YES</bool>
- <bool key="NSAltersState">YES</bool>
- <int key="NSArrowPosition">1</int>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSTextField" id="470771325">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{17, 172}, {75, 17}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="602628857"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="772767767">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">4194304</int>
- <string key="NSContents">Button 3:</string>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="470771325"/>
- <reference key="NSBackgroundColor" ref="203591743"/>
- <reference key="NSTextColor" ref="72727719"/>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSTextField" id="205174857">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{17, 146}, {75, 17}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="370749589"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="90832892">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">4194304</int>
- <string key="NSContents">Button 4:</string>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="205174857"/>
- <reference key="NSBackgroundColor" ref="203591743"/>
- <reference key="NSTextColor" ref="72727719"/>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSPopUpButton" id="370749589">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{94, 140}, {125, 26}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="904786252"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="381226327">
- <int key="NSCellFlags">-2076180416</int>
- <int key="NSCellFlags2">1024</int>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="370749589"/>
- <int key="NSButtonFlags">-2038284288</int>
- <int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="632387013"/>
- <string key="NSAlternateContents"/>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="361010091">
- <reference key="NSMenu" ref="29414515"/>
- <string key="NSTitle">Joystick Fire</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <int key="NSState">1</int>
- <reference key="NSOnImage" ref="344018069"/>
- <reference key="NSMixedImage" ref="876485964"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="381226327"/>
- </object>
- <bool key="NSMenuItemRespectAlignment">YES</bool>
- <object class="NSMenu" key="NSMenu" id="29414515">
- <object class="NSMutableString" key="NSTitle">
- <characters key="NS.bytes">OtherViews</characters>
- </object>
- <array class="NSMutableArray" key="NSMenuItems">
- <reference ref="361010091"/>
- </array>
- </object>
- <int key="NSPreferredEdge">3</int>
- <bool key="NSUsesItemFromMenu">YES</bool>
- <bool key="NSAltersState">YES</bool>
- <int key="NSArrowPosition">1</int>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSPopUpButton" id="1015066804">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{94, 114}, {125, 26}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="1051109443"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="262477161">
- <int key="NSCellFlags">-2076180416</int>
- <int key="NSCellFlags2">1024</int>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="1015066804"/>
- <int key="NSButtonFlags">-2038284288</int>
- <int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="632387013"/>
- <string key="NSAlternateContents"/>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="288402790">
- <reference key="NSMenu" ref="32353036"/>
- <string key="NSTitle">Joystick Fire</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <int key="NSState">1</int>
- <reference key="NSOnImage" ref="344018069"/>
- <reference key="NSMixedImage" ref="876485964"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="262477161"/>
- </object>
- <bool key="NSMenuItemRespectAlignment">YES</bool>
- <object class="NSMenu" key="NSMenu" id="32353036">
- <object class="NSMutableString" key="NSTitle">
- <characters key="NS.bytes">OtherViews</characters>
- </object>
- <array class="NSMutableArray" key="NSMenuItems">
- <reference ref="288402790"/>
- </array>
- </object>
- <int key="NSPreferredEdge">3</int>
- <bool key="NSUsesItemFromMenu">YES</bool>
- <bool key="NSAltersState">YES</bool>
- <int key="NSArrowPosition">1</int>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSTextField" id="376370105">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{17, 120}, {75, 17}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="1015066804"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="495288389">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">4194304</int>
- <string key="NSContents">Button 5:</string>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="376370105"/>
- <reference key="NSBackgroundColor" ref="203591743"/>
- <reference key="NSTextColor" ref="72727719"/>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSTextField" id="874050939">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{425, 225}, {75, 17}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="302009155"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="644776868">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">4194304</int>
- <string key="NSContents">Button 11:</string>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="874050939"/>
- <reference key="NSBackgroundColor" ref="203591743"/>
- <reference key="NSTextColor" ref="72727719"/>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSPopUpButton" id="302009155">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{502, 218}, {125, 26}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="842999689"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="755102968">
- <int key="NSCellFlags">-2076180416</int>
- <int key="NSCellFlags2">1024</int>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="302009155"/>
- <int key="NSButtonFlags">-2038284288</int>
- <int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="632387013"/>
- <string key="NSAlternateContents"/>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="970902686">
- <reference key="NSMenu" ref="699207521"/>
- <string key="NSTitle">Joystick Fire</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <int key="NSState">1</int>
- <reference key="NSOnImage" ref="344018069"/>
- <reference key="NSMixedImage" ref="876485964"/>
- <string key="NSAction">_popUpItemAction:</string>
- <int key="NSTag">4096</int>
- <reference key="NSTarget" ref="755102968"/>
- </object>
- <bool key="NSMenuItemRespectAlignment">YES</bool>
- <object class="NSMenu" key="NSMenu" id="699207521">
- <object class="NSMutableString" key="NSTitle">
- <characters key="NS.bytes">OtherViews</characters>
- </object>
- <array class="NSMutableArray" key="NSMenuItems">
- <reference ref="970902686"/>
- </array>
- </object>
- <int key="NSPreferredEdge">3</int>
- <bool key="NSUsesItemFromMenu">YES</bool>
- <bool key="NSAltersState">YES</bool>
- <int key="NSArrowPosition">1</int>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSTextField" id="574251903">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{425, 198}, {75, 17}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="206601973"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="787030583">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">4194304</int>
- <string key="NSContents">Button 12:</string>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="574251903"/>
- <reference key="NSBackgroundColor" ref="203591743"/>
- <reference key="NSTextColor" ref="72727719"/>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSPopUpButton" id="206601973">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{502, 192}, {125, 26}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="470771325"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="1000313725">
- <int key="NSCellFlags">-2076180416</int>
- <int key="NSCellFlags2">1024</int>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="206601973"/>
- <int key="NSButtonFlags">-2038284288</int>
- <int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="632387013"/>
- <string key="NSAlternateContents"/>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="886837373">
- <reference key="NSMenu" ref="899009174"/>
- <string key="NSTitle">Joystick Fire</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <int key="NSState">1</int>
- <reference key="NSOnImage" ref="344018069"/>
- <reference key="NSMixedImage" ref="876485964"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="1000313725"/>
- </object>
- <bool key="NSMenuItemRespectAlignment">YES</bool>
- <object class="NSMenu" key="NSMenu" id="899009174">
- <object class="NSMutableString" key="NSTitle">
- <characters key="NS.bytes">OtherViews</characters>
- </object>
- <array class="NSMutableArray" key="NSMenuItems">
- <reference ref="886837373"/>
- </array>
- </object>
- <int key="NSPreferredEdge">3</int>
- <bool key="NSUsesItemFromMenu">YES</bool>
- <bool key="NSAltersState">YES</bool>
- <int key="NSArrowPosition">1</int>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSPopUpButton" id="457339074">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{502, 166}, {125, 26}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="205174857"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="73565078">
- <int key="NSCellFlags">-2076180416</int>
- <int key="NSCellFlags2">1024</int>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="457339074"/>
- <int key="NSButtonFlags">-2038284288</int>
- <int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="632387013"/>
- <string key="NSAlternateContents"/>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="267847892">
- <reference key="NSMenu" ref="62951477"/>
- <string key="NSTitle">Joystick Fire</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <int key="NSState">1</int>
- <reference key="NSOnImage" ref="344018069"/>
- <reference key="NSMixedImage" ref="876485964"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="73565078"/>
- </object>
- <bool key="NSMenuItemRespectAlignment">YES</bool>
- <object class="NSMenu" key="NSMenu" id="62951477">
- <object class="NSMutableString" key="NSTitle">
- <characters key="NS.bytes">OtherViews</characters>
- </object>
- <array class="NSMutableArray" key="NSMenuItems">
- <reference ref="267847892"/>
- </array>
- </object>
- <int key="NSPreferredEdge">3</int>
- <bool key="NSUsesItemFromMenu">YES</bool>
- <bool key="NSAltersState">YES</bool>
- <int key="NSArrowPosition">1</int>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSTextField" id="825645571">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{425, 172}, {75, 17}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="457339074"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="569578732">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">4194304</int>
- <string key="NSContents">Button 13:</string>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="825645571"/>
- <reference key="NSBackgroundColor" ref="203591743"/>
- <reference key="NSTextColor" ref="72727719"/>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSTextField" id="1008403312">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{425, 146}, {75, 17}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="205798271"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="987277141">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">4194304</int>
- <string key="NSContents">Button 14:</string>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="1008403312"/>
- <reference key="NSBackgroundColor" ref="203591743"/>
- <reference key="NSTextColor" ref="72727719"/>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSPopUpButton" id="205798271">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{502, 140}, {125, 26}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="376370105"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="790718145">
- <int key="NSCellFlags">-2076180416</int>
- <int key="NSCellFlags2">1024</int>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="205798271"/>
- <int key="NSButtonFlags">-2038284288</int>
- <int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="632387013"/>
- <string key="NSAlternateContents"/>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="221310221">
- <reference key="NSMenu" ref="339581578"/>
- <string key="NSTitle">Joystick Fire</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <int key="NSState">1</int>
- <reference key="NSOnImage" ref="344018069"/>
- <reference key="NSMixedImage" ref="876485964"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="790718145"/>
- </object>
- <bool key="NSMenuItemRespectAlignment">YES</bool>
- <object class="NSMenu" key="NSMenu" id="339581578">
- <object class="NSMutableString" key="NSTitle">
- <characters key="NS.bytes">OtherViews</characters>
- </object>
- <array class="NSMutableArray" key="NSMenuItems">
- <reference ref="221310221"/>
- </array>
- </object>
- <int key="NSPreferredEdge">3</int>
- <bool key="NSUsesItemFromMenu">YES</bool>
- <bool key="NSAltersState">YES</bool>
- <int key="NSArrowPosition">1</int>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSPopUpButton" id="234186675">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{502, 114}, {125, 26}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="437828712"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="140803321">
- <int key="NSCellFlags">-2076180416</int>
- <int key="NSCellFlags2">1024</int>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="234186675"/>
- <int key="NSButtonFlags">-2038284288</int>
- <int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="632387013"/>
- <string key="NSAlternateContents"/>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="465849157">
- <reference key="NSMenu" ref="627952996"/>
- <string key="NSTitle">Joystick Fire</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <int key="NSState">1</int>
- <reference key="NSOnImage" ref="344018069"/>
- <reference key="NSMixedImage" ref="876485964"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="140803321"/>
- </object>
- <bool key="NSMenuItemRespectAlignment">YES</bool>
- <object class="NSMenu" key="NSMenu" id="627952996">
- <object class="NSMutableString" key="NSTitle">
- <characters key="NS.bytes">OtherViews</characters>
- </object>
- <array class="NSMutableArray" key="NSMenuItems">
- <reference ref="465849157"/>
- </array>
- </object>
- <int key="NSPreferredEdge">3</int>
- <bool key="NSUsesItemFromMenu">YES</bool>
- <bool key="NSAltersState">YES</bool>
- <int key="NSArrowPosition">1</int>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSTextField" id="766644759">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{425, 120}, {75, 17}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="234186675"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="167274146">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">4194304</int>
- <string key="NSContents">Button 15:</string>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="766644759"/>
- <reference key="NSBackgroundColor" ref="203591743"/>
- <reference key="NSTextColor" ref="72727719"/>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSTextField" id="65221300">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{221, 197}, {75, 17}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="1052411550"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="271662164">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">4194304</int>
- <string key="NSContents">Button 7:</string>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="65221300"/>
- <reference key="NSBackgroundColor" ref="203591743"/>
- <reference key="NSTextColor" ref="72727719"/>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSPopUpButton" id="210894963">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{298, 166}, {125, 26}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="825645571"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="503047014">
- <int key="NSCellFlags">-2076180416</int>
- <int key="NSCellFlags2">1024</int>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="210894963"/>
- <int key="NSButtonFlags">-2038284288</int>
- <int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="632387013"/>
- <string key="NSAlternateContents"/>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="414485706">
- <reference key="NSMenu" ref="555110364"/>
- <string key="NSTitle">Joystick Fire</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <int key="NSState">1</int>
- <reference key="NSOnImage" ref="344018069"/>
- <reference key="NSMixedImage" ref="876485964"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="503047014"/>
- </object>
- <bool key="NSMenuItemRespectAlignment">YES</bool>
- <object class="NSMenu" key="NSMenu" id="555110364">
- <object class="NSMutableString" key="NSTitle">
- <characters key="NS.bytes">OtherViews</characters>
- </object>
- <array class="NSMutableArray" key="NSMenuItems">
- <reference ref="414485706"/>
- </array>
- </object>
- <int key="NSPreferredEdge">3</int>
- <bool key="NSUsesItemFromMenu">YES</bool>
- <bool key="NSAltersState">YES</bool>
- <int key="NSArrowPosition">1</int>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSPopUpButton" id="627835086">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{298, 114}, {125, 26}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="766644759"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="478431843">
- <int key="NSCellFlags">-2076180416</int>
- <int key="NSCellFlags2">1024</int>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="627835086"/>
- <int key="NSButtonFlags">-2038284288</int>
- <int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="632387013"/>
- <string key="NSAlternateContents"/>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="419065522">
- <reference key="NSMenu" ref="191665498"/>
- <string key="NSTitle">Joystick Fire</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <int key="NSState">1</int>
- <reference key="NSOnImage" ref="344018069"/>
- <reference key="NSMixedImage" ref="876485964"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="478431843"/>
- </object>
- <bool key="NSMenuItemRespectAlignment">YES</bool>
- <object class="NSMenu" key="NSMenu" id="191665498">
- <object class="NSMutableString" key="NSTitle">
- <characters key="NS.bytes">OtherViews</characters>
- </object>
- <array class="NSMutableArray" key="NSMenuItems">
- <reference ref="419065522"/>
- </array>
- </object>
- <int key="NSPreferredEdge">3</int>
- <bool key="NSUsesItemFromMenu">YES</bool>
- <bool key="NSAltersState">YES</bool>
- <int key="NSArrowPosition">1</int>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSTextField" id="94893971">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{221, 171}, {75, 17}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="210894963"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="819177107">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">4194304</int>
- <string key="NSContents">Button 8:</string>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="94893971"/>
- <reference key="NSBackgroundColor" ref="203591743"/>
- <reference key="NSTextColor" ref="72727719"/>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSPopUpButton" id="681935874">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{298, 218}, {125, 26}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="874050939"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="1033475237">
- <int key="NSCellFlags">-2076180416</int>
- <int key="NSCellFlags2">1024</int>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="681935874"/>
- <int key="NSButtonFlags">-2038284288</int>
- <int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="632387013"/>
- <string key="NSAlternateContents"/>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="1066018225">
- <reference key="NSMenu" ref="188323386"/>
- <string key="NSTitle">Joystick Fire</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <int key="NSState">1</int>
- <reference key="NSOnImage" ref="344018069"/>
- <reference key="NSMixedImage" ref="876485964"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="1033475237"/>
- </object>
- <bool key="NSMenuItemRespectAlignment">YES</bool>
- <object class="NSMenu" key="NSMenu" id="188323386">
- <object class="NSMutableString" key="NSTitle">
- <characters key="NS.bytes">OtherViews</characters>
- </object>
- <array class="NSMutableArray" key="NSMenuItems">
- <reference ref="1066018225"/>
- </array>
- </object>
- <int key="NSPreferredEdge">3</int>
- <bool key="NSUsesItemFromMenu">YES</bool>
- <bool key="NSAltersState">YES</bool>
- <int key="NSArrowPosition">1</int>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSPopUpButton" id="1052411550">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{298, 192}, {125, 26}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="574251903"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="594905258">
- <int key="NSCellFlags">-2076180416</int>
- <int key="NSCellFlags2">1024</int>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="1052411550"/>
- <int key="NSButtonFlags">-2038284288</int>
- <int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="632387013"/>
- <string key="NSAlternateContents"/>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="404602411">
- <reference key="NSMenu" ref="386307341"/>
- <string key="NSTitle">Joystick Fire</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <int key="NSState">1</int>
- <reference key="NSOnImage" ref="344018069"/>
- <reference key="NSMixedImage" ref="876485964"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="594905258"/>
- </object>
- <bool key="NSMenuItemRespectAlignment">YES</bool>
- <object class="NSMenu" key="NSMenu" id="386307341">
- <object class="NSMutableString" key="NSTitle">
- <characters key="NS.bytes">OtherViews</characters>
- </object>
- <array class="NSMutableArray" key="NSMenuItems">
- <reference ref="404602411"/>
- </array>
- </object>
- <int key="NSPreferredEdge">3</int>
- <bool key="NSUsesItemFromMenu">YES</bool>
- <bool key="NSAltersState">YES</bool>
- <int key="NSArrowPosition">1</int>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSTextField" id="464710259">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{221, 223}, {75, 17}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="681935874"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="627514607">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">4194304</int>
- <string key="NSContents">Button 6:</string>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="464710259"/>
- <reference key="NSBackgroundColor" ref="203591743"/>
- <reference key="NSTextColor" ref="72727719"/>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSPopUpButton" id="138759272">
- <reference key="NSNextResponder" ref="126771939"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{298, 140}, {125, 26}}</string>
- <reference key="NSSuperview" ref="126771939"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="1008403312"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="669884116">
- <int key="NSCellFlags">-2076180416</int>
- <int key="NSCellFlags2">1024</int>
- <reference key="NSSupport" ref="632387013"/>
- <reference key="NSControlView" ref="138759272"/>
- <int key="NSButtonFlags">-2038284288</int>
- <int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="632387013"/>
- <string key="NSAlternateContents"/>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="509505863">
- <reference key="NSMenu" ref="875372736"/>
- <string key="NSTitle">Joystick Fire</string>
...
[truncated message content] |
|
From: <fr...@us...> - 2016-03-25 09:56:38
|
Revision: 793
http://sourceforge.net/p/fuse-for-macosx/code/793
Author: fredm
Date: 2016-03-25 09:56:36 +0000 (Fri, 25 Mar 2016)
Log Message:
-----------
Update for XCode 7.3
Modified Paths:
--------------
trunk/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj
trunk/FuseGenerator/Info.plist
trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj
trunk/FuseImporter/Info.plist
trunk/audiofile/audiofile.xcodeproj/project.pbxproj
trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
trunk/fuse/fusepb/Info-Fuse.plist
trunk/libgcrypt/libgcrypt.xcodeproj/project.pbxproj
Modified: trunk/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj
===================================================================
--- trunk/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj 2015-06-05 11:36:46 UTC (rev 792)
+++ trunk/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj 2016-03-25 09:56:36 UTC (rev 793)
@@ -363,7 +363,7 @@
089C1669FE841209C02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0610;
+ LastUpgradeCheck = 0730;
};
buildConfigurationList = 2CA326220896AD4900168862 /* Build configuration list for PBXProject "FuseGenerator" */;
compatibilityVersion = "Xcode 3.2";
@@ -488,6 +488,7 @@
"-lbz2",
"-lz",
);
+ PRODUCT_BUNDLE_IDENTIFIER = "net.sourceforge.projects.fuse-emulator.quicklookgenerator";
PRODUCT_NAME = FuseGenerator;
VALID_ARCHS = "ppc x86_64 i386";
WRAPPER_EXTENSION = qlgenerator;
@@ -512,6 +513,7 @@
"-lbz2",
"-lz",
);
+ PRODUCT_BUNDLE_IDENTIFIER = "net.sourceforge.projects.fuse-emulator.quicklookgenerator";
PRODUCT_NAME = FuseGenerator;
VALID_ARCHS = "ppc x86_64 i386";
WARNING_CFLAGS = (
@@ -535,7 +537,9 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
DEAD_CODE_STRIPPING = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES;
+ ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = c99;
+ GCC_NO_COMMON_BLOCKS = YES;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -545,7 +549,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
ONLY_ACTIVE_ARCH = YES;
- SDKROOT = macosx10.9;
+ SDKROOT = macosx;
};
name = Debug;
};
@@ -562,6 +566,7 @@
DEAD_CODE_STRIPPING = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = c99;
+ GCC_NO_COMMON_BLOCKS = YES;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -570,7 +575,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
- SDKROOT = macosx10.9;
+ SDKROOT = macosx;
};
name = Release;
};
Modified: trunk/FuseGenerator/Info.plist
===================================================================
--- trunk/FuseGenerator/Info.plist 2015-06-05 11:36:46 UTC (rev 792)
+++ trunk/FuseGenerator/Info.plist 2016-03-25 09:56:36 UTC (rev 793)
@@ -51,7 +51,7 @@
<key>CFBundleIconFile</key>
<string></string>
<key>CFBundleIdentifier</key>
- <string>net.sourceforge.projects.fuse-emulator.quicklookgenerator</string>
+ <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
Modified: trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj
===================================================================
--- trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj 2015-06-05 11:36:46 UTC (rev 792)
+++ trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj 2016-03-25 09:56:36 UTC (rev 793)
@@ -338,7 +338,7 @@
089C1669FE841209C02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0610;
+ LastUpgradeCheck = 0730;
};
buildConfigurationList = B6B0E30008CC65D5001D8411 /* Build configuration list for PBXProject "FuseImporter" */;
compatibilityVersion = "Xcode 3.2";
@@ -481,6 +481,7 @@
"-lz",
);
OTHER_REZFLAGS = "";
+ PRODUCT_BUNDLE_IDENTIFIER = "net.sourceforge.projects.fuse-emulator.importer";
PRODUCT_NAME = FuseImporter;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = (
@@ -514,6 +515,7 @@
"-lz",
);
OTHER_REZFLAGS = "";
+ PRODUCT_BUNDLE_IDENTIFIER = "net.sourceforge.projects.fuse-emulator.importer";
PRODUCT_NAME = FuseImporter;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = (
@@ -546,6 +548,7 @@
"-lz",
);
OTHER_REZFLAGS = "";
+ PRODUCT_BUNDLE_IDENTIFIER = "net.sourceforge.projects.fuse-emulator.importer";
PRODUCT_NAME = FuseImporter;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = (
@@ -570,6 +573,8 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
+ ENABLE_TESTABILITY = YES;
+ GCC_NO_COMMON_BLOCKS = YES;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -578,7 +583,8 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.8;
- SDKROOT = macosx10.9;
+ ONLY_ACTIVE_ARCH = YES;
+ SDKROOT = macosx;
};
name = Development;
};
@@ -595,6 +601,7 @@
DEBUG_INFORMATION_FORMAT = dwarf;
DEPLOYMENT_POSTPROCESSING = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES;
+ GCC_NO_COMMON_BLOCKS = YES;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -603,7 +610,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.8;
- SDKROOT = macosx10.9;
+ SDKROOT = macosx;
};
name = Deployment;
};
@@ -619,6 +626,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
+ GCC_NO_COMMON_BLOCKS = YES;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -627,7 +635,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.8;
- SDKROOT = macosx10.9;
+ SDKROOT = macosx;
};
name = Default;
};
Modified: trunk/FuseImporter/Info.plist
===================================================================
--- trunk/FuseImporter/Info.plist 2015-06-05 11:36:46 UTC (rev 792)
+++ trunk/FuseImporter/Info.plist 2016-03-25 09:56:36 UTC (rev 793)
@@ -53,7 +53,7 @@
<key>CFBundleIconFile</key>
<string></string>
<key>CFBundleIdentifier</key>
- <string>net.sourceforge.projects.fuse-emulator.importer</string>
+ <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleVersion</key>
Modified: trunk/audiofile/audiofile.xcodeproj/project.pbxproj
===================================================================
--- trunk/audiofile/audiofile.xcodeproj/project.pbxproj 2015-06-05 11:36:46 UTC (rev 792)
+++ trunk/audiofile/audiofile.xcodeproj/project.pbxproj 2016-03-25 09:56:36 UTC (rev 793)
@@ -303,7 +303,7 @@
000000000000000016601A90 /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0610;
+ LastUpgradeCheck = 0730;
};
buildConfigurationList = B62395470C1CF4F8003B8E87 /* Build configuration list for PBXProject "audiofile" */;
compatibilityVersion = "Xcode 3.2";
@@ -402,11 +402,28 @@
B62395480C1CF4F8003B8E87 /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN_UNREACHABLE_CODE = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEPLOYMENT_POSTPROCESSING = NO;
+ ENABLE_STRICT_OBJC_MSGSEND = YES;
+ ENABLE_TESTABILITY = YES;
FRAMEWORK_VERSION = 0.2.6;
+ GCC_NO_COMMON_BLOCKS = YES;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNUSED_FUNCTION = YES;
+ GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.5;
+ ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
};
name = Development;
@@ -414,10 +431,25 @@
B62395490C1CF4F8003B8E87 /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN_UNREACHABLE_CODE = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEPLOYMENT_POSTPROCESSING = YES;
+ ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_VERSION = 0.2.6;
+ GCC_NO_COMMON_BLOCKS = YES;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNUSED_FUNCTION = YES;
+ GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.5;
SDKROOT = macosx;
};
@@ -426,10 +458,25 @@
B623954A0C1CF4F8003B8E87 /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN_UNREACHABLE_CODE = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEPLOYMENT_POSTPROCESSING = NO;
+ ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_VERSION = 0.2.6;
+ GCC_NO_COMMON_BLOCKS = YES;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNUSED_FUNCTION = YES;
+ GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.5;
SDKROOT = macosx;
};
@@ -468,7 +515,7 @@
OTHER_REZFLAGS = "";
PRINCIPAL_CLASS = "";
PRODUCT_NAME = audiofile;
- SDKROOT = macosx10.9;
+ SDKROOT = macosx;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "";
WRAPPER_EXTENSION = framework;
@@ -508,7 +555,7 @@
OTHER_REZFLAGS = "";
PRINCIPAL_CLASS = "";
PRODUCT_NAME = audiofile;
- SDKROOT = macosx10.9;
+ SDKROOT = macosx;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "";
WRAPPER_EXTENSION = framework;
@@ -547,7 +594,7 @@
OTHER_REZFLAGS = "";
PRINCIPAL_CLASS = "";
PRODUCT_NAME = audiofile;
- SDKROOT = macosx10.9;
+ SDKROOT = macosx;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "";
WRAPPER_EXTENSION = framework;
Modified: trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
===================================================================
--- trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2015-06-05 11:36:46 UTC (rev 792)
+++ trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2016-03-25 09:56:36 UTC (rev 793)
@@ -1552,7 +1552,7 @@
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0630;
+ LastUpgradeCheck = 0730;
};
buildConfigurationList = B63319B3086803BA00732AA3 /* Build configuration list for PBXProject "Fuse" */;
compatibilityVersion = "Xcode 3.2";
@@ -1884,7 +1884,6 @@
GCC_ENABLE_CPP_RTTI = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
- GCC_MODEL_CPU = "";
GCC_OPTIMIZATION_LEVEL = 0;
GCC_VERSION = "";
HEADER_SEARCH_PATHS = (
@@ -1900,9 +1899,10 @@
"-lbz2",
"-lz",
);
+ PRODUCT_BUNDLE_IDENTIFIER = FusePreferences;
PRODUCT_NAME = Fuse;
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
- SDKROOT = macosx10.9;
+ SDKROOT = macosx;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "-Wall";
WRAPPER_EXTENSION = app;
@@ -1929,7 +1929,7 @@
GCC_ENABLE_CPP_EXCEPTIONS = NO;
GCC_ENABLE_CPP_RTTI = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = NO;
- GCC_OPTIMIZATION_LEVEL = 2;
+ GCC_OPTIMIZATION_LEVEL = 3;
GCC_VERSION = "";
HEADER_SEARCH_PATHS = (
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)/audiofile.framework/Headers",
@@ -1944,9 +1944,10 @@
"-lbz2",
"-lz",
);
+ PRODUCT_BUNDLE_IDENTIFIER = FusePreferences;
PRODUCT_NAME = Fuse;
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
- SDKROOT = macosx10.9;
+ SDKROOT = macosx;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "-Wall";
WRAPPER_EXTENSION = app;
@@ -1972,7 +1973,7 @@
GCC_ENABLE_CPP_EXCEPTIONS = NO;
GCC_ENABLE_CPP_RTTI = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = NO;
- GCC_OPTIMIZATION_LEVEL = 2;
+ GCC_OPTIMIZATION_LEVEL = 3;
GCC_VERSION = "";
HEADER_SEARCH_PATHS = (
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)/audiofile.framework/Headers",
@@ -1987,9 +1988,10 @@
"-lbz2",
"-lz",
);
+ PRODUCT_BUNDLE_IDENTIFIER = FusePreferences;
PRODUCT_NAME = Fuse;
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
- SDKROOT = macosx10.9;
+ SDKROOT = macosx;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "-Wall";
WRAPPER_EXTENSION = app;
@@ -2002,9 +2004,10 @@
buildSettings = {
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- GCC_AUTO_VECTORIZATION = NO;
+ ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = c89;
GCC_DYNAMIC_NO_PIC = YES;
+ GCC_OPTIMIZATION_LEVEL = 0;
GCC_VERSION = "";
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
@@ -2013,8 +2016,9 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
LLVM_LTO = YES;
MACOSX_DEPLOYMENT_TARGET = 10.8;
+ ONLY_ACTIVE_ARCH = YES;
RUN_CLANG_STATIC_ANALYZER = YES;
- SDKROOT = macosx10.9;
+ SDKROOT = macosx;
YACCFLAGS = "-d";
YACC_GENERATED_FILE_STEM = InputFileStem;
ZERO_LINK = YES;
@@ -2027,9 +2031,9 @@
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEPLOYMENT_POSTPROCESSING = YES;
- GCC_AUTO_VECTORIZATION = NO;
GCC_C_LANGUAGE_STANDARD = c89;
GCC_DYNAMIC_NO_PIC = YES;
+ GCC_OPTIMIZATION_LEVEL = 3;
GCC_VERSION = "";
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
@@ -2039,7 +2043,7 @@
LLVM_LTO = YES;
MACOSX_DEPLOYMENT_TARGET = 10.8;
RUN_CLANG_STATIC_ANALYZER = YES;
- SDKROOT = macosx10.9;
+ SDKROOT = macosx;
YACCFLAGS = "-d";
YACC_GENERATED_FILE_STEM = InputFileStem;
ZERO_LINK = NO;
@@ -2051,7 +2055,6 @@
buildSettings = {
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- GCC_AUTO_VECTORIZATION = NO;
GCC_C_LANGUAGE_STANDARD = c89;
GCC_DYNAMIC_NO_PIC = YES;
GCC_VERSION = "";
@@ -2063,7 +2066,7 @@
LLVM_LTO = YES;
MACOSX_DEPLOYMENT_TARGET = 10.8;
RUN_CLANG_STATIC_ANALYZER = YES;
- SDKROOT = macosx10.9;
+ SDKROOT = macosx;
YACCFLAGS = "-d";
YACC_GENERATED_FILE_STEM = InputFileStem;
ZERO_LINK = NO;
Modified: trunk/fuse/fusepb/Info-Fuse.plist
===================================================================
--- trunk/fuse/fusepb/Info-Fuse.plist 2015-06-05 11:36:46 UTC (rev 792)
+++ trunk/fuse/fusepb/Info-Fuse.plist 2016-03-25 09:56:36 UTC (rev 793)
@@ -540,7 +540,7 @@
<key>CFBundleIconFile</key>
<string>Fuse</string>
<key>CFBundleIdentifier</key>
- <string>FusePreferences</string>
+ <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
Modified: trunk/libgcrypt/libgcrypt.xcodeproj/project.pbxproj
===================================================================
--- trunk/libgcrypt/libgcrypt.xcodeproj/project.pbxproj 2015-06-05 11:36:46 UTC (rev 792)
+++ trunk/libgcrypt/libgcrypt.xcodeproj/project.pbxproj 2016-03-25 09:56:36 UTC (rev 793)
@@ -357,7 +357,7 @@
00000000000000001640F4D0 /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0610;
+ LastUpgradeCheck = 0730;
};
buildConfigurationList = B61D2B3F0A59ED600008B6CC /* Build configuration list for PBXProject "libgcrypt" */;
compatibilityVersion = "Xcode 3.2";
@@ -565,9 +565,11 @@
isa = XCBuildConfiguration;
buildSettings = {
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ ENABLE_TESTABILITY = YES;
MACOSX_DEPLOYMENT_TARGET = 10.8;
+ ONLY_ACTIVE_ARCH = YES;
PREBINDING = NO;
- SDKROOT = macosx10.9;
+ SDKROOT = macosx;
};
name = Development;
};
@@ -578,7 +580,7 @@
DEPLOYMENT_POSTPROCESSING = YES;
MACOSX_DEPLOYMENT_TARGET = 10.8;
PREBINDING = NO;
- SDKROOT = macosx10.9;
+ SDKROOT = macosx;
};
name = Deployment;
};
@@ -588,7 +590,7 @@
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
MACOSX_DEPLOYMENT_TARGET = 10.8;
PREBINDING = NO;
- SDKROOT = macosx10.9;
+ SDKROOT = macosx;
};
name = Default;
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2015-06-05 11:36:48
|
Revision: 792
http://sourceforge.net/p/fuse-for-macosx/code/792
Author: fredm
Date: 2015-06-05 11:36:46 +0000 (Fri, 05 Jun 2015)
Log Message:
-----------
Use NumberFormatters to ensure only numbers can be entered in number fields.
Modified Paths:
--------------
trunk/fuse/fusepb/xibs/LoadBinary.xib
trunk/fuse/fusepb/xibs/PokeFinder.xib
trunk/fuse/fusepb/xibs/Preferences.xib
trunk/fuse/fusepb/xibs/SaveBinary.xib
Modified: trunk/fuse/fusepb/xibs/LoadBinary.xib
===================================================================
--- trunk/fuse/fusepb/xibs/LoadBinary.xib 2015-06-03 13:43:34 UTC (rev 791)
+++ trunk/fuse/fusepb/xibs/LoadBinary.xib 2015-06-05 11:36:46 UTC (rev 792)
@@ -2,16 +2,23 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1060</int>
- <string key="IBDocument.SystemVersion">10D2094</string>
- <string key="IBDocument.InterfaceBuilderVersion">762</string>
- <string key="IBDocument.AppKitVersion">1038.29</string>
- <string key="IBDocument.HIToolboxVersion">460.00</string>
+ <string key="IBDocument.SystemVersion">14D136</string>
+ <string key="IBDocument.InterfaceBuilderVersion">7706</string>
+ <string key="IBDocument.AppKitVersion">1347.57</string>
+ <string key="IBDocument.HIToolboxVersion">758.70</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">762</string>
+ <string key="NS.object.0">7706</string>
</object>
- <array class="NSMutableArray" key="IBDocument.EditedObjectIDs">
- <integer value="5"/>
+ <array key="IBDocument.IntegratedClassDependencies">
+ <string>NSButton</string>
+ <string>NSButtonCell</string>
+ <string>NSCustomObject</string>
+ <string>NSForm</string>
+ <string>NSFormCell</string>
+ <string>NSNumberFormatter</string>
+ <string>NSView</string>
+ <string>NSWindowTemplate</string>
</array>
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -37,10 +44,10 @@
<object class="NSMutableString" key="NSViewClass">
<characters key="NS.bytes">View</characters>
</object>
- <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
+ <nil key="NSUserInterfaceItemIdentifier"/>
<string key="NSWindowContentMinSize">{213, 107}</string>
<object class="NSView" key="NSWindowView" id="54483082">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSForm" id="625664441">
@@ -48,25 +55,66 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{33, 60}, {173, 52}}</string>
<reference key="NSSuperview" ref="54483082"/>
+ <reference key="NSNextKeyView" ref="928283575"/>
<bool key="NSEnabled">YES</bool>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSNumRows">2</int>
<int key="NSNumCols">1</int>
<array class="NSMutableArray" key="NSCells">
<object class="NSFormCell" id="939197591">
- <int key="NSCellFlags">343014977</int>
+ <int key="NSCellFlags">342884417</int>
<int key="NSCellFlags2">-1941961728</int>
<object class="NSMutableString" key="NSContents">
<characters key="NS.bytes"/>
</object>
<object class="NSFont" key="NSSupport" id="852665856">
- <string key="NSName">LucidaGrande</string>
+ <bool key="IBIsSystemFont">YES</bool>
<double key="NSSize">13</double>
<int key="NSfFlags">1044</int>
</object>
+ <object class="NSNumberFormatter" key="NSFormatter" id="446129282">
+ <dictionary class="NSMutableDictionary" key="NS.attributes">
+ <boolean value="YES" key="allowsFloats"/>
+ <integer value="1040" key="formatterBehavior"/>
+ <object class="NSLocale" key="locale" id="975979868">
+ <string key="NS.identifier"/>
+ </object>
+ <real value="65535" key="maximum"/>
+ <real value="0.0" key="minimum"/>
+ <string key="negativeInfinitySymbol">-∞</string>
+ <string key="nilSymbol"/>
+ <string key="positiveInfinitySymbol">+∞</string>
+ </dictionary>
+ <string key="NS.positiveformat">#</string>
+ <string key="NS.negativeformat">#</string>
+ <nil key="NS.positiveattrs"/>
+ <nil key="NS.negativeattrs"/>
+ <nil key="NS.zero"/>
+ <object class="NSAttributedString" key="NS.nil">
+ <string key="NSString"/>
+ </object>
+ <object class="NSAttributedString" key="NS.nan">
+ <string key="NSString">NaN</string>
+ <dictionary key="NSAttributes" id="826938025"/>
+ </object>
+ <real value="0.0" key="NS.min"/>
+ <real value="65535" key="NS.max"/>
+ <object class="NSDecimalNumberHandler" key="NS.rounding">
+ <int key="NS.roundingmode">3</int>
+ <bool key="NS.raise.overflow">YES</bool>
+ <bool key="NS.raise.underflow">YES</bool>
+ <bool key="NS.raise.dividebyzero">YES</bool>
+ </object>
+ <string key="NS.decimal">.</string>
+ <string key="NS.thousand">,</string>
+ <bool key="NS.hasthousands">NO</bool>
+ <bool key="NS.localized">NO</bool>
+ <bool key="NS.allowsfloats">YES</bool>
+ </object>
<reference key="NSControlView" ref="625664441"/>
<double key="NSTitleWidth">52</double>
<object class="NSCell" key="NSTitleCell">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">67108864</int>
<string key="NSContents">Start:</string>
<reference key="NSSupport" ref="852665856"/>
@@ -74,15 +122,52 @@
</object>
</object>
<object class="NSFormCell" id="888849187">
- <int key="NSCellFlags">343014977</int>
+ <int key="NSCellFlags">342884417</int>
<int key="NSCellFlags2">-1941961728</int>
<string key="NSContents"/>
<reference key="NSSupport" ref="852665856"/>
+ <object class="NSNumberFormatter" key="NSFormatter" id="730536888">
+ <dictionary class="NSMutableDictionary" key="NS.attributes">
+ <boolean value="YES" key="allowsFloats"/>
+ <integer value="1040" key="formatterBehavior"/>
+ <reference key="locale" ref="975979868"/>
+ <real value="65535" key="maximum"/>
+ <real value="1" key="minimum"/>
+ <string key="negativeInfinitySymbol">-∞</string>
+ <string key="nilSymbol"/>
+ <string key="positiveInfinitySymbol">+∞</string>
+ </dictionary>
+ <string key="NS.positiveformat">#</string>
+ <string key="NS.negativeformat">#</string>
+ <nil key="NS.positiveattrs"/>
+ <nil key="NS.negativeattrs"/>
+ <nil key="NS.zero"/>
+ <object class="NSAttributedString" key="NS.nil">
+ <string key="NSString"/>
+ </object>
+ <object class="NSAttributedString" key="NS.nan">
+ <string key="NSString">NaN</string>
+ <reference key="NSAttributes" ref="826938025"/>
+ </object>
+ <real value="1" key="NS.min"/>
+ <real value="65535" key="NS.max"/>
+ <object class="NSDecimalNumberHandler" key="NS.rounding">
+ <int key="NS.roundingmode">3</int>
+ <bool key="NS.raise.overflow">YES</bool>
+ <bool key="NS.raise.underflow">YES</bool>
+ <bool key="NS.raise.dividebyzero">YES</bool>
+ </object>
+ <string key="NS.decimal">.</string>
+ <string key="NS.thousand">,</string>
+ <bool key="NS.hasthousands">NO</bool>
+ <bool key="NS.localized">NO</bool>
+ <bool key="NS.allowsfloats">YES</bool>
+ </object>
<reference key="NSControlView" ref="625664441"/>
<int key="NSTag">1</int>
<double key="NSTitleWidth">52</double>
<object class="NSCell" key="NSTitleCell">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">67108864</int>
<string key="NSContents">Length:</string>
<reference key="NSSupport" ref="852665856"/>
@@ -95,13 +180,13 @@
<int key="NSMatrixFlags">67633152</int>
<string key="NSCellClass">NSActionCell</string>
<object class="NSFormCell" key="NSProtoCell" id="274657702">
- <int key="NSCellFlags">343014976</int>
+ <int key="NSCellFlags">342884416</int>
<int key="NSCellFlags2">205521920</int>
<string key="NSContents"/>
<reference key="NSSupport" ref="852665856"/>
<double key="NSTitleWidth">52</double>
<object class="NSCell" key="NSTitleCell">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">67108864</int>
<string key="NSContents">Field:</string>
<reference key="NSSupport" ref="852665856"/>
@@ -129,14 +214,15 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{409, 12}, {84, 32}}</string>
<reference key="NSSuperview" ref="54483082"/>
+ <reference key="NSNextKeyView" ref="316962788"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="324336785">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">Cancel</string>
<reference key="NSSupport" ref="852665856"/>
<reference key="NSControlView" ref="928283575"/>
- <int key="NSButtonFlags">-2038284033</int>
+ <int key="NSButtonFlags">-2038284288</int>
<int key="NSButtonFlags2">1</int>
<reference key="NSAlternateImage" ref="852665856"/>
<string key="NSAlternateContents"/>
@@ -146,6 +232,7 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="316962788">
<reference key="NSNextResponder" ref="54483082"/>
@@ -154,12 +241,12 @@
<reference key="NSSuperview" ref="54483082"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="263084579">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">OK</string>
<reference key="NSSupport" ref="852665856"/>
<reference key="NSControlView" ref="316962788"/>
- <int key="NSButtonFlags">-2038284033</int>
+ <int key="NSButtonFlags">-2038284288</int>
<int key="NSButtonFlags2">1</int>
<reference key="NSAlternateImage" ref="852665856"/>
<string key="NSAlternateContents"/>
@@ -167,20 +254,22 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="860265059">
<reference key="NSNextResponder" ref="54483082"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{477, 112}, {100, 32}}</string>
<reference key="NSSuperview" ref="54483082"/>
+ <reference key="NSNextKeyView" ref="625664441"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="152660271">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">137887744</int>
<string key="NSContents">Choose...</string>
<reference key="NSSupport" ref="852665856"/>
<reference key="NSControlView" ref="860265059"/>
- <int key="NSButtonFlags">-2038284033</int>
+ <int key="NSButtonFlags">-2038284288</int>
<int key="NSButtonFlags2">1</int>
<object class="NSFont" key="NSAlternateImage">
<string key="NSName">Helvetica</string>
@@ -194,18 +283,21 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSForm" id="40906761">
<reference key="NSNextResponder" ref="54483082"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{20, 120}, {455, 22}}</string>
<reference key="NSSuperview" ref="54483082"/>
+ <reference key="NSNextKeyView" ref="860265059"/>
<bool key="NSEnabled">YES</bool>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSNumRows">1</int>
<int key="NSNumCols">1</int>
<array class="NSMutableArray" key="NSCells">
<object class="NSFormCell" id="457422334">
- <int key="NSCellFlags">343014976</int>
+ <int key="NSCellFlags">342884416</int>
<int key="NSCellFlags2">205521920</int>
<object class="NSMutableString" key="NSContents">
<characters key="NS.bytes"/>
@@ -214,7 +306,7 @@
<reference key="NSControlView" ref="40906761"/>
<double key="NSTitleWidth">65</double>
<object class="NSCell" key="NSTitleCell">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">67108864</int>
<string key="NSContents">Filename:</string>
<reference key="NSSupport" ref="852665856"/>
@@ -227,13 +319,13 @@
<int key="NSMatrixFlags">67633152</int>
<string key="NSCellClass">NSActionCell</string>
<object class="NSFormCell" key="NSProtoCell" id="944722384">
- <int key="NSCellFlags">343014976</int>
+ <int key="NSCellFlags">342884416</int>
<int key="NSCellFlags2">205521920</int>
<string key="NSContents"/>
<reference key="NSSupport" ref="852665856"/>
<double key="NSTitleWidth">65</double>
<object class="NSCell" key="NSTitleCell">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">67108864</int>
<string key="NSContents">Field:</string>
<reference key="NSSupport" ref="852665856"/>
@@ -246,16 +338,17 @@
</object>
</array>
<string key="NSFrameSize">{591, 162}</string>
- <reference key="NSSuperview"/>
+ <reference key="NSNextKeyView" ref="40906761"/>
</object>
- <string key="NSScreenRect">{{0, 0}, {1152, 746}}</string>
+ <string key="NSScreenRect">{{0, 0}, {1440, 877}}</string>
<string key="NSMinSize">{213, 129}</string>
- <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
+ <string key="NSMaxSize">{10000000000000, 10000000000000}</string>
<string key="NSFrameAutosaveName"/>
+ <bool key="NSWindowIsRestorable">YES</bool>
</object>
</array>
<object class="IBObjectContainer" key="IBDocument.Objects">
- <array class="NSMutableArray" key="connectionRecords">
+ <array key="connectionRecords">
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">window</string>
@@ -323,10 +416,10 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">delegate</string>
- <reference key="source" ref="40906761"/>
+ <reference key="source" ref="412550378"/>
<reference key="destination" ref="1028126269"/>
</object>
- <int key="connectionID">37</int>
+ <int key="connectionID">40</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -339,10 +432,10 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">delegate</string>
- <reference key="source" ref="412550378"/>
+ <reference key="source" ref="40906761"/>
<reference key="destination" ref="1028126269"/>
</object>
- <int key="connectionID">40</int>
+ <int key="connectionID">37</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -407,11 +500,17 @@
<object class="IBObjectRecord">
<int key="objectID">16</int>
<reference key="object" ref="939197591"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="446129282"/>
+ </array>
<reference key="parent" ref="625664441"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">17</int>
<reference key="object" ref="888849187"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="730536888"/>
+ </array>
<reference key="parent" ref="625664441"/>
</object>
<object class="IBObjectRecord">
@@ -483,571 +582,68 @@
<reference key="parent" ref="0"/>
<string key="objectName">Application</string>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">48</int>
+ <reference key="object" ref="446129282"/>
+ <reference key="parent" ref="939197591"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">49</int>
+ <reference key="object" ref="730536888"/>
+ <reference key="parent" ref="888849187"/>
+ </object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
+ <string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="14.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES" key="14.ImportedFromIB2"/>
<string key="16.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES" key="16.ImportedFromIB2"/>
<string key="17.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES" key="17.ImportedFromIB2"/>
<string key="19.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES" key="19.ImportedFromIB2"/>
<string key="20.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES" key="20.ImportedFromIB2"/>
<string key="22.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES" key="22.ImportedFromIB2"/>
<string key="24.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES" key="24.ImportedFromIB2"/>
<string key="25.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES" key="25.ImportedFromIB2"/>
<string key="43.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="44.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="45.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="46.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="47.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="5.IBEditorWindowLastContentRect">{{63, 514}, {591, 162}}</string>
+ <string key="48.CustomClassName">NumberFormatter</string>
+ <integer value="1041" key="48.IBNumberFormatterBehaviorMetadataKey"/>
+ <boolean value="YES" key="48.IBNumberFormatterLocalizesFormatMetadataKey"/>
+ <real value="1" key="48.IBNumberFormatterSampleNumberKey"/>
+ <string key="48.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="49.CustomClassName">NumberFormatter</string>
+ <integer value="1041" key="49.IBNumberFormatterBehaviorMetadataKey"/>
+ <boolean value="YES" key="49.IBNumberFormatterLocalizesFormatMetadataKey"/>
+ <real value="1" key="49.IBNumberFormatterSampleNumberKey"/>
+ <string key="49.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="5.IBWindowTemplateEditedContentRect">{{63, 514}, {591, 162}}</string>
- <boolean value="YES" key="5.ImportedFromIB2"/>
- <boolean value="YES" key="5.windowTemplate.hasMinSize"/>
- <string key="5.windowTemplate.minSize">{213, 107}</string>
<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES" key="6.ImportedFromIB2"/>
</dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
- <int key="maxID">47</int>
+ <int key="maxID">49</int>
</object>
- <object class="IBClassDescriber" key="IBDocument.Classes">
- <array class="NSMutableArray" key="referencedPartialClassDescriptions">
- <object class="IBPartialClassDescription">
- <string key="className">FirstResponder</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBUserSource</string>
- <string key="minorKey"/>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">LoadBinaryController</string>
- <string key="superclassName">NSWindowController</string>
- <dictionary class="NSMutableDictionary" key="actions">
- <string key="apply:">id</string>
- <string key="cancel:">id</string>
- <string key="chooseFile:">id</string>
- <string key="showWindow:">id</string>
- </dictionary>
- <dictionary class="NSMutableDictionary" key="outlets">
- <string key="apply">NSButton</string>
- <string key="file">NSFormCell</string>
- <string key="length">NSFormCell</string>
- <string key="start">NSFormCell</string>
- </dictionary>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">controllers/LoadBinaryController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">LoadBinaryController</string>
- <string key="superclassName">NSWindowController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBUserSource</string>
- <string key="minorKey"/>
- </object>
- </object>
- </array>
- <array class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
- <object class="IBPartialClassDescription">
- <string key="className">NSActionCell</string>
- <string key="superclassName">NSCell</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSActionCell.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSApplication</string>
- <string key="superclassName">NSResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="302324003">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSApplication.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSApplication</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="358818463">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSApplicationScripting.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSApplication</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="573012061">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSColorPanel.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSApplication</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSHelpManager.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSApplication</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSPageLayout.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSApplication</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSUserInterfaceItemSearching.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSButton</string>
- <string key="superclassName">NSControl</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSButton.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSButtonCell</string>
- <string key="superclassName">NSActionCell</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSButtonCell.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSCell</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSCell.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSControl</string>
- <string key="superclassName">NSView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="64388785">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSControl.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSForm</string>
- <string key="superclassName">NSMatrix</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSForm.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSFormCell</string>
- <string key="superclassName">NSActionCell</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSFormCell.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSFormatter</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSFormatter.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSMatrix</string>
- <string key="superclassName">NSControl</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSMatrix.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSMenu</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="268201931">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSMenu.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSAccessibility.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <reference key="sourceIdentifier" ref="302324003"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <reference key="sourceIdentifier" ref="358818463"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <reference key="sourceIdentifier" ref="573012061"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <reference key="sourceIdentifier" ref="64388785"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSDictionaryController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSDragging.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSFontManager.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSFontPanel.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSKeyValueBinding.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <reference key="sourceIdentifier" ref="268201931"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSNibLoading.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSOutlineView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSPasteboard.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSSavePanel.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSTableView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSToolbarItem.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="787167887">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSArchiver.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSClassDescription.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSError.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSObjectScripting.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSPortCoder.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSScriptClassDescription.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSScriptKeyValueCoding.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSScriptObjectSpecifiers.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSScriptWhoseTests.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSURLDownload.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">QuartzCore.framework/Headers/CIImageProvider.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSPanel</string>
- <string key="superclassName">NSWindow</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSPanel.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSInterfaceStyle.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSResponder</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSResponder.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSClipView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSMenuItem.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSRulerView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSView</string>
- <string key="superclassName">NSResponder</string>
- <reference key="sourceIdentifier" ref="787167887"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSWindow</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSDrawer.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSWindow</string>
- <string key="superclassName">NSResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSWindow.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSWindow</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSWindowScripting.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSWindowController</string>
- <string key="superclassName">NSResponder</string>
- <object class="NSMutableDictionary" key="actions">
- <string key="NS.key.0">showWindow:</string>
- <string key="NS.object.0">id</string>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSWindowController.h</string>
- </object>
- </object>
- </array>
- </object>
+ <object class="IBClassDescriber" key="IBDocument.Classes"/>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+ <bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">NO</bool>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
<integer value="1060" key="NS.object.0"/>
</object>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
- <integer value="1050" key="NS.object.0"/>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
+ <integer value="4600" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
- <string key="IBDocument.LastKnownRelativeProjectPath">../Fuse.xcodeproj</string>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
</data>
</archive>
Modified: trunk/fuse/fusepb/xibs/PokeFinder.xib
===================================================================
--- trunk/fuse/fusepb/xibs/PokeFinder.xib 2015-06-03 13:43:34 UTC (rev 791)
+++ trunk/fuse/fusepb/xibs/PokeFinder.xib 2015-06-05 11:36:46 UTC (rev 792)
@@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1060</int>
- <string key="IBDocument.SystemVersion">12C54</string>
- <string key="IBDocument.InterfaceBuilderVersion">2843</string>
- <string key="IBDocument.AppKitVersion">1187.34</string>
- <string key="IBDocument.HIToolboxVersion">625.00</string>
+ <string key="IBDocument.SystemVersion">14D136</string>
+ <string key="IBDocument.InterfaceBuilderVersion">7706</string>
+ <string key="IBDocument.AppKitVersion">1347.57</string>
+ <string key="IBDocument.HIToolboxVersion">758.70</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">2843</string>
+ <string key="NS.object.0">7706</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>NSButton</string>
@@ -16,6 +16,7 @@
<string>NSCustomObject</string>
<string>NSForm</string>
<string>NSFormCell</string>
+ <string>NSNumberFormatter</string>
<string>NSScrollView</string>
<string>NSScroller</string>
<string>NSTableColumn</string>
@@ -55,7 +56,7 @@
<nil key="NSUserInterfaceItemIdentifier"/>
<string key="NSWindowContentMinSize">{213, 107}</string>
<object class="NSView" key="NSWindowView" id="533633479">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSButton" id="627910438">
@@ -63,7 +64,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{172, 44}, {78, 32}}</string>
<reference key="NSSuperview" ref="533633479"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="818859185"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="325480867">
@@ -71,7 +71,7 @@
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">Search</string>
<object class="NSFont" key="NSSupport" id="144054806">
- <string key="NSName">LucidaGrande</string>
+ <bool key="IBIsSystemFont">YES</bool>
<double key="NSSize">13</double>
<int key="NSfFlags">1044</int>
</object>
@@ -91,7 +91,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{94, 12}, {78, 32}}</string>
<reference key="NSSuperview" ref="533633479"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="917802164"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="164200844">
@@ -117,8 +116,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{172, 12}, {78, 32}}</string>
<reference key="NSSuperview" ref="533633479"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="31099526">
<int key="NSCellFlags">67108864</int>
@@ -144,14 +141,13 @@
<array class="NSMutableArray" key="NSSubviews">
<object class="NSClipView" id="871991038">
<reference key="NSNextResponder" ref="221659621"/>
- <int key="NSvFlags">2304</int>
+ <int key="NSvFlags">2322</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSTableView" id="96377960">
<reference key="NSNextResponder" ref="871991038"/>
<int key="NSvFlags">256</int>
- <string key="NSFrameSize">{220, 107}</string>
+ <string key="NSFrameSize">{220.5, 107}</string>
<reference key="NSSuperview" ref="871991038"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="569557677"/>
<bool key="NSEnabled">YES</bool>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
@@ -159,9 +155,8 @@
<object class="NSTableHeaderView" key="NSHeaderView" id="654507120">
<reference key="NSNextResponder" ref="676896970"/>
<int key="NSvFlags">256</int>
- <string key="NSFrameSize">{220, 17}</string>
+ <string key="NSFrameSize">{220.5, 17}</string>
<reference key="NSSuperview" ref="676896970"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="871991038"/>
<reference key="NSTableView" ref="96377960"/>
</object>
@@ -181,7 +176,7 @@
<int key="NSCellFlags2">2048</int>
<string key="NSContents">Page</string>
<object class="NSFont" key="NSSupport" id="26">
- <string key="NSName">LucidaGrande</string>
+ <bool key="IBIsSystemFont">YES</bool>
<double key="NSSize">11</double>
<int key="NSfFlags">3100</int>
</object>
@@ -247,7 +242,15 @@
</array>
<double key="NSIntercellSpacingWidth">3</double>
<double key="NSIntercellSpacingHeight">2</double>
- <reference key="NSBackgroundColor" ref="960243021"/>
+ <object class="NSColor" key="NSBackgroundColor" id="435056213">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">controlBackgroundColor</string>
+ <object class="NSColor" key="NSColor" id="795431641">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+ </object>
+ </object>
<object class="NSColor" key="NSGridColor">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
@@ -271,28 +274,21 @@
</array>
<string key="NSFrame">{{1, 17}, {220, 107}}</string>
<reference key="NSSuperview" ref="221659621"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="96377960"/>
<reference key="NSDocView" ref="96377960"/>
- <object class="NSColor" key="NSBGColor" id="435056213">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">controlBackgroundColor</string>
- <object class="NSColor" key="NSColor" id="795431641">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
- </object>
- </object>
+ <reference key="NSBGColor" ref="435056213"/>
<int key="NScvFlags">4</int>
+ <bool key="NSAutomaticallyAdjustsContentInsets">YES</bool>
</object>
<object class="NSScroller" id="569557677">
<reference key="NSNextResponder" ref="221659621"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{205, 17}, {16, 107}}</string>
<reference key="NSSuperview" ref="221659621"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="407655357"/>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ <string key="NSControlAction">_doScroller:</string>
+ <reference key="NSControlTarget" ref="221659621"/>
<reference key="NSTarget" ref="221659621"/>
<string key="NSAction">_doScroller:</string>
<double key="NSPercent">0.56315791606903076</double>
@@ -302,9 +298,11 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {205, 15}}</string>
<reference key="NSSuperview" ref="221659621"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="676896970"/>
+ <bool key="NSEnabled">YES</bool>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ <string key="NSControlAction">_doScroller:</string>
+ <reference key="NSControlTarget" ref="221659621"/>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="221659621"/>
<string key="NSAction">_doScroller:</string>
@@ -312,24 +310,23 @@
</object>
<object class="NSClipView" id="676896970">
<reference key="NSNextResponder" ref="221659621"/>
- <int key="NSvFlags">2304</int>
+ <int key="NSvFlags">2338</int>
<array class="NSMutableArray" key="NSSubviews">
<reference ref="654507120"/>
</array>
<string key="NSFrame">{{1, 0}, {220, 17}}</string>
<reference key="NSSuperview" ref="221659621"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="654507120"/>
<reference key="NSDocView" ref="654507120"/>
<reference key="NSBGColor" ref="435056213"/>
<int key="NScvFlags">4</int>
+ <bool key="NSAutomaticallyAdjustsContentInsets">YES</bool>
</object>
</array>
<string key="NSFrame">{{22, 124}, {222, 125}}</string>
<reference key="NSSuperview" ref="533633479"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="872177923"/>
- <int key="NSsFlags">133138</int>
+ <int key="NSsFlags">133266</int>
<reference key="NSVScroller" ref="569557677"/>
<reference key="NSHScroller" ref="872177923"/>
<reference key="NSContentView" ref="871991038"/>
@@ -344,7 +341,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{22, 257}, {222, 52}}</string>
<reference key="NSSuperview" ref="533633479"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="221659621"/>
<bool key="NSEnabled">YES</bool>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
@@ -353,11 +349,55 @@
<array class="NSMutableArray" key="NSCells">
<object class="NSFormCell" id="876148063">
<int key="NSCellFlags">342884417</int>
- <int key="NSCellFlags2">201327616</int>
+ <int key="NSCellFlags2">-1946156032</int>
<object class="NSMutableString" key="NSContents">
<characters key="NS.bytes"/>
</object>
<reference key="NSSupport" ref="144054806"/>
+ <object class="NSNumberFormatter" key="NSFormatter" id="980256931">
+ <dictionary class="NSMutableDictionary" key="NS.attributes">
+ <boolean value="YES" key="allowsFloats"/>
+ <integer value="1040" key="formatterBehavior"/>
+ <object class="NSLocale" key="locale">
+ <string key="NS.identifier"/>
+ </object>
+ <string key="negativeInfinitySymbol">-∞</string>
+ <string key="nilSymbol"/>
+ <string key="positiveInfinitySymbol">+∞</string>
+ </dictionary>
+ <string key="NS.positiveformat">#</string>
+ <string key="NS.negativeformat">#</string>
+ <nil key="NS.positiveattrs"/>
+ <nil key="NS.negativeattrs"/>
+ <nil key="NS.zero"/>
+ <object class="NSAttributedString" key="NS.nil">
+ <string key="NSString"/>
+ </object>
+ <object class="NSAttributedString" key="NS.nan">
+ <string key="NSString">NaN</string>
+ <dictionary key="NSAttributes"/>
+ </object>
+ <object class="NSDecimalNumberPlaceholder" key="NS.min" id="821233898">
+ <int key="NS.exponent">0</int>
+ <int key="NS.length">0</int>
+ <bool key="NS.negative">YES</bool>
+ <bool key="NS.compact">NO</bool>
+ <int key="NS.mantissa.bo">1</int>
+ <bytes key="NS.mantissa">AAAAAAAAAAAAAAAAAAAAAA</bytes>
+ </object>
+ <reference key="NS.max" ref="821233898"/>
+ <object class="NSDecimalNumberHandler" key="NS.rounding">
+ <int key="NS.roundingmode">3</int>
+ <bool key="NS.raise.overflow">YES</bool>
+ <bool key="NS.raise.underflow">YES</bool>
+ <bool key="NS.raise.dividebyzero">YES</bool>
+ </object>
+ <string key="NS.decimal">.</string>
+ <string key="NS.thousand">,</string>
+ <bool key="NS.hasthousands">NO</bool>
+ <bool key="NS.localized">NO</bool>
+ <bool key="NS.allowsfloats">YES</bool>
+ </object>
<reference key="NSControlView" ref="466477132"/>
<double key="NSTitleWidth">121</double>
<object class="NSCell" key="NSTitleCell">
@@ -417,7 +457,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{16, 44}, {124, 32}}</string>
<reference key="NSSuperview" ref="533633479"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="627910438"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="349135108">
@@ -443,7 +482,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{16, 76}, {124, 32}}</string>
<reference key="NSSuperview" ref="533633479"/>...
[truncated message content] |
|
From: <fr...@us...> - 2015-06-03 13:43:36
|
Revision: 791
http://sourceforge.net/p/fuse-for-macosx/code/791
Author: fredm
Date: 2015-06-03 13:43:34 +0000 (Wed, 03 Jun 2015)
Log Message:
-----------
Enable some additional warnings and link time optimisation.
Modified Paths:
--------------
trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
Modified: trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
===================================================================
--- trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2015-06-03 13:42:30 UTC (rev 790)
+++ trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2015-06-03 13:43:34 UTC (rev 791)
@@ -1552,7 +1552,7 @@
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0610;
+ LastUpgradeCheck = 0630;
};
buildConfigurationList = B63319B3086803BA00732AA3 /* Build configuration list for PBXProject "Fuse" */;
compatibilityVersion = "Xcode 3.2";
@@ -1902,7 +1902,7 @@
);
PRODUCT_NAME = Fuse;
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
- SDKROOT = macosx;
+ SDKROOT = macosx10.9;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "-Wall";
WRAPPER_EXTENSION = app;
@@ -1946,7 +1946,7 @@
);
PRODUCT_NAME = Fuse;
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
- SDKROOT = macosx;
+ SDKROOT = macosx10.9;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "-Wall";
WRAPPER_EXTENSION = app;
@@ -1989,7 +1989,7 @@
);
PRODUCT_NAME = Fuse;
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
- SDKROOT = macosx;
+ SDKROOT = macosx10.9;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "-Wall";
WRAPPER_EXTENSION = app;
@@ -2006,7 +2006,12 @@
GCC_C_LANGUAGE_STANDARD = c89;
GCC_DYNAMIC_NO_PIC = YES;
GCC_VERSION = "";
+ GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_SHADOW = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ LLVM_LTO = YES;
MACOSX_DEPLOYMENT_TARGET = 10.8;
RUN_CLANG_STATIC_ANALYZER = YES;
SDKROOT = macosx10.9;
@@ -2026,7 +2031,12 @@
GCC_C_LANGUAGE_STANDARD = c89;
GCC_DYNAMIC_NO_PIC = YES;
GCC_VERSION = "";
+ GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_SHADOW = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ LLVM_LTO = YES;
MACOSX_DEPLOYMENT_TARGET = 10.8;
RUN_CLANG_STATIC_ANALYZER = YES;
SDKROOT = macosx10.9;
@@ -2045,7 +2055,12 @@
GCC_C_LANGUAGE_STANDARD = c89;
GCC_DYNAMIC_NO_PIC = YES;
GCC_VERSION = "";
+ GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_SHADOW = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ LLVM_LTO = YES;
MACOSX_DEPLOYMENT_TARGET = 10.8;
RUN_CLANG_STATIC_ANALYZER = YES;
SDKROOT = macosx10.9;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2015-06-03 13:42:32
|
Revision: 790
http://sourceforge.net/p/fuse-for-macosx/code/790
Author: fredm
Date: 2015-06-03 13:42:30 +0000 (Wed, 03 Jun 2015)
Log Message:
-----------
Make aqua_verror() static.
Modified Paths:
--------------
trunk/fuse/ui/cocoa/cocoaerror.m
Modified: trunk/fuse/ui/cocoa/cocoaerror.m
===================================================================
--- trunk/fuse/ui/cocoa/cocoaerror.m 2015-06-03 13:41:46 UTC (rev 789)
+++ trunk/fuse/ui/cocoa/cocoaerror.m 2015-06-03 13:42:30 UTC (rev 790)
@@ -39,7 +39,7 @@
#include "ui/ui.h"
#include "settings.h"
-int
+static int
aqua_verror( ui_error_level severity, const char *message )
{
NSString *alertString = @(message);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2015-06-03 13:41:48
|
Revision: 789
http://sourceforge.net/p/fuse-for-macosx/code/789
Author: fredm
Date: 2015-06-03 13:41:46 +0000 (Wed, 03 Jun 2015)
Log Message:
-----------
Make press_key() and release_key() static.
Modified Paths:
--------------
trunk/fuse/fusepb/keystate.c
Modified: trunk/fuse/fusepb/keystate.c
===================================================================
--- trunk/fuse/fusepb/keystate.c 2015-06-03 13:29:56 UTC (rev 788)
+++ trunk/fuse/fusepb/keystate.c 2015-06-03 13:41:46 UTC (rev 789)
@@ -64,7 +64,7 @@
static input_key current_special;
static int normal_count = 0;
-void
+static void
press_key( input_key keysym )
{
input_event_t fuse_event;
@@ -74,7 +74,7 @@
input_event( &fuse_event );
}
-void
+static void
release_key( input_key keysym )
{
input_event_t fuse_event;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2015-06-03 13:29:57
|
Revision: 788
http://sourceforge.net/p/fuse-for-macosx/code/788
Author: fredm
Date: 2015-06-03 13:29:56 +0000 (Wed, 03 Jun 2015)
Log Message:
-----------
Restore lost keyboard joystick binding function.
Modified Paths:
--------------
trunk/fuse/peripherals/joystick.c
Modified: trunk/fuse/peripherals/joystick.c
===================================================================
--- trunk/fuse/peripherals/joystick.c 2015-03-02 10:40:58 UTC (rev 787)
+++ trunk/fuse/peripherals/joystick.c 2015-06-03 13:29:56 UTC (rev 788)
@@ -151,7 +151,10 @@
case 1: type = settings_current.joystick_2_output; break;
case JOYSTICK_KEYBOARD:
- type = settings_current.joystick_keyboard_output; break;
+ type = settings_current.joy_keyboard ?
+ settings_current.joystick_keyboard_output :
+ JOYSTICK_TYPE_NONE;
+ break;
default:
return 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
