diff --git a/Makefile b/Makefile index 0e8ca27..42c9155 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/README.md b/README.md index 39c707c..e38bf19 100644 --- a/README.md +++ b/README.md @@ -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. diff --git a/example/test_manymouse_sdl2.c b/example/test_manymouse_sdl2.c index 6fad282..28166b5 100644 --- a/example/test_manymouse_sdl2.c +++ b/example/test_manymouse_sdl2.c @@ -19,7 +19,12 @@ #include "manymouse.h" #define SDL_MAIN_HANDLED +#ifdef __APPLE__ +// Still the SDL2 header, but different header search behavior. +#include +#else #include +#endif #define MAX_MICE 128 #define SCROLLWHEEL_DISPLAY_TICKS 100 diff --git a/macosx_hidutilities.c b/macosx_hidutilities.c index c4f3d8c..69fb462 100644 --- a/macosx_hidutilities.c +++ b/macosx_hidutilities.c @@ -32,7 +32,7 @@ * Scroll down for "-- END HID UTILITIES --" to see the ManyMouse glue code. */ -#include +#include #include // 10.0.x