Merge pull request #167 from tmpvar/simulator-mac

Fix sim makefile so it works on mac
This commit is contained in:
Sonny Jeon 2013-01-18 09:12:03 -08:00
commit 8a1720e1a1
2 changed files with 11 additions and 13 deletions

1
sim/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
grbl_sim.exe

View File

@ -15,13 +15,10 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with Grbl. If not, see <http://www.gnu.org/licenses/>. # along with Grbl. If not, see <http://www.gnu.org/licenses/>.
OBJECTS = main.o simulator.o runtime.o ../protocol.o ../planner.o ../settings.o ../print.o ../nuts_bolts.o eeprom.o serial.o avr\pgmspace.o avr\interrupt.o util\delay.o util\floatunsisf.o ../stepper.o ../gcode.o ../spindle_control.o ../motion_control.o ../limits.o ../report.o ../coolant_control.o OBJECTS = main.o simulator.o runtime.o ../protocol.o ../planner.o ../settings.o ../print.o ../nuts_bolts.o eeprom.o serial.o avr/pgmspace.o avr/interrupt.o util/delay.o util/floatunsisf.o ../stepper.o ../gcode.o ../spindle_control.o ../motion_control.o ../limits.o ../report.o ../coolant_control.o
CLOCK = 16000000 CLOCK = 16000000
EXE_NAME= grbl_sim.exe EXE_NAME = grbl_sim.exe
COMPILER= C:\MinGW\bin\gcc.exe COMPILE = $(CC) -Wall -Os -DF_CPU=$(CLOCK) -include config.h -I.
COMPILE = $(COMPILER) -Wall -Os -DF_CPU=$(CLOCK) -include config.h -I.
# symbolic targets: # symbolic targets:
all: main all: main
@ -33,15 +30,15 @@ clean:
# file targets: # file targets:
main: $(OBJECTS) main: $(OBJECTS)
$(COMPILE) -o $(EXE_NAME) $(OBJECTS) -lm -Wl,--gc-sections $(COMPILE) -o $(EXE_NAME) $(OBJECTS) -lm
%.o: %.c %.o: %.c
$(COMPILE) -c $< -o $@ $(COMPILE) -c $< -o $@
../protocol.o: ../protocol.c ../protocol.o: ../protocol.c
$(COMPILE) -include rename_execute_runtime.h -c $< -o $@ $(COMPILE) -include rename_execute_runtime.h -c $< -o $@
../planner.o: ../planner.c ../planner.o: ../planner.c
$(COMPILE) -include planner_inject_accessors.c -c $< -o $@ $(COMPILE) -include planner_inject_accessors.c -c $< -o $@