diff --git a/bin/fsevent_watch b/bin/fsevent_watch index 889204f..9a834a2 100755 Binary files a/bin/fsevent_watch and b/bin/fsevent_watch differ diff --git a/ext/fsevent_watch/defines.h b/ext/fsevent_watch/defines.h index 6f6e87b..a8eae78 100644 --- a/ext/fsevent_watch/defines.h +++ b/ext/fsevent_watch/defines.h @@ -14,12 +14,8 @@ #define COMPILER "unknown" #endif -#if defined(__ppc__) -#define TARGET_CPU "ppc" -#elif defined(__ppc64__) -#define TARGET_CPU "ppc64" -#elif defined(__i386__) -#define TARGET_CPU "i386" +#if defined(__arm64__) +#define TARGET_CPU "arm64" #elif defined(__x86_64__) #define TARGET_CPU "x86_64" #else diff --git a/ext/rakefile.rb b/ext/rakefile.rb index d7789bd..810c0ca 100644 --- a/ext/rakefile.rb +++ b/ext/rakefile.rb @@ -38,12 +38,16 @@ $CCVersion = `#{$CC} --version | head -n 1`.strip - CLEAN.include OBJ.map(&:to_s) CLEAN.include $obj_dir.join('Info.plist').to_s CLEAN.include $obj_dir.join('fsevent_watch').to_s CLOBBER.include $final_exe.to_s +task :determine_arch_type do + return if ENV['ARCHFLAGS'] + # replace archflags if we're on apple silicon + $ARCHFLAGS = '-arch arm64 -arch x86_64' if $arch == 'arm64' +end task :sw_vers do $mac_product_version = `sw_vers -productVersion`.strip @@ -84,22 +88,17 @@ end end -desc 'set build arch to ppc' -task :ppc do - $ARCHFLAGS = '-arch ppc' -end - desc 'set build arch to x86_64' task :x86_64 do $ARCHFLAGS = '-arch x86_64' end -desc 'set build arch to i386' -task :x86 do - $ARCHFLAGS = '-arch i386' +desc 'set build arch to arm64' +task :arm64 do + $ARCHFLAGS = '-arch arm64' end -task :setup_env => [:set_build_type, :sw_vers, :get_sdk_info] +task :setup_env => [:set_build_type, :determine_arch_type, :sw_vers, :get_sdk_info] directory $obj_dir.to_s file $obj_dir.to_s => :setup_env diff --git a/lib/rb-fsevent/version.rb b/lib/rb-fsevent/version.rb index 0f4a54b..6b18bf3 100644 --- a/lib/rb-fsevent/version.rb +++ b/lib/rb-fsevent/version.rb @@ -1,5 +1,5 @@ # -*- encoding: utf-8 -*- class FSEvent - VERSION = '0.10.4' + VERSION = '0.11.0' end