Update build scripts

2 files changed, 32 insertions, 23 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cf3e326..8c76176 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,19 +10,43 @@ add_executable (bench bench.cc)
 
 add_library (instantiations instantiations.cc)
 
-add_subdirectory (pocl)
 
 
+# Generic x86-64:
 
-# # GCC:
-# set (CMAKE_CXX_COMPILER "g++-mp-4.8")
-# set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -g -std=c++11 -march=native -Ofast")
+# # Clang 3.3:
+# set (CMAKE_CXX_COMPILER "clang++")
+# set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -g -std=c++11 -stdlib=libc++ -march=native -O4 -ffast-math")
 
-# Clang:
-# Note: This fails to link with -O4
-set (CMAKE_CXX_COMPILER "clang++-mp-3.3")
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -g -std=c++11 -stdlib=libc++ -march=native -O3 -ffast-math")
+# # GCC 4.7:
+# set (CMAKE_CXX_COMPILER "g++-")
+# set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -g -std=c++11 -march=native -Ofast")
 
 # # Intel:
 # set (CMAKE_CXX_COMPILER "icpc")
 # set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -g -std=c++11 -fast")
+
+
+
+# OSX with MacPorts:
+
+# # Clang:
+# # Note: This fails to link with -O4
+# set (CMAKE_CXX_COMPILER "clang++-mp-3.3")
+# set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -g -std=c++11 -stdlib=libc++ -march=native -O3 -ffast-math")
+
+# # GCC 4.8:
+# set (CMAKE_CXX_COMPILER "g++-mp-4.8")
+# set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -g -std=c++11 -march=native -Ofast")
+
+
+
+# PS3:
+
+# # GCC 4.6:
+# set (CMAKE_CXX_COMPILER "g++")
+# set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -g -std=c++0x -maltivec -Ofast")
+
+
+
+add_subdirectory (pocl)
diff --git a/pocl/CMakeLists.txt b/pocl/CMakeLists.txt
index 9c0f892..68e189d 100644
--- a/pocl/CMakeLists.txt
+++ b/pocl/CMakeLists.txt
@@ -16,18 +16,3 @@ add_custom_command(
   DEPENDS generate-files.py)
 
 add_library (kernel-vecmathlib ${SRCS})
-
-
-
-# # GCC:
-# set (CMAKE_CXX_COMPILER "g++")
-# set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -g -std=c++11 -march=native -Ofast")
-
-# Clang:
-# Note: This fails to link with -O4
-set (CMAKE_CXX_COMPILER "clang++-mp-3.3")
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -g -Dcl_khr_fp64 -Dcles_khr_int64 -std=c++11 -stdlib=libc++ -march=native -O3")
-
-# # Intel:
-# set (CMAKE_CXX_COMPILER "icpc")
-# set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -g -std=c++11 -fast")