From c0579f8ba84cd68148a4b1496f477267a206655d Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Fri, 1 Apr 2011 04:12:17 +0000 Subject: [PATCH] Eliminate redundant cl.h and clpatform.h in lib/ directory svn path=/trunk/boinc/; revision=23308 --- Makefile.incl | 2 ++ checkin_notes | 6 +++++- mac_build/boinc.xcodeproj/project.pbxproj | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Makefile.incl b/Makefile.incl index 51067e7c99..bd977826e3 100644 --- a/Makefile.incl +++ b/Makefile.incl @@ -25,6 +25,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/tools \ -I$(top_srcdir)/sched \ -I$(top_srcdir)/lib/mac \ + -I$(top_srcdir)/coprocs/NVIDIA/include \ + -I$(top_srcdir)/coprocs/OpenCL/include \ $(PTHREAD_CFLAGS) AM_CFLAGS = diff --git a/checkin_notes b/checkin_notes index 1e7a49a523..cf2abf11a6 100644 --- a/checkin_notes +++ b/checkin_notes @@ -2019,13 +2019,17 @@ Charlie 31 Mar 2011 to coprocs/NVIDIA/. - Eliminate redundant cl.h and clpatform.h in lib/ directory because Rom has added them to new coprocs/OpenCL/include/ directory. - NOTE: It is risky to haev multiple copies of the same file in the same + NOTE: It is risky to have multiple copies of the same file in the same source tree, as they can easily get out of sync. + Makefile.incl lib/ coproc.h cl.h (deleted) cl_platform.h (deleted) + mac_build/ + boinc.xcodeproj/ + project.pbxproj win_build/ boinc_cli.vcproj boinc_os_ss.vcproj diff --git a/mac_build/boinc.xcodeproj/project.pbxproj b/mac_build/boinc.xcodeproj/project.pbxproj index e697f12991..db667bb0fd 100755 --- a/mac_build/boinc.xcodeproj/project.pbxproj +++ b/mac_build/boinc.xcodeproj/project.pbxproj @@ -958,8 +958,8 @@ DDD52DC70C03CAE6009B5FC0 /* ViewTransfers.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ViewTransfers.h; path = ../clientgui/ViewTransfers.h; sourceTree = SOURCE_ROOT; }; DDD52DC80C03CAE6009B5FC0 /* ViewWork.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = ViewWork.cpp; path = ../clientgui/ViewWork.cpp; sourceTree = SOURCE_ROOT; }; DDD52DC90C03CAE6009B5FC0 /* ViewWork.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ViewWork.h; path = ../clientgui/ViewWork.h; sourceTree = SOURCE_ROOT; }; - DDD603E6133B475E00B886A4 /* cl_platform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cl_platform.h; path = ../lib/cl_platform.h; sourceTree = SOURCE_ROOT; }; - DDD603E7133B475E00B886A4 /* cl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cl.h; path = ../lib/cl.h; sourceTree = SOURCE_ROOT; }; + DDD603E6133B475E00B886A4 /* cl_platform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cl_platform.h; path = ../coprocs/OpenCL/include/cl_platform.h; sourceTree = SOURCE_ROOT; }; + DDD603E7133B475E00B886A4 /* cl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cl.h; path = ../coprocs/OpenCL/include/cl.h; sourceTree = SOURCE_ROOT; }; DDD74D8707CF482E0065AC9D /* boinc */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = boinc; sourceTree = BUILT_PRODUCTS_DIR; }; DDD9C59210CCF54300A1E4CD /* coproc_detect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = coproc_detect.cpp; path = ../client/coproc_detect.cpp; sourceTree = SOURCE_ROOT; }; DDDD6D7E12E4611300C258A0 /* sg_ProjectPanel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sg_ProjectPanel.cpp; path = ../clientgui/sg_ProjectPanel.cpp; sourceTree = SOURCE_ROOT; };