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

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

5 files changed, 95 insertions, 95 deletions

diff --git a/iemlib2/src/makefile_d_fat b/iemlib2/src/makefile_d_fat
index 11701ad..e64382d 100644
--- a/iemlib2/src/makefile_d_fat
+++ b/iemlib2/src/makefile_d_fat
@@ -1,17 +1,17 @@
-current: all

-

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

-

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

-

-CFLAGS =-DPD -O2 -Wall -W -Wshadow -Wstrict-prototypes \
-        -Wno-unused -Wno-parentheses -Wno-switch

-

-LFLAGS = -bundle -undefined suppress -flat_namespace

-

-# the sources

+PD_INSTALL_PATH ?= "/Applications/Pd.app/Contents/Resources"
+
+INCLUDE = -I. -I$(PD_INSTALL_PATH)/src
+
+CFLAGS =-DPD -DHAVE_G_CANVAS_H -O2 -Wall -W -Wshadow -Wstrict-prototypes \
+        -Wno-unused -Wno-parentheses -Wno-switch
+
+LFLAGS = -bundle -undefined suppress -flat_namespace
+
+# the sources
 
 SRC = 	add2_comma.c \
 	aspeedlim.c \
@@ -58,24 +58,24 @@ SRC = 	add2_comma.c \
 TARGET = iemlib2.d_fat
 
 
-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) -arch i386 -arch ppc $(LFLAGS) -o $(TARGET) *.o
-	strip -S -x $(TARGET)

-	mv $(TARGET) ..

-

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

-	touch $*.c

+	strip -S -x $(TARGET)
+	mv $(TARGET) ..
+
+$(OBJ) : %.o : %.c
+	touch $*.c
 	$(CC) -arch i386 -arch ppc $(CFLAGS) $(INCLUDE) -c -o $*.o $*.c
 
 
diff --git a/iemlib2/src/makefile_d_ppc b/iemlib2/src/makefile_d_ppc
index f9b6e25..27356de 100644
--- a/iemlib2/src/makefile_d_ppc
+++ b/iemlib2/src/makefile_d_ppc
@@ -1,17 +1,17 @@
-current: all

-

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

-

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

-

-CFLAGS =-DPD -O2 -Wall -W -Wshadow -Wstrict-prototypes \
-        -Wno-unused -Wno-parentheses -Wno-switch

-

-LFLAGS = -bundle -undefined suppress -flat_namespace

-

-# the sources

+PD_INSTALL_PATH = "/Applications/Pd.app/Contents/Resources"
+
+INCLUDE = -I. -I$(PD_INSTALL_PATH)/src
+
+CFLAGS =-DPD -DHAVE_G_CANVAS_H -O2 -Wall -W -Wshadow -Wstrict-prototypes \
+        -Wno-unused -Wno-parentheses -Wno-switch
+
+LFLAGS = -bundle -undefined suppress -flat_namespace
+
+# the sources
 
 SRC = 	add2_comma.c \
 	aspeedlim.c \
@@ -58,24 +58,24 @@ SRC = 	add2_comma.c \
 TARGET = iemlib2.d_ppc
 
 
-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) $(LFLAGS) -o $(TARGET) *.o
-	strip -S -x $(TARGET)

-	mv $(TARGET) ..

-

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

-	touch $*.c

+	strip -S -x $(TARGET)
+	mv $(TARGET) ..
+
+$(OBJ) : %.o : %.c
+	touch $*.c
 	$(CC) $(CFLAGS) $(INCLUDE) -c -o $*.o $*.c
 
 
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
 
 
 
diff --git a/iemlib2/src/makefile_linux b/iemlib2/src/makefile_linux
index a806606..e7a28ee 100644
--- a/iemlib2/src/makefile_linux
+++ b/iemlib2/src/makefile_linux
@@ -9,7 +9,7 @@ LIB = -ldl -lm -lpthread
 
 #select either the DBG and OPT compiler flags below:
 
-CFLAGS = -DPD -DUNIX -W -Werror -Wno-unused \
+CFLAGS = -DPD -DHAVE_G_CANVAS_H -DUNIX -W -Werror -Wno-unused \
 	-Wno-parentheses -Wno-switch -O6 -funroll-loops -fomit-frame-pointer -fno-strict-aliasing \
         -DDL_OPEN -fPIC
 
diff --git a/iemlib2/src/makefile_win b/iemlib2/src/makefile_win
index 11f37b1..fe2a0ac 100644
--- a/iemlib2/src/makefile_win
+++ b/iemlib2/src/makefile_win
@@ -4,7 +4,7 @@ all: ..\$(TARGET).dll
 VIS_CPP_PATH = "C:\Programme\Microsoft Visual Studio\Vc98"

 PD_INST_PATH = "C:\Programme\pd"

 PD_WIN_INCLUDE_PATH = /I. /I$(PD_INST_PATH)\src /I$(VIS_CPP_PATH)\include

-PD_WIN_C_FLAGS = /nologo /W3 /WX /DMSW /DNT /DPD /DWIN32 /DWINDOWS /Ox -DPA_LITTLE_ENDIAN

+PD_WIN_C_FLAGS = /nologo /W3 /WX /DMSW /DNT /DPD /DWIN32 /DWINDOWS /DHAVE_G_CANVAS_H /Ox -DPA_LITTLE_ENDIAN

 PD_WIN_L_FLAGS = /nologo

 

 PD_WIN_LIB = /NODEFAULTLIB:libc /NODEFAULTLIB:oldnames /NODEFAULTLIB:kernel /NODEFAULTLIB:uuid \