mcbuild 0.0.20 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b80f613f68e560197d7899581224a133e145e72
-  data.tar.gz: f0a804299d1c9638b16bea67f6727ea12feee00b
+  metadata.gz: 599ebcf5fb1a22decc4ed9c16cb970ab6a5a7196
+  data.tar.gz: 3f32fed9a52705a080ee18d5083c37b9d3242154
 SHA512:
-  metadata.gz: 515d1ca6c34105a29e9726efe680170262914ec662c2a7835394721382c11a48e306de88a3963f02c540844eb225a3da56d7f46a3e687831b13ba69cb21f593b
-  data.tar.gz: 999cd1576866712678a0b8d993dd53be25fbcbbf94ff9e6a36b8c654d0835a67b3aee1ae197ae60b7333c2544025b59c0fe646466496975714325a0ad0bd5575
+  metadata.gz: de764a8d147f0fdc176bb18796e9192639210d4e254314b93ab21db18561894f9aa1fa0e97108a1a50c483ec61be9b1e5d6f45ca84be6438a5f08b6a2e7d672c
+  data.tar.gz: 9b5ea6411442dcb062f0624bd63e48b3f4d5804a7df0756e21ead6dc200bc932d4d01bf985c8101557bd9507d127730665a7b15bff72f3e45929b07363a284c7

data/lib/mcbuild.rb

@@ -2,6 +2,17 @@
 require 'find'
 require 'fileutils'
 
+class MCTarget
+	def self.RaspberryPi2
+		#'armv7l-unknown-linux-gnueabihf'
+		'arm-eabi -marm -mfpu=vfp -mcpu=arm1176jzf-s -mtune=arm1176jzf-s -mfloat-abi=hard'
+	end
+
+	def self.MacOS
+		'x86_64-apple-darwin'
+	end
+end
+
 class MCConfig
 	def self.support_machines
 		['x86_64', 'armv6', 'armv7', 'armv7s', 'arm64']
@@ -107,7 +118,8 @@ class MCBuild
 	end
 
 	def initialize(dir)
-		@mach = MCBuild.detect_machine
+		@target = ''
+		@mach = ''
 		@flags = MCBuild.detect_machine_macro
 
 		@d = remove_slash(dir)
@@ -168,6 +180,11 @@ class MCBuild
 		self
 	end
 
+	def set_target(target)
+		@target = target
+		self
+	end
+
 	def set_arch(arch)
 		@mach = arch
 		self
@@ -196,7 +213,7 @@ class MCBuild
 	def info
 		puts "Monk-C compiler use settings:"
 		puts "--------------------------------"
-		puts "           CPU Arch -> #{@mach}"
+		puts "         CPU target -> #{@target}"
 		puts "         C standard -> #{@std}"
 		puts "               name -> #{@name}"
 		puts " filename extension -> #{@fext}"
@@ -286,14 +303,35 @@ class MCBuild
 		self
 	end
 
-	def compile_file(file)
-		base = File.basename(file, ".c")
+	def compiler_command
 		cmd = "cc"
+		if @target != ''
+			cmd += " -target #{@target}"
+		end
 		if @mach != ''
 			cmd += " -arch #{@mach}"
 		end
 		cmd += " -std=#{@std}"
 		cmd += " #{@flags}"
+		cmd
+	end
+
+	def linker_command
+		cmd = "cc"
+		if @target != ''
+			cmd += " -target #{@target}"
+		end
+		if @mach != ''
+			cmd += " -arch #{@mach}"
+		end
+		#cmd += " -std=#{@std}"
+		#cmd += " #{@flags}"
+		cmd
+	end
+
+	def compile_file(file)
+		base = File.basename(file, ".c")
+		cmd = compiler_command
 		cmd += " -c -o #{@d}/#{@outpath}/#{base}#{@oext} #{file} #{@compile_arg}"
 		puts(cmd)
 		system(cmd)
@@ -329,7 +367,8 @@ class MCBuild
 	end
 
 	def archive_exe
-		cmd = "cc -o #{@d}/#{@outpath}/archive/#{@name} #{@d}/#{@outpath}/*#{@oext} #{@link_arg}"
+		cmd = linker_command
+		cmd += " -o #{@d}/#{@outpath}/archive/#{@name} #{@d}/#{@outpath}/*#{@oext} #{@link_arg}"
 		puts(cmd)
 		system(cmd)
 		self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mcbuild
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.25
 platform: ruby
 authors:
 - Sun Yuli