From 95fdd54e53171f33b1b716fddb9ac63d9a116e30 Mon Sep 17 00:00:00 2001 From: Oliver Bock <oliver.bock@aei.mpg.de> Date: Tue, 13 Sep 2011 15:41:53 +0200 Subject: [PATCH] Updated AMD APPSDK environment settings/defaults --- example/Makefile | 6 +++--- src/Makefile | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/example/Makefile b/example/Makefile index 174404b..f6ddddc 100644 --- a/example/Makefile +++ b/example/Makefile @@ -1,10 +1,10 @@ PWD = $(shell pwd) NVIDIA_SDK_INSTALL_PATH ?= /usr/local/cuda -ATISTREAMSDKROOT ?= /usr/local/ati +AMDAPPSDKROOT ?= /opt/AMDAPP TARGET = clfft_example -CXXFLAGS += -O3 -Wall -g -I$(NVIDIA_SDK_INSTALL_PATH)/OpenCL/common/inc -I$(ATISTREAMSDKROOT)/include -I../include +CXXFLAGS += -O3 -Wall -g -I$(NVIDIA_SDK_INSTALL_PATH)/OpenCL/common/inc -I$(AMDAPPSDKROOT)/include -I../include LDFLAGS += $(PWD)/../lib/libclfft.a OS = $(shell uname -s) @@ -13,7 +13,7 @@ ifeq ($(OS), Darwin) LDFLAGS += -framework OpenCL LDFLAGS += -framework Accelerate else - LDFLAGS += -L$(ATISTREAMSDKROOT)/lib/$(ARCH) + LDFLAGS += -L$(AMDAPPSDKROOT)/lib/$(ARCH) LDFLAGS += -lOpenCL endif diff --git a/src/Makefile b/src/Makefile index c028118..9cc085a 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,9 +1,9 @@ NVIDIA_SDK_INSTALL_PATH ?= /usr/local/cuda -ATISTREAMSDKROOT ?= /usr/local/ati +AMDAPPSDKROOT ?= /opt/AMDAPP TARGET = libclfft.a -CXXFLAGS += -O3 -Wall -g -I$(NVIDIA_SDK_INSTALL_PATH)/OpenCL/common/inc -I$(ATISTREAMSDKROOT)/include -I../include +CXXFLAGS += -O3 -Wall -g -I$(NVIDIA_SDK_INSTALL_PATH)/OpenCL/common/inc -I$(AMDAPPSDKROOT)/include -I../include OS = $(shell uname -s) ifeq ($(OS), Darwin) CXXFLAGS += -I/System/Library/Frameworks -- GitLab