From 214ec2d892883303d32078bf128c43558a92bb66 Mon Sep 17 00:00:00 2001 From: Oliver Bock <oliver.bock@aei.mpg.de> Date: Tue, 24 Jul 2012 16:07:52 +0200 Subject: [PATCH] Allow overriding of default build tools --- example/Makefile | 3 ++- example/Makefile.mingw | 3 ++- src/Makefile | 10 ++++++---- src/Makefile.mingw | 10 ++++++---- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/example/Makefile b/example/Makefile index 28ab001..9fc9cf5 100644 --- a/example/Makefile +++ b/example/Makefile @@ -1,6 +1,7 @@ PWD = $(shell pwd) NVIDIA_SDK_INSTALL_PATH ?= /usr/local/cuda AMDAPPSDKROOT ?= /opt/AMDAPP +CXX ?= g++ TARGET = clfft_example @@ -22,7 +23,7 @@ endif $(TARGET): main.cpp Makefile $(PWD)/../lib/libclfft.a - g++ $(CXXFLAGS) main.cpp $(LDFLAGS) -o $(TARGET) + $(CXX) $(CXXFLAGS) main.cpp $(LDFLAGS) -o $(TARGET) clean: rm -f $(TARGET) diff --git a/example/Makefile.mingw b/example/Makefile.mingw index 28bba19..85555e6 100644 --- a/example/Makefile.mingw +++ b/example/Makefile.mingw @@ -1,6 +1,7 @@ PWD = $(shell pwd) NVIDIA_SDK_INSTALL_PATH ?= /usr/local/cuda AMDAPPSDKROOT ?= /opt/AMDAPP +CXX ?= i586-mingw32msvc-g++ TARGET = clfft_example.exe @@ -8,7 +9,7 @@ CXXFLAGS += -O3 -Wall -g -I$(NVIDIA_SDK_INSTALL_PATH)/OpenCL/common/inc -I$(AMDA LDFLAGS += $(PWD)/../lib/libclfft.a ../lib/amd/win32/2.5/OpenCL.lib $(TARGET): main.cpp Makefile $(PWD)/../lib/libclfft.a - i586-mingw32msvc-g++ $(CXXFLAGS) main.cpp $(LDFLAGS) -o $(TARGET) + $(CXX) $(CXXFLAGS) main.cpp $(LDFLAGS) -o $(TARGET) clean: rm -f $(TARGET) diff --git a/src/Makefile b/src/Makefile index 9cc085a..bcbb617 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,5 +1,7 @@ NVIDIA_SDK_INSTALL_PATH ?= /usr/local/cuda AMDAPPSDKROOT ?= /opt/AMDAPP +CXX ?= g++ +AR ?= ar TARGET = libclfft.a @@ -13,18 +15,18 @@ OBJECTS = fft_setup.o fft_execute.o fft_kernelstring.o $(TARGET): $(OBJECTS) - ar rcs $(TARGET) $(OBJECTS) + $(AR) rcs $(TARGET) $(OBJECTS) mkdir -p ../lib cp $(TARGET) ../lib/ fft_setup.o: fft_setup.cpp fft_internal.h fft_base_kernels.h - g++ $(CXXFLAGS) -c fft_setup.cpp + $(CXX) $(CXXFLAGS) -c fft_setup.cpp fft_execute.o: fft_execute.cpp ../include/clFFT.h fft_internal.h - g++ $(CXXFLAGS) -c fft_execute.cpp + $(CXX) $(CXXFLAGS) -c fft_execute.cpp fft_kernelstring.o: fft_kernelstring.cpp ../include/clFFT.h fft_internal.h - g++ $(CXXFLAGS) -c fft_kernelstring.cpp + $(CXX) $(CXXFLAGS) -c fft_kernelstring.cpp clean: rm -f *.o diff --git a/src/Makefile.mingw b/src/Makefile.mingw index 7334e6b..216d207 100644 --- a/src/Makefile.mingw +++ b/src/Makefile.mingw @@ -1,5 +1,7 @@ NVIDIA_SDK_INSTALL_PATH ?= /usr/local/cuda AMDAPPSDKROOT ?= /opt/AMDAPP +CXX ?= i586-mingw32msvc-g++ +AR ?= i586-mingw32msvc-ar TARGET = libclfft.a @@ -9,18 +11,18 @@ OBJECTS = fft_setup.o fft_execute.o fft_kernelstring.o $(TARGET): $(OBJECTS) - i586-mingw32msvc-ar rcs $(TARGET) $(OBJECTS) + $(AR) rcs $(TARGET) $(OBJECTS) mkdir -p ../lib cp $(TARGET) ../lib/ fft_setup.o: fft_setup.cpp fft_internal.h fft_base_kernels.h - i586-mingw32msvc-g++ $(CXXFLAGS) -c fft_setup.cpp + $(CXX) $(CXXFLAGS) -c fft_setup.cpp fft_execute.o: fft_execute.cpp ../include/clFFT.h fft_internal.h - i586-mingw32msvc-g++ $(CXXFLAGS) -c fft_execute.cpp + $(CXX) $(CXXFLAGS) -c fft_execute.cpp fft_kernelstring.o: fft_kernelstring.cpp ../include/clFFT.h fft_internal.h - i586-mingw32msvc-g++ $(CXXFLAGS) -c fft_kernelstring.cpp + $(CXX) $(CXXFLAGS) -c fft_kernelstring.cpp clean: rm -f *.o -- GitLab