replace C++11 raw string by C array

mbevand · Dec 14, 2016 · fc89d50 · fc89d50
1 parent a7eccdc
commit fc89d50
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -21,10 +21,10 @@ sa-solver : ${OBJ}
 
 ${OBJ} : ${INCLUDES}
 
-_kernel.h : input.cl param.h
-	echo 'const char *ocl_code = R"_mrb_(' >$@
-	cpp $< >>$@
-	echo ')_mrb_";' >>$@
+_kernel.h: input.cl param.h
+	cpp $< ocl.code
+	printf "\x00" >> ocl.code
+	xxd -i ocl.code $@
 
 test : sa-solver
 	@echo Testing...
@@ -38,6 +38,6 @@ test : sa-solver
 #	different: testing/sols-100
 
 clean :
-	rm -f sa-solver _kernel.h *.o _temp_*
+	rm -f sa-solver _kernel.h *.o _temp_* ocl.code
 
 re : clean all
diff --git a/main.c b/main.c
@@ -1292,8 +1292,8 @@ void init_and_run_opencl(uint8_t *header, size_t header_len)
     const char *source;
     size_t source_len;
     //load_file("kernel.cl", &source, &source_len);
-    source = ocl_code;
-    source_len = strlen(ocl_code);
+    source = (char *)ocl_code;
+    source_len = strlen((char *)ocl_code);
     program = clCreateProgramWithSource(context, 1, (const char **)&source,
 	    &source_len, &status);
     if (status != CL_SUCCESS || !program)