OpenCL: Fix a few build system issues that prevent building on platforms other than...

git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/opencl@5245 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/libhb/module.defs b/libhb/module.defs
index d679c68f28df12c41c6bbbe49a5f41936a5eb5cb..fb9399e295340497365ed2faf721cc55f82e10ff 100644 (file)
--- a/libhb/module.defs
+++ b/libhb/module.defs
@@ -37,17 +37,23 @@ LIBHB.out += $(LIBHB.a)
 ifeq (1,$(FEATURE.ff.mpeg2))
 LIBHB.GCC.D += USE_FF_MPEG2
 endif
+
 ifeq (1,$(FEATURE.opencl))
 LIBHB.GCC.D += USE_OPENCL
 endif
+
 ifeq (1,$(FEATURE.hwd))
 LIBHB.GCC.D += USE_HWD
 endif
+
 LIBHB.GCC.D += __LIBHB__ USE_PTHREAD
 LIBHB.GCC.I += $(LIBHB.build/) $(CONTRIB.build/)include
+
 ifeq (1,$(FEATURE.opencl))
 LIBHB.GCC.I += $(AMDAPPSDKROOT)/include
+LIBHB.GCC.l += OpenCL
 endif
+
 ifeq ($(BUILD.system),cygwin)
     LIBHB.GCC.D += SYS_CYGWIN
 else ifeq ($(BUILD.system),darwin)
@@ -139,9 +145,6 @@ LIBHB.GCC.l += ws2_32
 ifeq ($(HAS.dlfcn),1)
     LIBHB.GCC.l += dl
 endif
-ifeq (1,$(FEATURE.opencl))
-    LIBHB.GCC.l += OpenCL
-endif
 LIBHB.out += $(LIBHB.dll) $(LIBHB.lib)
 
 endif

diff --git a/test/module.defs b/test/module.defs
index ba7eaf5a4f45cf56f1a17d3bd6a4ab2adf4c5f56..0b42129ab1db291252d7d5c61e1212732043ffe4 100644 (file)
--- a/test/module.defs
+++ b/test/module.defs
@@ -33,6 +33,11 @@ BUILD.out += $(TEST.install.exe)
 
 TEST.GCC.I += $(LIBHB.GCC.I)
 
+ifeq (1,$(FEATURE.opencl))
+    TEST.GCC.l += OpenCL
+    TEST.GCC.D += USE_OPENCL
+endif
+
 ifeq ($(BUILD.system),darwin)
     TEST.GCC.f += IOKit CoreServices AudioToolbox
     TEST.GCC.l += iconv
@@ -44,10 +49,7 @@ else ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
 ifeq ($(HAS.dlfcn),1)
     TEST.GCC.l += dl
 endif
-ifeq (1,$(FEATURE.opencl))
-    TEST.GCC.l += OpenCL
-    TEST.GCC.D += USE_OPENCL
-endif
+
 ifeq (1,$(FEATURE.hwd))
     TEST.GCC.D += USE_HWD
 endif