Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ CC := gcc
LD := gcc

ifeq ($(strip $(macosx)),true)
LDFLAGS += -framework Carbon -framework IOKit
LDFLAGS += -framework Cocoa -framework IOKit
JAVAC := javac
MANYMOUSEJNILIB := libManyMouse.jnilib
JNICFLAGS += -I/System/Library/Frameworks/JavaVM.framework/Headers
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,8 @@ Thanks to Thomas Weibel for the Matlab work.
ManyMouse from any of the official Mac application layers. This code may or
may not work on Darwin (we're not sure if IOKit is available to that
platform); reports of success are welcome. If you aren't already, you will
need to make sure you link against the "Carbon" and "IOKit" frameworks once
you add ManyMouse to your project.
need to make sure you link against the "IOKit" and either "Cocoa" or
"Carbon" frameworks once you add ManyMouse to your project.
- Support for other platforms than Mac OS X, Linux, and Windows is not
planned, but contributions of implementations for other platforms are
welcome.
Expand Down
5 changes: 5 additions & 0 deletions example/test_manymouse_sdl2.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,12 @@

#include "manymouse.h"
#define SDL_MAIN_HANDLED
#ifdef __APPLE__
// Still the SDL2 header, but different header search behavior.
#include <SDL.h>
#else
#include <SDL2/SDL.h>
#endif

#define MAX_MICE 128
#define SCROLLWHEEL_DISPLAY_TICKS 100
Expand Down
2 changes: 1 addition & 1 deletion macosx_hidutilities.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
* Scroll down for "-- END HID UTILITIES --" to see the ManyMouse glue code.
*/

#include <Carbon/Carbon.h>
#include <Cocoa/Cocoa.h>

#include <IOKit/IOTypes.h>
// 10.0.x
Expand Down