From ac856b1c367a6805b65b7ca328b526f14a485697 Mon Sep 17 00:00:00 2001
From: Oliver Bock <oliver.bock@aei.mpg.de>
Date: Thu, 20 Oct 2011 17:03:26 +0200
Subject: [PATCH] Updated Win32 build to APP SDK 2.5
---
example/Makefile.mingw | 6 +++---
lib/amd/win32/{2.3 => 2.5}/OpenCL.lib | Bin 20886 -> 20886 bytes
src/Makefile.mingw | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
rename lib/amd/win32/{2.3 => 2.5}/OpenCL.lib (50%)
diff --git a/example/Makefile.mingw b/example/Makefile.mingw
index 322d012..28bba19 100644
--- a/example/Makefile.mingw
+++ b/example/Makefile.mingw
@@ -1,11 +1,11 @@
PWD = $(shell pwd)
NVIDIA_SDK_INSTALL_PATH ?= /usr/local/cuda
-ATISTREAMSDKROOT ?= /usr/local/ati
+AMDAPPSDKROOT ?= /opt/AMDAPP
TARGET = clfft_example.exe
-CXXFLAGS += -O3 -Wall -g -I$(NVIDIA_SDK_INSTALL_PATH)/OpenCL/common/inc -I$(ATISTREAMSDKROOT)/include -I../include -D_WIN32_WINDOWS=0x0410 -malign-double
-LDFLAGS += $(PWD)/../lib/libclfft.a ../lib/amd/win32/2.3/OpenCL.lib
+CXXFLAGS += -O3 -Wall -g -I$(NVIDIA_SDK_INSTALL_PATH)/OpenCL/common/inc -I$(AMDAPPSDKROOT)/include -I../include -D_WIN32_WINDOWS=0x0410 -malign-double
+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)
diff --git a/lib/amd/win32/2.3/OpenCL.lib b/lib/amd/win32/2.5/OpenCL.lib
similarity index 50%
rename from lib/amd/win32/2.3/OpenCL.lib
rename to lib/amd/win32/2.5/OpenCL.lib
index 2918fdf62bbd859be6cf32feeaab0486413a06e8..4f9bee821bdc16ee5de08a3cc342f416be209f35 100755
GIT binary patch
delta 2582
zcmbQXm~q--#tD*~#s(G^W@eVAhLb-yOKh}yE{rO&*-7LhvQUG)xP+yF0t6&*`7kmw
zwC`m0<6>lB;Fvs7OL}sfMmHN50|P^T*<^9eNap;qIg^VupCK8lpf5JLLQ8-Jq-}DK
zRx?7i`eYkz4zLb)Z4WdZ>$C+}K{~EX?$wf?+@>Kt`LA{XOlz@@GFaP89XBLxADp!y
zmWb(^V-s#c5mwOG;sIHp!oa}5#K6NaxsO?Lvap^El1>GE@yY&r!eC|c3=9m+AZ3l>
zB9lu@WYLuE*AwOjnWoObz`(-5Gnt=7cJePhR8>&d`RUstX?|b^afTKH0|Oh#{5#_E
zlV9qiJ7d3|FvM>*298L&K`z{{C(H@6nq#t~f#hU4R<_AE3{Wix`vhWyj-e%*5&kgK
z=b%Wz1C+-IIY1wniBEp&0(DQ75wd$gQn!sD?$KmmVBnoxXe>UN&sZJFLZ}*uTXKw@
zk)%N0fxG3IF}gGDO`w*BnOGy~5^#rx><JTO9Z-9~(E@Ud5ChNTgKYAX<4m!H3|JK?
zj)fU`CdVs@PCkdBirWkl#mWo}3?d9XleO6;CpV!*vG`<oL`^e84H&2!`OJ|$TwtvQ
zjyoj=1_trT|INiFFE&>|^4bG4sJ36|+Q1G5X_I8&nJmL0F?q5DdYZ8}fjC%^fq_Aa
zfoHNmhxlX`OJvW(BRIkmIf6mau-+0H*2gUEksJh)`fCrBvav#!LJlK22A;`<$~eLZ
z?0isWkq4_1ot!7kF}dE3dvdRy5R!ET)=>Y?vqp|_Xw*WIkbn(xh&I@ZPfqoOI<U(I
z-COYJ`C)?`Js@wveOzFR>MckVfyxQh$?<j)lbP*MqX;QCMA@O6iX0;93_O$9a-oL^
z$i@1wAa%1hMDl)vJ=FW_?Ddg^L9YF44~bk=1_lN#2A;|C+|rXRUAQN&w?Pg+c-H80
zK+YQQc>m>q9zgKym*I$2#|=kx9mqwWJ_FBWK_1!3Sx(5wY=RTi8~dDG(YyiA(pJvM
z5e$#_H7LSxcgwk;y8`a+9v5VHgHj5-toq}E96JTpTHsU&%0y-iJd@|EN=&wNLC!=1
z?vS!sfq{X+98@+hlog#k*%ny|C@SntAXNk?pILyEJ>V6?5*Hw)$gyV0z%%)ws`TVn
zZpdK;k1;!UWPiYg*P#f*%Lh3R<V>KT4-N1c9>{eK$OZ6l;_*Z_ACw5;*`~%5IdtKH
z{t87HWEgS@;|MBV`Nb!fc_DiTqzZ23DKBIzQKYQA(WSV}pqY4;H?kk#u95RWb|lFC
zr9My{JwB#L$qXa~_u3B>UGPv%^F_A)gEJ&$$T2W5crx%zHV_m+D_-HQaPdQS1t_)M
zHiD!EP?h5iN(~3(<tE?oLk<*p>elf`PV{g?=lP=>`qdxmHJ$)ZB(H&j5FSoF0m$J5
Sl7a>Nq(C&^K?=@-Ks5lN0kE<F
delta 2582
zcmbQXm~q--#tD*~MwW)AmKKHvCX+unOKh}yE{rO&*-7LhvQUG)xP+yF0t6&*`7kmw
zNLc>y;bLT9;Fvs7OL}sfMmHNL0|SFx&}4DVNM^a9$&-sUpCK8lpf5JLLQ8-Jq-}DK
zRx?7i`eYkz4zLb)Z4WdZ>$C+}K{~EX?$wf?+@>Kt`LA{XOlz@@GFaP89XBLxADp!y
zmWb(^V-s#c5mwOG;sIHp!oa}5#K6NaxsO?Lvap^El1>GE@yY&r!eC|c3=9m+AZ3l>
zB9lu@WYLuE*AwOjnWoObz`(-5Gnt=7cJePhR8>&d`RUstX?|b^afTKH0|Oh#{5#_E
zlV9qiJ7d3|FvM>*298L&K`z{{C(H@6nq#t~f#hU4R<_AE3{Wix`vhWyj-e%*5&kgK
z=b%Wz1C+-IIY1wniBEp&0(DQ75wd$gQn!sD?$KmmVBnoxXe>UN&sZJFLZ}*uTXKw@
zk)%N0fxG3IF}gGDO`w*BnOGy~5^#rx><JTO9Z-9~(E@Ud5ChNTgKYAX<4m!H3|JK?
zj)fU`CdVs@PCkdBirWkl#mWo}3?d9XleO6;CpV!*vG`<oL`^e84H&2!`OJ|$TwtvQ
zjyoj=1_trT|INiFFE&>|^4bG4sJ36|+Q1G5X_I8&nJmL0F?q5DdYZ8}fjC%^fq_Aa
zfoHNmhxlX`OJvW(BRIkmIf6mau-+0H*2gUEksJh)`fCrBvav#!LJlK22A;`<$~eLZ
z?0isWkq4_1ot!7kF}dE3dvdRy5R!ET)=>Y?vqp|_Xw*WIkbn(xh&I@ZPfqoOI<U(I
z-COYJ`C)?`Js@wveOzFR>MckVfyxQh$?<j)lbP*MqX;QCMA@O6iX0;93_O$9a-oL^
z$i@1wAa%1hMDl)vJ=FW_?Ddg^L9YF44~bk=1_lN#2A;|C+|rXRUAQN&w?Pg+c-H80
zK+YQQc>m>q9zgKym*I$2#|=kx9mqwWJ_FBWK_1!3Sx(5wY=RTi8~dDG(YyiA(pJvM
z5e$#_H7LSxcgwk;y8`a+9v5VHgHj5-toq}E96JTpTHsU&%0y-iJd@|EN=&wNLC!=1
z?vS!sfq{X+98@+hlog#k*%ny|C@SntAXNk?pILyEJ>V6?5*Hw)$gyV0z%%)ws`TVn
zZpdK;k1;!UWPiYg*P#f*%Lh3R<V>KT4-N1c9>{eK$OZ6l;_*Z_ACw5;*`~%5IdtKH
z{t87HWEgS@;|MBV`Nb!fc_DiTqzZ23DKBIzQKYQA(WSV}pqY4;H?kk#u95RWb|lFC
zr9My{JwB#L$qXa~_u3B>UGPv%^F_A)gEJ&$$T2W5crx%zHV_m+D_-HQaPdQS1t_)M
zHiD!EP?h5iN(~3(<tE?oLk<*p>elf`PV{g?=lP=>`qdxmHJ$)ZB(H&j5FSoF0m$J5
Sl7a>Nq(C&^K?=@-Ks5mFjjkO4
diff --git a/src/Makefile.mingw b/src/Makefile.mingw
index 234a58c..7334e6b 100644
--- a/src/Makefile.mingw
+++ b/src/Makefile.mingw
@@ -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
OBJECTS = fft_setup.o fft_execute.o fft_kernelstring.o
--
GitLab