fixed conflict in the compile script

diff --cc scripts/compile.pl
index 39bb2b4570baccb3e159fa6ad9fa66815042d935,8f74a9f340928cb96345f0d39b7eef98bbe38abb..bcdf1f007e7e3ea7b69ea47fffa954cd26703406
--- 1/scripts/compile.pl
--- 2/scripts/compile.pl
+++ b/scripts/compile.pl
@@@ -111,13 -112,21 +112,23 @@@ system("ln -sfT $lattice_path $WORKDIR/
  #create full lpf file
  print GREEN, "Generating constraints file...\n\n", RESET;
  system("cp ../pinout/$TOPNAME.lpf $WORKDIR/$TOPNAME.lpf");
- system("cat ../tdc_release/trbnet_constraints.lpf >> $WORKDIR/$TOPNAME.lpf");
- system("cat ../tdc_release/tdc_constraints_64.lpf >> $WORKDIR/$TOPNAME.lpf");
- system("cat ../tdc_release/unimportant_lines_constraints.lpf >> $WORKDIR/$TOPNAME.lpf");
++
+ system("cat ../pinout/basic_constraints.lpf >> $WORKDIR/$TOPNAME.lpf");
+ 
+ if($include_TDC) {
+   system("cat ../tdc_release/trbnet_constraints.lpf >> $WORKDIR/$TOPNAME.lpf");
 -  system("cat ../tdc_release/tdc_constraints_script.lpf >> $WORKDIR/$TOPNAME.lpf");
++  system("cat ../tdc_release/tdc_constraints_64.lpf >> $WORKDIR/$TOPNAME.lpf");
+   system("cat ../tdc_release/unimportant_lines_constraints.lpf >> $WORKDIR/$TOPNAME.lpf");
+   }
+ if($include_GBE) {
+ 
+   }
  
  #copy delay line to project folder
- system("rm $WORKDIR/Adder_304.ngo");
- system("ln -s ../../../tdc/base/cores/ecp3/TDC/Adder_304.ngo $WORKDIR/Adder_304.ngo");
+ if($include_TDC) {
 -  system("ln -fs ../tdc_release/Adder_304.ngo $WORKDIR/");
++  system("rm $WORKDIR/Adder_304.ngo");
++  system("ln -s ../../../tdc/base/cores/ecp3/TDC/Adder_304.ngo $WORKDIR/Adder_304.ngo");
+   }
  
  #generate timestamp
  my $t=time;

diff --cc template/trb3sc_basic.prj
Simple merge