app.libs is now a Hash (key is architecture)

HipByte · Aug 12, 2015 · 1bee57a · 1bee57a
1 parent 7fb36c6
commit 1bee57a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/motion/project/template/android.rb b/lib/motion/project/template/android.rb
@@ -353,7 +353,7 @@
       App.info 'Create', libpayload_path
       FileUtils.mkdir_p(File.dirname(libpayload_path))
       sh "#{App.config.cc} #{App.config.cflags(arch)} -c \"#{payload_c}\" -o \"#{payload_o}\""
-      sh "#{App.config.cxx} #{App.config.ldflags(arch)} \"#{payload_o}\" #{ruby_objs.map { |o, _| "\"" + o + "\"" }.join(' ')} -o \"#{libpayload_path}\" #{App.config.ldlibs_pre(arch)} #{App.config.libs.join(' ')} #{App.config.ldlibs_post(arch)}"
+      sh "#{App.config.cxx} #{App.config.ldflags(arch)} \"#{payload_o}\" #{ruby_objs.map { |o, _| "\"" + o + "\"" }.join(' ')} -o \"#{libpayload_path}\" #{App.config.ldlibs_pre(arch)} #{App.config.libs[App.config.armeabi_directory_name(arch)].join(' ')} #{App.config.ldlibs_post(arch)}"
     end
 
     # Copy the gdb server.

diff --git a/lib/motion/project/template/android/config.rb b/lib/motion/project/template/android/config.rb
@@ -120,7 +120,7 @@ def initialize(project_dir, build_mode)
       @application_class = nil
       @theme = "@android:style/Theme.Holo"
       @vm_debug_logs = false
-      @libs = []
+      @libs = Hash.new([])
 
       if Motion::Project::Config.evaluation?
         @archs = ['x86']