lib/extensions/rawsensors/ext/rawsensors/platform/android/Rakefile in rhodes-3.5.1.12 vs lib/extensions/rawsensors/ext/rawsensors/platform/android/Rakefile in rhodes-5.5.0
- old
+ new
@@ -3,37 +3,23 @@
def build_extension(name, arch, src_files)
objects = []
mkdir_p $tempdir unless File.exists? $tempdir
- use_own_stlport = false
- $std_includes = File.join ENV['ANDROID_NDK'], "sources", "cxx-stl", "stlport", "stlport"
- unless File.directory? $std_includes
- $stlport_includes = "#{$rootdir}/platform/shared/stlport/stlport"
- use_own_stlport = true
- end
-
- #Dir.glob("*.c").each do |f|
src_files.each do |f|
objname = File.join( $tempdir, File.basename( f.gsub(/\.c$/, '.o') ) )
objects << ('"'+objname+'"')
args = []
args << "-I."
args << "-I\"#{$rootdir}/platform/android/Rhodes/jni/include\""
args << "-I\"#{$rootdir}/platform/shared/ruby/include\""
args << "-I\"#{$rootdir}/platform/shared\""
args << "-I\"#{$rootdir}/platform/shared/common\""
-
- args << "-I\"#{$std_includes}\"" unless $std_includes.nil?
- args << "-D__NEW__" if use_own_stlport
- args << "-I\"#{$stlport_includes}\"" if use_own_stlport
-
args << "-I\"#{$rootdir}/platform/shared/ruby/android\""
args << "-I\"#{$rootdir}/platform/shared/ruby/generated\""
cc_compile f, $tempdir, args or exit 1
-
end
mkdir_p $targetdir unless File.exist? $targetdir
cc_ar ('"'+File.join( $targetdir, 'lib' + name + '.a' )+'"'), Dir.glob($tempdir + "/**/*.o").collect{|x| '"'+x+'"'} or exit 1