cxx 0.1.12 → 0.1.13

data/lib/cxx.rb

@@ -32,12 +32,6 @@ module Cxx
         @projects = projects.to_a
       end
 
-      # TODO: this should be cleaned up somehow...
-      if Cxxproject::Utils::OS.linux?
-        toolchain[:LINKER][:LIB_PREFIX_FLAGS] = "-Wl,--whole-archive"
-        toolchain[:LINKER][:LIB_POSTFIX_FLAGS] = "-Wl,--no-whole-archive"
-      end
-
       Rake::application.deriveIncludes = true
 
       initialize_logging(build_dir)

data/lib/cxx/eval_context.rb

@@ -77,9 +77,9 @@ module Cxx
     # * :output_dir
     def source_lib(name, hash)
       raise "not a hash" unless hash.is_a?(Hash)
-      check_hash(hash,[:sources, :includes, :dependencies, :toolchain, :file_dependencies, :output_dir])
+      check_hash(hash, [:sources, :includes, :dependencies, :toolchain, :file_dependencies, :output_dir, :whole_archive])
       raise ":sources need to be defined" unless hash.has_key?(:sources)
-      bblock = Cxxproject::SourceLibrary.new(name)
+      bblock = Cxxproject::SourceLibrary.new(name, hash[:whole_archive])
       bblock.set_sources(hash[:sources])
       bblock.set_includes(get_as_array(hash, :includes)) if hash.has_key?(:includes)
       bblock.set_tcs(hash[:toolchain]) if hash.has_key?(:toolchain)
@@ -92,6 +92,14 @@ module Cxx
       all_blocks << bblock
     end
 
+    def bin_lib(name, hash={})
+      raise "not a hash" unless hash.is_a?(Hash)
+      check_hash(hash, [:includes, :lib_path])
+      bblock = Cxxproject::BinaryLibrary.new(name)
+      bblock.set_includes(get_as_array(hash, :includes)) if hash.has_key?(:includes)
+      bblock.add_lib_element(Cxxproject::HasLibraries::SEARCH_PATH, hash[:lib_path], true) if hash.has_key?(:lib_path)
+    end
+
     # specify some binary libs
     # returns all binary libs as array
     def bin_libs(*names)

data/lib/cxx/version.rb

@@ -1,4 +1,4 @@
 module Cxx
-  VERSION = "0.1.12"
+  VERSION = '0.1.13'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cxx
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-06 00:00:00.000000000 Z
+date: 2012-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cxxproject