From d844c9dd1ffc875cca7b617987d3d3cbd3330739 Mon Sep 17 00:00:00 2001 From: beyondcoast Date: Thu, 20 Dec 2018 07:48:49 -0600 Subject: [PATCH] Make Linux and OS X aliases for Unix build, which will work for both. --- host/Makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/host/Makefile b/host/Makefile index 01ad3b2..b25d43a 100644 --- a/host/Makefile +++ b/host/Makefile @@ -1,6 +1,6 @@ #compiler flags: -Wall Warnings all, -g gdb debug markings, CFLAGS=-Wall -O -LDFLAGS= -llua -lusb-1.0 -Lsource/lua -lm +LDFLAGS= -llua -lusb-1.0 -Lsource/lua INCLUDE= -I ./include -I ../shared LDFLAGS_WINDOWS= -L ./winlib $(LDFLAGS) LDFLAGS_UNIX= -lm $(LDFLAGS) @@ -20,6 +20,8 @@ DEPS=$(OBJECTS:.o=.d) %.o: %.c $(CC) $(CFLAGS) $(INCLUDE) -o $@ -c $< +.PHONY: clean linux osx + # TODO: Pass through platform when building liblua. liblua: $(MAKE) -C source/lua a @@ -35,8 +37,9 @@ all: liblua $(DEPS) $(OBJECTS) unix: liblua $(DEPS) $(OBJECTS) $(CC) $(INCLUDE) $(OBJECTS) -o $(TARGET) $(CFLAGS) $(LDFLAGS_UNIX) -linux: - gcc source/inlprog.c source/usb_operations.c -o inlretro -lusb-1.0 -lm -L lua include +# Convienience in case its not clear Unix really means not-Windows. +linux: unix +macosx: unix # "make debug" will build program with debug print messages # -DDEBUG show debug logs @@ -49,7 +52,7 @@ unixdebug: CFLAGS += -DDEBUG -g unixdebug: unix #clean on unix and windows(.exe) -.PHONY: clean + clean: $(MAKE) -C source/lua clean rm -f $(TARGET) $(TARGET).exe $(OBJECTS) $(DEPS) $(LUAOBJ) source/lua/liblua.a