Mon Mar 18 08:23:02 PM EDT 2024

diff --git a/Makefile b/Makefile
index 4eb3bd85d50191c7a0d7158838099baecb266c0e..29c84d50fde75ee5817ad70cddc00a7951953d99 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ simple:
        sh build.sh simple
 
 commit:
-       git add src/ examples/ Makefile
+       git add src/ examples/ Makefile build.sh
        git commit -m "`date`"
        git push
 

diff --git a/build.sh b/build.sh
index dd1c31da52f1df9bf607d520836f7f7539d57b3b..67775924911ca427357a08214155a0e3e1999924 100644 (file)
--- a/build.sh
+++ b/build.sh
@@ -3,7 +3,7 @@
 echo "$1"
 
 echo "Verifying build commands exist..."
-for i in cat grep sed xxd gcc rm printf
+for i in cat grep sed xxd gcc rm printf uname
 do
        if ! which $i
        then
@@ -18,11 +18,18 @@ cat src/kernel.cl | grep -vi '{cpu_only}' > src/.kernel.tmp.1
 tmp="$(cat src/.kernel.tmp.1)"
 printf "%s\0" "$tmp" > src/.kernel.tmp.2
 xxd -i src/.kernel.tmp.2 | sed -e 's/src__kernel_tmp_2/kernel_gpu/' > src/kernel_gpu.cl
+x86=""
+if [ "$(uname -m)" = "x86_64" ]
+then
+       x86=" -D__x86_64__"
+fi
 if [ "$1" = "simple" ]
 then
-       gcc src/main.c -g -o bin/QAnsel -lm -D__SDL2__ -D__OPENCL__ -I/usr/include/SDL2 -D_REENTRANT -lSDL2 -lOpenCL -pthread 
+       bcmd="gcc src/main.c -g -o bin/QAnsel -lm$x86 -D_REENTRANT -pthread"
 else
-       gcc src/main.c -g -o bin/QAnsel -lm -I/usr/include/SDL2 -D_REENTRANT -lSDL2 -lOpenCL -pthread 
+       bcmd="gcc src/main.c -g -o bin/QAnsel -lm$x86 -D__SDL2__ -D__OPENCL__ -I/usr/include/SDL2 -D_REENTRANT -lSDL2 -lOpenCL -pthread"
 fi
+echo "$bcmd"
+$($bcmd)
 rm -f src/.kernel* src/kernel_*
 echo "Built."
\ No newline at end of file