builds and runs on osx

.gitignore

@@ -1 +1,3 @@
 scripts/startup_local*
+.DS_Store
+

README.md

@@ -171,6 +171,14 @@ Manic Miner running on GoSpeccy.
 * Add more filters and improve the scaler
 * Add new graphical backends (Go's exp/draw?)
 
+# osx notes
+The SDL usage needs X11 because the Quartz implementation is picky about how threads are used (you need to poll events on the main thread or it throws an exception.)
+Getting a sdl installed in osx which supports x11 is not that simple though because the bottled versions seem to exclude X11. The following worked for me.
+
+    brew install -vd --build-from-source  sdl --with-x11 --with-test
+    brew install sdl_image sdl_ttf sdl_mixer
+
+
 # Credits
 
 * Thanks to [⚛](http://github.com/0xe2-0x9a-0x9b) for giving a new

src/output/sdl/sdl.go

@@ -1,4 +1,4 @@
-// +build linux freebsd
+// +build linux freebsd darwin
 
 // GoSpeccy SDL interface (audio&video output, keyboard input)
 package sdl_output
@@ -8,14 +8,15 @@ import (
 	"errors"
 	"flag"
 	"fmt"
-	"github.com/scottferg/Go-SDL/sdl"
-	"github.com/scottferg/Go-SDL/ttf"
+	"reflect"
+	"sync"
+
 	"github.com/remogatto/clingon"
 	"github.com/remogatto/gospeccy/src/env"
 	"github.com/remogatto/gospeccy/src/interpreter"
 	"github.com/remogatto/gospeccy/src/spectrum"
-	"reflect"
-	"sync"
+	"github.com/scottferg/Go-SDL/sdl"
+	"github.com/scottferg/Go-SDL/ttf"
 )
 
 const DEFAULT_JOYSTICK_ID = 0

src/output/sdl/sdl_compositing.go

@@ -5,15 +5,16 @@
  * except for usages in immoral contexts.
  */
 
-// +build linux freebsd
+// +build linux freebsd darwin
 
 package sdl_output
 
 import (
-	"github.com/scottferg/Go-SDL/sdl"
-	"github.com/remogatto/gospeccy/src/spectrum"
 	"math/rand"
 	"unsafe"
+
+	"github.com/remogatto/gospeccy/src/spectrum"
+	"github.com/scottferg/Go-SDL/sdl"
 )
 
 // Composes multiple SDL surfaces into a single surface

src/output/sdl/sdl_display.go

@@ -23,18 +23,19 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 */
 
-// +build linux freebsd
+// +build linux freebsd darwin
 
 package sdl_output
 
 import (
 	"fmt"
-	"github.com/scottferg/Go-SDL/sdl"
-	"github.com/scottferg/Go-SDL/ttf"
-	"github.com/remogatto/gospeccy/src/spectrum"
 	"os"
 	"time"
 	"unsafe"
+
+	"github.com/remogatto/gospeccy/src/spectrum"
+	"github.com/scottferg/Go-SDL/sdl"
+	"github.com/scottferg/Go-SDL/ttf"
 )
 
 func init() {

src/output/sdl/sdl_display_test.go

@@ -1,4 +1,4 @@
-// +build linux freebsd
+// +build linux freebsd darwin
 
 package sdl_output
 
@@ -7,10 +7,11 @@ import (
 	//"image/png"
 
 	//"strings"
-	"github.com/scottferg/Go-SDL/sdl"
+	"testing"
+
 	"github.com/remogatto/gospeccy/src/formats"
 	"github.com/remogatto/gospeccy/src/spectrum"
-	"testing"
+	"github.com/scottferg/Go-SDL/sdl"
 	//"unsafe"
 )
 

src/output/sdl/sdl_dummy.go

@@ -1,4 +1,4 @@
-// +build linux freebsd
+// +build linux freebsd darwin
 
 package sdl_output
 

src/output/sdl/sdl_script.go

@@ -1,11 +1,12 @@
-// +build linux freebsd
+// +build linux freebsd darwin
 
 package sdl_output
 
 import (
+	"sync"
+
 	intp "github.com/remogatto/gospeccy/src/interpreter"
 	"github.com/sbinet/go-eval"
-	"sync"
 )
 
 type userInterfaceSettings_t interface {

src/output/sdl/sdl_sound.go

@@ -5,19 +5,20 @@
  * except for usages in immoral contexts.
  */
 
-// +build linux freebsd
+// +build linux freebsd darwin
 
 package sdl_output
 
 import (
 	"errors"
 	"fmt"
-	"github.com/scottferg/Go-SDL/sdl"
-	sdl_audio "github.com/scottferg/Go-SDL/sdl/audio"
-	"github.com/remogatto/gospeccy/src/spectrum"
 	"math"
 	"os"
 	"sync"
+
+	"github.com/remogatto/gospeccy/src/spectrum"
+	"github.com/scottferg/Go-SDL/sdl"
+	sdl_audio "github.com/scottferg/Go-SDL/sdl/audio"
 )
 
 func init() {

src/pull_modules/sdl.go

@@ -1,4 +1,4 @@
-// +build linux freebsd
+// +build linux freebsd darwin
 
 package pull_modules