Updated extconf to include devLib and find headers

testos77 · Mar 12, 2016 · 6372e30 · 6372e30
1 parent b736413
commit 6372e30
Showing 1 changed file with 26 additions and 2 deletions.
diff --git a/ext/wiringpi/extconf.rb b/ext/wiringpi/extconf.rb
@@ -1,8 +1,32 @@
 require 'mkmf'
 
+LIBDIR      = RbConfig::CONFIG['libdir']
+INCLUDEDIR  = RbConfig::CONFIG['includedir']
+
 $srcs = Dir.glob('WiringPi/wiringPi/*.c')
-$objs = $srcs.map{ |file| file.sub('.c','.o') }
+$srcs += Dir.glob('WiringPi/devLib/*.c')
 $srcs << 'wiringpi_wrap.c'
-$objs << 'wiringpi_wrap.o'
+
+$srcs -= ['WiringPi/devLib/piFaceOld.c']
+
+$objs = $srcs.map{ |file| file.sub('.c','.o') }
+
+HEADER_DIRS = [
+  './WiringPi/wiringPi',
+  './WiringPi/devLib',
+  '/usr/local/include',
+  INCLUDEDIR,
+  '/usr/include',
+]
+
+LIB_DIRS = [
+  './WiringPi/wiringPi',
+  './WiringPi/devLib',
+  '/usr/local/lib',
+  LIBDIR,
+  '/usr/lib',
+]
+
+dir_config('wiringpi', HEADER_DIRS, LIB_DIRS)
 
 create_makefile('wiringpi/wiringpi')