diff options
| author | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2013-01-23 16:52:13 +0000 |
|---|---|---|
| committer | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2013-01-23 16:52:13 +0000 |
| commit | 59a9567472dfdad14892a938fd6f2a8409fc5600 (patch) | |
| tree | 5f242a6cb399c73e44c81b109fa04ea53b9995c0 | |
| parent | 8521509deb78bca6805c01c7bc9cfa0cbe1d0f6c (diff) | |
make cyclone's build system also use PD_INCLUDE like the template
svn path=/trunk/externals/miXed/; revision=16980
| -rw-r--r-- | Makefile.common | 2 | ||||
| -rw-r--r-- | cyclone/Makefile.libdir | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.common b/Makefile.common index 2921ed4..1af1db7 100644 --- a/Makefile.common +++ b/Makefile.common @@ -85,7 +85,7 @@ OUT_DIR = $(if $($1_SUBDIR),$(BIN_DIR)/$($1_SUBDIR),$(BIN_DIR)) BASE_DIR = $(shell basename `pwd`) BASE_NAME = $(shell basename `pwd` | awk -F - '{print $$1}') -INCLUDES = -I . -I $(PD_DIR) -I $(SHARED_DIR) +INCLUDES = -I. -I$(PD_DIR) -I$(SHARED_DIR) -I"$(PD_INCLUDE)" ifdef CAML_TYPES include $(ROOT_DIR)/Makefile.caml diff --git a/cyclone/Makefile.libdir b/cyclone/Makefile.libdir index 9b6d756..f522077 100644 --- a/cyclone/Makefile.libdir +++ b/cyclone/Makefile.libdir @@ -12,6 +12,9 @@ INSTALL_PROGRAM = $(INSTALL) -p -m 755 INSTALL_DATA = $(INSTALL) -p -m 644 INSTALL_DIR = $(INSTALL) -p -m 755 -d +CFLAGS += -I"$(PD_INCLUDE)" +PD_INCLUDE = $(PD_PATH)/include/pd + UNAME := $(shell uname -s) ifeq ($(UNAME),Darwin) CPU := $(shell uname -p) @@ -112,7 +115,7 @@ ifeq (MINGW,$(findstring MINGW,$(UNAME))) endif cyclone: - $(MAKE) -f Makefile \ + $(MAKE) -f Makefile PD_INCLUDE="$(PD_INCLUDE)" \ OPT_CFLAGS="-O6 -funroll-loops -fomit-frame-pointer -fno-strict-aliasing -Wstrict-aliasing=2 -fPIC" install: cyclone |