From 412d6126f2dde6d354a7a4e5755a1c929bdbde3f Mon Sep 17 00:00:00 2001 From: Laurent Sansonetti Date: Sat, 10 Dec 2011 22:50:24 +0100 Subject: [PATCH] add 'libs' config variable --- lib/motion/project/builder.rb | 2 +- lib/motion/project/config.rb | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/motion/project/builder.rb b/lib/motion/project/builder.rb index 4b4e2a5d..69037aac 100644 --- a/lib/motion/project/builder.rb +++ b/lib/motion/project/builder.rb @@ -162,7 +162,7 @@ EOS stubs_obj = File.join(datadir, platform, "#{framework}_stubs.o") framework_stubs_objs << "\"#{stubs_obj}\"" if File.exist?(stubs_obj) end - sh "#{cxx} -o \"#{main_exec}\" #{objs_list} #{arch_flags} #{framework_stubs_objs.join(' ')} -isysroot \"#{sdk}\" -miphoneos-version-min=#{config.sdk_version} -L#{File.join(datadir, platform)} -lmacruby-static -lobjc -licucore #{frameworks} #{vendor_libs.map { |x| '-force_load ' + x }.join(' ')}" + sh "#{cxx} -o \"#{main_exec}\" #{objs_list} #{arch_flags} #{framework_stubs_objs.join(' ')} -isysroot \"#{sdk}\" -miphoneos-version-min=#{config.sdk_version} -L#{File.join(datadir, platform)} -lmacruby-static -lobjc -licucore #{frameworks} #{config.libs.join(' ')} #{vendor_libs.map { |x| '-force_load ' + x }.join(' ')}" # Create bundle/Info.plist. bundle_info_plist = File.join(bundle_path, 'Info.plist') diff --git a/lib/motion/project/config.rb b/lib/motion/project/config.rb index d5c3a695..fd53c40f 100644 --- a/lib/motion/project/config.rb +++ b/lib/motion/project/config.rb @@ -24,7 +24,7 @@ module Motion; module Project end end - variable :files, :platforms_dir, :sdk_version, :frameworks, + variable :files, :platforms_dir, :sdk_version, :frameworks, :libs, :delegate_class, :name, :build_dir, :resources_dir, :identifier, :codesign_certificate, :provisioning_profile, :device_family, :interface_orientations, :version, :icons, :seed_id, @@ -36,6 +36,7 @@ module Motion; module Project @dependencies = {} @platforms_dir = '/Developer/Platforms' @frameworks = ['UIKit', 'Foundation', 'CoreGraphics'] + @libs = [] @delegate_class = 'AppDelegate' @name = 'Untitled' @resources_dir = File.join(project_dir, 'resources')