resolved conflicts

.gitignore

@@ -4,4 +4,4 @@ keyconv
 oclvanitygen
 oclvanityminer
 vanitygen
-build
+build

CMakeLists.txt

@@ -1,72 +1,98 @@
-cmake_minimum_required(VERSION 2.6)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 
-project(vanitygen)
+PROJECT(vanitygen)
+SET(CMAKE_THREAD_PREFER_PTHREAD True)
+LIST(APPEND CMAKE_MODULE_PATH "${vanitygen_SOURCE_DIR}/cmake")
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+IF(NOT VG_OCL_SOURCE_PREFIX)
+	SET(VG_OCL_SOURCE_PREFIX ${vanitygen_SOURCE_DIR}/)
+ENDIF(NOT VG_OCL_SOURCE_PREFIX)
 
-set(DEBUG OFF)
-set(USE_OPENCL OFF)
+FIND_PACKAGE(OpenSSL REQUIRED)
+FIND_PACKAGE(Threads REQUIRED)
+FIND_PACKAGE(PCRE    REQUIRED)
+FIND_PACKAGE(CURL)
+FIND_PACKAGE(OpenCL)
 
-if (DEBUG)
-    set(OFLAGS "-ggdb3")
-else (DEBUG)
-    set(OFLAGS "-O4 -march=native")
-endif (DEBUG)
+INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${PCRE_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
-set(CMAKE_C_FLAGS "${OFLAGS} -Wall")
+SET(DEBUG OFF)
+SET(USE_OPENCL OFF)
 
-find_package(Threads REQUIRED)
+IF(DEBUG)
+    SET(OFLAGS "-ggdb3")
+ELSE(DEBUG)
+    SET(OFLAGS "-O4 -march=native")
+ENDIF(DEBUG)
 
-set(LIBS
-    pcre
-    crypto
-    m
-    dl
-    z
-    ${CMAKE_THREAD_LIBS_INIT}
+SET(CMAKE_C_FLAGS "${OFLAGS} -Wall")
+
+SET(VANY_LIBS
+	${PCRE_LIBRARIES}
+	${OPENSSL_LIBRARIES}
+	m
+	${CMAKE_THREAD_LIBS_INIT}
 )
 
-add_executable(vanitygen
-    vanitygen.c
-    pattern.c
-    util.c
+ADD_EXECUTABLE(vanitygen
+	vanitygen.c
+	pattern.c
+	util.c
 )
-target_link_libraries(vanitygen
-    ${LIBS}
+TARGET_LINK_LIBRARIES(vanitygen
+	${VANY_LIBS}
 )
+INSTALL(TARGETS vanitygen RUNTIME DESTINATION bin)
 
-add_executable(keyconv
-    keyconv.c
-    util.c
+ADD_EXECUTABLE(keyconv
+	keyconv.c
+	util.c
 )
-target_link_libraries(keyconv
-    ${LIBS}
+TARGET_LINK_LIBRARIES(keyconv
+	${VANY_LIBS}
 )
+INSTALL(TARGETS keyconv RUNTIME DESTINATION bin)
+
+IF(OPENCL_FOUND)
+	INCLUDE_DIRECTORIES(${OPENCL_INCLUDE_DIRS})
+
+	ADD_EXECUTABLE(oclvanitygen
+		oclvanitygen.c
+		oclengine.c
+		pattern.c
+		util.c
+	)
+	TARGET_LINK_LIBRARIES(oclvanitygen
+		${VANY_LIBS}
+	    ${OPENCL_LIBRARIES}
+	)
+	SET_TARGET_PROPERTIES(oclvanitygen PROPERTIES
+#	    VERSION
+        COMPILE_DEFINITIONS VG_OCL_SOURCE_PREFIX="${VG_OCL_SOURCE_PREFIX}/"
+	)
+	INSTALL(TARGETS oclvanitygen RUNTIME DESTINATION bin)
+	INSTALL(FILES calc_addrs.cl DESTINATION share/vanitygen/scripts)
+
+	IF(CURL_FOUND)
+		INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS})
+		ADD_EXECUTABLE(oclvanityminer
+			oclvanityminer.c
+			oclengine.c
+			pattern.c
+			util.c
+		)
+		TARGET_LINK_LIBRARIES(oclvanityminer
+			${VANY_LIBS}
+			${OPENCL_LIBRARIES}
+			${CURL_LIBRARIES}
+		)
+		INSTALL(TARGETS oclvanityminer RUNTIME DESTINATION bin)
+	ENDIF(CURL_FOUND)
+ENDIF(OPENCL_FOUND)
+
+
+
+
 
-find_package(OpenCL)
-if (OPENCL_FOUND AND USE_OPENCL)
-    include_directories(${OPENCL_INCLUDE_DIRS})
-
-    add_executable(oclvanitygen
-        oclvanitygen.c
-        oclengine.c
-        pattern.c
-        util.c
-    )
-    target_link_libraries(oclvanitygen
-        ${LIBS}
-        ${OPENCL_LIBRARIES}
-    )
-
-    add_executable(oclvanityminer
-        oclvanityminer.c
-        oclengine.c
-        pattern.c
-        util.c
-    )
-    target_link_libraries(oclvanityminer
-        ${LIBS}
-        ${OPENCL_LIBRARIES}
-        curl
-    )
-endif (OPENCL_FOUND AND USE_OPENCL)

cmake/FindPCRE.cmake

@@ -0,0 +1,53 @@
+# Martin Konrad <kon...@ikp.tu-darmstadt.de>
+# License: GPLv2/v3
+#
+# Try to find libpcre (Perl Compatible Regular Expressions)
+#
+# Once done this will define
+#
+# PCRE_FOUND - system has libpcre
+# PCRE_INCLUDE_DIR - the libpcre include directory
+# PCRE_LIBRARY - where to find libpcre
+# PCRE_LIBRARIES - Link these to use libpcre
+
+if(PCRE_INCLUDE_DIR AND PCRE_LIBRARIES)
+        # in cache already
+        set(LIBUSB_FOUND TRUE)
+else(PCRE_INCLUDE_DIR AND PCRE_LIBRARIES)
+        if(NOT WIN32)
+                # use pkg-config to get the directories and then use these values
+                # in the FIND_PATH() and FIND_LIBRARY() calls
+                find_package(PkgConfig)
+                pkg_check_modules(PC_PCRE libpcre)
+        endif(NOT WIN32)
+
+        find_path(PCRE_INCLUDE_DIR
+                NAMES
+                        pcre.h
+                HINTS
+                        ${PCRE_PKG_INCLUDE_DIRS}
+                PATHS
+                        /usr/include
+                        /usr/local/include
+        )
+
+        find_library(PCRE_LIBRARY
+                NAMES
+                        pcre
+                HINTS
+                        ${PCRE_PKG_LIBRARY_DIRS}
+                PATHS
+                        /usr/lib
+                        /usr/local/lib
+        )
+
+        set(PCRE_LIBRARIES ${PCRE_LIBRARY})
+
+        # handle the QUIETLY AND REQUIRED arguments AND set PCRE_FOUND to TRUE if
+        # all listed variables are TRUE
+        # include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
+        include(FindPackageHandleStandardArgs)
+        find_package_handle_standard_args(PCRE DEFAULT_MSG PCRE_LIBRARY PCRE_INCLUDE_DIR)
+
+        mark_as_advanced(PCRE_INCLUDE_DIR PCRE_LIBRARY)
+endif(PCRE_INCLUDE_DIR AND PCRE_LIBRARIES)

oclengine.c

@@ -5,7 +5,7 @@
  * Vanitygen is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
- * any later version. 
+ * any later version.
  *
  * Vanitygen is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -49,6 +49,10 @@
 #define is_pow2(v) (!((v) & ((v)-1)))
 #define round_up_pow2(x, a) (((x) + ((a)-1)) & ~((a)-1))
 
+#ifndef VG_OCL_SOURCE_PREFIX
+ #define VG_OCL_SOURCE_PREFIX
+#endif // VG_OCL_SOURCE_PREFIX
+
 static void vg_ocl_free_args(vg_ocl_context_t *vocp);
 static void *vg_opencl_loop(vg_exec_context_t *arg);
 
@@ -399,6 +403,7 @@ enum {
 	VG_OCL_NV_VERBOSE           = (1 << 5),
 	VG_OCL_BROKEN               = (1 << 6),
 	VG_OCL_NO_BINARIES          = (1 << 7),
+	VG_OCL_NO_CALLBACK          = (1 << 8),
 
 	VG_OCL_OPTIMIZATIONS        = (VG_OCL_DEEP_PREPROC_UNROLL |
 				       VG_OCL_PRAGMA_UNROLL |
@@ -453,6 +458,10 @@ vg_ocl_get_quirks(vg_ocl_context_t *vocp)
 			}
 		}
 		break;
+    case 0x0166: /* Intel */
+        quirks |= VG_OCL_NO_CALLBACK;
+        quirks &= ~VG_OCL_DEEP_PREPROC_UNROLL;
+        break;
 	default:
 		break;
 	}
@@ -897,7 +906,7 @@ vg_ocl_init(vg_context_t *vcp, vg_ocl_context_t *vocp, cl_device_id did,
 
 	vocp->voc_oclctx = clCreateContext(NULL,
 					   1, &did,
-					   vg_ocl_context_callback,
+					   ((vocp->voc_quirks & VG_OCL_NO_CALLBACK) ? NULL : vg_ocl_context_callback),
 					   NULL,
 					   &ret);
 	if (!vocp->voc_oclctx) {
@@ -940,7 +949,7 @@ vg_ocl_init(vg_context_t *vcp, vg_ocl_context_t *vocp, cl_device_id did,
 		end += snprintf(optbuf + end, sizeof(optbuf) - end,
 				"-cl-nv-verbose ");
 
-	if (!vg_ocl_load_program(vcp, vocp, "calc_addrs.cl", optbuf))
+	if (!vg_ocl_load_program(vcp, vocp, VG_OCL_SOURCE_PREFIX "calc_addrs.cl", optbuf))
 		return 0;
 	return 1;
 }
@@ -1026,7 +1035,7 @@ vg_ocl_kernel_arg_alloc(vg_ocl_context_t *vocp, int slot,
 					     karg,
 					     sizeof(clbuf),
 					     &clbuf);
-			
+
 			if (ret) {
 				fprintf(stderr,
 					"clSetKernelArg(%d,%d): ", knum, karg);
@@ -1058,7 +1067,7 @@ vg_ocl_copyout_arg(vg_ocl_context_t *vocp, int wslot, int arg,
 				   buffer,
 				   0, NULL,
 				   NULL);
-			
+
 	if (ret) {
 		fprintf(stderr, "clEnqueueWriteBuffer(%d): ", arg);
 		vg_ocl_error(vocp, ret, NULL);
@@ -2185,7 +2194,7 @@ vg_opencl_loop(vg_exec_context_t *arg)
 			slot_busy = 1;
 			slot = (slot + 1) % nslots;
 
-		} else { 
+		} else {
 			if (slot_busy) {
 				pthread_mutex_lock(&vocp->voc_lock);
 				while (vocp->voc_ocl_slot != -1) {