added "-DHAVE_G_CANVAS_H"; unix-linebreaks for unix-makefiles

svn path=/trunk/externals/iemlib/; revision=14880

1 files changed, 35 insertions, 35 deletions

diff --git a/iemlib2/src/makefile_darwin b/iemlib2/src/makefile_darwin
index 6b455cf..eef0bcc 100644
--- a/iemlib2/src/makefile_darwin
+++ b/iemlib2/src/makefile_darwin
@@ -1,22 +1,22 @@
-current: all

-

+current: all
+
 .SUFFIXES: .pd_darwin
 
-PD_INSTALL_PATH = "/Applications/Pd.app/Contents/Resources"

-

-INCLUDE = -I. -I$(PD_INSTALL_PATH)/src

-

-LIB = -ldl -lm -lpthread

-

-CFLAGS = -DPD -DUNIX -g -Wall -W -Werror -Wno-unused \

-	-Wno-parentheses -Wno-switch -O2 -fno-strict-aliasing \

-	$(INCLUDE) $(UCFLAGS) $(AFLAGS) \

-

-MACOSXLINKFLAGS = -bundle -bundle_loader $(PD_INSTALL_PATH)/bin/pd

-

-SYSTEM = $(shell uname -m)

-

-# the sources

+PD_INSTALL_PATH = "/Applications/Pd.app/Contents/Resources"
+
+INCLUDE = -I. -I$(PD_INSTALL_PATH)/src
+
+LIB = -ldl -lm -lpthread
+
+CFLAGS = -DPD -DUNIX -DHAVE_G_CANVAS_H -g -Wall -W -Werror -Wno-unused \
+	-Wno-parentheses -Wno-switch -O2 -fno-strict-aliasing \
+	$(INCLUDE) $(UCFLAGS) $(AFLAGS) \
+
+MACOSXLINKFLAGS = -bundle -bundle_loader $(PD_INSTALL_PATH)/bin/pd
+
+SYSTEM = $(shell uname -m)
+
+# the sources
 
 SRC = 	add2_comma.c \
 	aspeedlim.c \
@@ -63,25 +63,25 @@ SRC = 	add2_comma.c \
 TARGET = iemlib2.pd_darwin
 
 
-OBJ = $(SRC:.c=.o) 

-

-#

-#  ------------------ targets ------------------------------------

-#

-

-clean:

-	rm ../$(TARGET)

-	rm *.o

-

-all: $(OBJ)

-	@echo :: $(OBJ)

+OBJ = $(SRC:.c=.o) 
+
+#
+#  ------------------ targets ------------------------------------
+#
+
+clean:
+	rm ../$(TARGET)
+	rm *.o
+
+all: $(OBJ)
+	@echo :: $(OBJ)
 	$(CC) $(MACOSXLINKFLAGS) -o $(TARGET) *.o $(LIB)
-	strip -S -x $(TARGET)

-	mv $(TARGET) ..

-

-$(OBJ) : %.o : %.c

-	touch $*.c

-	$(CC) $(CFLAGS) -DPD $(INCLUDE) -c -o $*.o $*.c
+	strip -S -x $(TARGET)
+	mv $(TARGET) ..
+
+$(OBJ) : %.o : %.c
+	touch $*.c
+	$(CC) $(CFLAGS) $(INCLUDE) -c -o $*.o $*.c