Browse Source

Merge commit '9fa8e92' into cg_merges_20131108a

Conflicts:
	Makefile.am
Luke Dashjr 12 years ago
parent
commit
cf67b2c081
1 changed files with 1 additions and 6 deletions
  1. 1 6
      Makefile.am

+ 1 - 6
Makefile.am

@@ -105,13 +105,8 @@ bfgminer_CPPFLAGS += $(libevent_CFLAGS)
 endif
 
 
-# GPU sources, TODO: make them selectable
-# the GPU portion extracted from original main.c
-bfgminer_SOURCES += driver-opencl.h driver-opencl.c
-
 if HAVE_OPENCL
-
-# the original GPU related sources, unchanged
+bfgminer_SOURCES += driver-opencl.h driver-opencl.c
 bfgminer_SOURCES += ocl.c ocl.h findnonce.c findnonce.h
 bfgminer_SOURCES += adl.c adl.h adl_functions.h
 bfgminer_SOURCES += *.cl