Bunch of windows updates.

icculus · Jun 29, 2005 · 3d52d47 · 3d52d47
1 parent 633364c
commit 3d52d47
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -2,24 +2,26 @@
 macosx := false
 
 CFLAGS += -O0 -Wall -g -c
-
 CFLAGS += -I. -I/usr/src/linux/include
 
+CFLAGS += -ISDL-1.2.8/include
+LDFLAGS += -LSDL-1.2.8/lib -lSDL -lSDLmain
+
 CC := gcc
 LD := gcc
 
 ifeq ($(strip $(macosx)),true)
   LDFLAGS += -framework Carbon -framework IOKit
 endif
 
-BASEOBJS := linux_evdev.o macosx_hidmanager.o manymouse.o
+BASEOBJS := linux_evdev.o macosx_hidmanager.o windows_wminput.o manymouse.o
 
 .PHONY: clean all
 
 all: detect_mice test_manymouse_stdio test_manymouse_sdl
 
 clean:
-	rm -f *.o example/*.o test_manymouse_stdio test_manymouse_stdio detect_mice
+	rm -f *.o *.obj *.exe example/*.o example/*.obj test_manymouse_stdio test_manymouse_stdio detect_mice
 
 %.o : %c
 	$(CC) $(CFLAGS) -o $@ $+

diff --git a/README b/README
@@ -35,6 +35,22 @@ Basic usage:
 
 There are examples of complete usage in the "example" directory.
 
+The test apps on Linux and MacOS X can be built by running "make" from a
+ terminal. The SDL test app will fail if Simple Directmedia Layer
+ (http://libsdl.org/) isn't installed. The stdio apps will still work.
+
+Windows isn't integrated into the Makefile, since most people will want to
+ put it in a VS.NET project anyhow, but here's the command line used to
+ build some of the standalone test apps:
+
+cl /I. *.c example\test_manymouse_stdio.c /Fetest_manymouse_stdio.exe
+cl /I. *.c example\detect_mice.c /Fedetect_mice.exe
+
+(yes, that's simple, that's the point)...getting the SDL test app to work can
+ be done, but takes too much effort unrelated to ManyMouse itself for this
+ document to explain.
+
+
 Some notes:
  - If a mouse is disconnected, it will not return future events, even if you
    plug it right back in. You will be alerted of disconnects programmatically

diff --git a/example/test_manymouse_sdl.c b/example/test_manymouse_sdl.c
@@ -155,7 +155,7 @@ int main(int argc, char **argv)
     SDL_WM_SetCaption("Move your mice, R to rescan, G to (un)grab, S to show/hide, ESC to quit",
                         "manymouse");
 
-    SDL_WM_GrabInput(SDL_GRAB_ON);
+    /*SDL_WM_GrabInput(SDL_GRAB_ON);*/
 
     SDL_ShowCursor(cursor);
 

diff --git a/manymouse.c b/manymouse.c
@@ -24,7 +24,7 @@ static const ManyMouseDriver *mice_drivers[] =
     #if SUPPORT_XINPUT
     &ManyMouseDriver_xinput,
     #endif
-    #ifdef WINDOWS
+    #if ((defined _WIN32) || defined(__CYGWIN__))
     &ManyMouseDriver_windows,
     #endif
     #ifdef __linux__