From 170f2b5eca702c863e38a4251b3997acef976ef7 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Fri, 19 Feb 2010 18:24:23 +1300 Subject: [PATCH] game.input: fix load error on *BSD, remove dependency on windows.com from game.input.linux --- basis/game/input/input.factor | 1 + basis/game/input/linux/linux.factor | 8 +++----- basis/game/input/linux/tags.txt | 1 + 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/basis/game/input/input.factor b/basis/game/input/input.factor index 7543a05c60..8a269cd51a 100644 --- a/basis/game/input/input.factor +++ b/basis/game/input/input.factor @@ -94,4 +94,5 @@ M: mouse-state clone { [ os windows? ] [ "game.input.xinput" require ] } { [ os macosx? ] [ "game.input.iokit" require ] } { [ os linux? ] [ "game.input.linux" require ] } + [ ] } cond diff --git a/basis/game/input/linux/linux.factor b/basis/game/input/linux/linux.factor index 465cefa84b..0d451e96f0 100644 --- a/basis/game/input/linux/linux.factor +++ b/basis/game/input/linux/linux.factor @@ -1,8 +1,6 @@ ! Copyright (C) 2010 Erik Charlebois. ! See http://factorcode.org/license.txt for BSD license. -USING: kernel game.input namespaces classes windows.com.syntax -bit-arrays -vectors ; +USING: kernel game.input namespaces classes bit-arrays vectors ; IN: game.input.linux SINGLETON: linux-game-input-backend @@ -25,10 +23,10 @@ M: linux-game-input-backend product-string drop "" ; M: linux-game-input-backend product-id - drop GUID: {00000000-0000-0000-0000-000000000000} ; + drop f ; M: linux-game-input-backend instance-id - drop GUID: {00000000-0000-0000-0000-000000000000} ; + drop f ; M: linux-game-input-backend read-controller drop controller-state new ; diff --git a/basis/game/input/linux/tags.txt b/basis/game/input/linux/tags.txt index 84d4140a70..82506ff250 100644 --- a/basis/game/input/linux/tags.txt +++ b/basis/game/input/linux/tags.txt @@ -1 +1,2 @@ +unportable games