Browse Source

Merge pull request #32 from ChaosCoder/fixMacOS

Fix compilation under macOS
Brucey 4 years ago
parent
commit
95d66de023
2 changed files with 4 additions and 2 deletions
  1. 1 0
      sdl.mod/sdl.bmx
  2. 3 2
      sdl.mod/source.bmx

+ 1 - 0
sdl.mod/sdl.bmx

@@ -54,6 +54,7 @@ Import "-framework CoreAudio"
 Import "-framework IOKit"
 Import "-framework IOKit"
 Import "-framework CoreVideo"
 Import "-framework CoreVideo"
 Import "-framework ForceFeedback"
 Import "-framework ForceFeedback"
+Import "-framework GameController"
 
 
 ?linuxx86
 ?linuxx86
 ModuleInfo "CC_OPTS: -mmmx -m3dnow -msse -msse2 -DHAVE_LINUX_VERSION_H"
 ModuleInfo "CC_OPTS: -mmmx -m3dnow -msse -msse2 -DHAVE_LINUX_VERSION_H"

+ 3 - 2
sdl.mod/source.bmx

@@ -280,7 +280,7 @@ Import "SDL/src/file/cocoa/SDL_rwopsbundlesupport.m"
 Import "SDL/src/filesystem/cocoa/SDL_sysfilesystem.m"
 Import "SDL/src/filesystem/cocoa/SDL_sysfilesystem.m"
 Import "SDL/src/haptic/dummy/SDL_syshaptic.c"
 Import "SDL/src/haptic/dummy/SDL_syshaptic.c"
 Import "SDL/src/hidapi/ios/hid.m"
 Import "SDL/src/hidapi/ios/hid.m"
-Import "SDL/src/joystick/iphoneos/SDL_sysjoystick.m"
+Import "SDL/src/joystick/iphoneos/SDL_mfijoystick.m"
 Import "SDL/src/locale/macosx/SDL_syslocale.m"
 Import "SDL/src/locale/macosx/SDL_syslocale.m"
 Import "SDL/src/loadso/dlopen/SDL_sysloadso.c"
 Import "SDL/src/loadso/dlopen/SDL_sysloadso.c"
 Import "SDL/src/misc/ios/SDL_sysurl.m"
 Import "SDL/src/misc/ios/SDL_sysurl.m"
@@ -321,7 +321,8 @@ Import "SDL/src/file/cocoa/SDL_rwopsbundlesupport.m"
 Import "SDL/src/filesystem/cocoa/SDL_sysfilesystem.m"
 Import "SDL/src/filesystem/cocoa/SDL_sysfilesystem.m"
 Import "SDL/src/haptic/darwin/SDL_syshaptic.c"
 Import "SDL/src/haptic/darwin/SDL_syshaptic.c"
 Import "SDL/src/hidapi/mac/hid.c"
 Import "SDL/src/hidapi/mac/hid.c"
-Import "SDL/src/joystick/darwin/SDL_sysjoystick.c"
+Import "SDL/src/joystick/darwin/SDL_iokitjoystick.c"
+Import "SDL/src/joystick/iphoneos/SDL_mfijoystick.m"
 Import "SDL/src/loadso/dlopen/SDL_sysloadso.c"
 Import "SDL/src/loadso/dlopen/SDL_sysloadso.c"
 Import "SDL/src/locale/macosx/SDL_syslocale.m"
 Import "SDL/src/locale/macosx/SDL_syslocale.m"
 Import "SDL/src/misc/macosx/SDL_sysurl.m"
 Import "SDL/src/misc/macosx/SDL_sysurl.m"