X-Git-Url: http://git.hcoop.net/clinton/Smoothieware.git/blobdiff_plain/7ac25bc69f032ee6dcdf50322d964523808c4584..922f169dba03c9f249a0746dbab0efde0ad10dc1:/Rakefile

diff --git a/Rakefile b/Rakefile
index 5213d6b0..1e7536c3 100644
--- a/Rakefile
+++ b/Rakefile
@@ -97,8 +97,6 @@ unless defined? NONETWORK
 end
 
 # list of modules to exclude, include directory it is in
-EXCLUDE_MODULES= %w(tools/touchprobe) unless defined? EXCLUDE_MODULES
-
 # e.g for a CNC machine
 #EXCLUDE_MODULES = %w(tools/touchprobe tools/laser tools/temperaturecontrol tools/extruder)
 
@@ -114,6 +112,16 @@ else
   nonetwork= false
 end
 
+# see if CNC build
+if ENV['CNC'] || CNC
+  cnc= true
+  excludes << 'panel\/screens\/3dprinter'
+  puts "CNC build"
+else
+  excludes << 'panel\/screens\/cnc'
+  cnc= false
+end
+
 if TESTING
   # add modules to be tested here
   TESTMODULES= %w(tools/temperatureswitch) unless defined? EXCLUDE_MODULES
@@ -193,6 +201,7 @@ defines += MRI_DEFINES
 defines << "-DDEFAULT_SERIAL_BAUD_RATE=#{DEFAULT_SERIAL_BAUD_RATE}"
 defines << '-DDEBUG' if OPTIMIZATION == 0
 defines << '-DNONETWORK' if nonetwork
+defines << '-DCNC' if cnc
 
 DEFINES= defines.join(' ')
 
@@ -286,7 +295,7 @@ file "#{PROG}.bin" => ["#{PROG}.elf"] do
 end
 
 file "#{PROG}.elf" => OBJ do |t|
-  puts "Linking #{t.source}"
+  puts "Linking"
   sh "#{LD} #{LDFLAGS} #{OBJ} #{LIBS}  -o #{OBJDIR}/#{t.name}"
 end