Ver código fonte

Work around issue of file requiring specific compile options.

woollybah 4 anos atrás
pai
commit
43c6bcce3e
3 arquivos alterados com 18 adições e 1 exclusões
  1. 15 0
      macosmfi.mod/macosmfi.bmx
  2. 1 0
      sdl.mod/sdl.bmx
  3. 2 1
      sdl.mod/source.bmx

+ 15 - 0
macosmfi.mod/macosmfi.bmx

@@ -0,0 +1,15 @@
+SuperStrict
+
+Module SDL.macosmfi
+
+?osx
+ModuleInfo "CC_OPTS: -mmmx -msse -msse2 -DTARGET_API_MAC_CARBON -DTARGET_API_MAC_OSX"
+ModuleInfo "CC_OPTS: -fobjc-arc"
+
+Import "../sdl.mod/include/macos/*.h"
+
+' this file must be compiled with ARC enabled ( -fobjc-arc )
+' unfortunately, we don't support CC_OPTS on a per-file basis.
+Import "../sdl.mod/SDL/src/joystick/iphoneos/SDL_mfijoystick.m"
+?
+

+ 1 - 0
sdl.mod/sdl.bmx

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

+ 2 - 1
sdl.mod/source.bmx

@@ -322,7 +322,6 @@ Import "SDL/src/filesystem/cocoa/SDL_sysfilesystem.m"
 Import "SDL/src/haptic/darwin/SDL_syshaptic.c"
 Import "SDL/src/hidapi/mac/hid.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/locale/macosx/SDL_syslocale.m"
 Import "SDL/src/misc/macosx/SDL_sysurl.m"
@@ -351,6 +350,8 @@ Import "SDL/src/video/cocoa/SDL_cocoashape.m"
 Import "SDL/src/video/cocoa/SDL_cocoavideo.m"
 Import "SDL/src/video/cocoa/SDL_cocoawindow.m"
 
+Import SDL.macosmfi
+
 ?Not android
  ' linux desktop + raspberrypi
 Import "linux_source.bmx"