diff options
| author | Ludovic Pouzenc <ludovic@pouzenc.fr> | 2013-01-15 20:48:33 +0000 |
|---|---|---|
| committer | Ludovic Pouzenc <ludovic@pouzenc.fr> | 2013-01-15 20:48:33 +0000 |
| commit | 01a5c00f275a2f7de181e2c8ab39095d1aacdf4a (patch) | |
| tree | 64f06ee5c916d7ffda99428ac48ee85c893c7563 /src | |
| parent | a662129a86855e082d8515d318c6a19ef54b4e13 (diff) | |
| download | 2013-gpudataviz-01a5c00f275a2f7de181e2c8ab39095d1aacdf4a.tar.gz 2013-gpudataviz-01a5c00f275a2f7de181e2c8ab39095d1aacdf4a.tar.bz2 2013-gpudataviz-01a5c00f275a2f7de181e2c8ab39095d1aacdf4a.zip | |
Fix de la compilation (libGLEW du /opt/AMDAPP)
+ fix erreur d'anglais
git-svn-id: file:///var/svn/2013-gpudataviz/trunk@7 371a6b4a-a258-45f8-9dcc-bdd82ce0ac9d
Diffstat (limited to 'src')
| -rw-r--r-- | src/boring_parts.cc | 4 | ||||
| -rwxr-xr-x | src/compil.sh | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/boring_parts.cc b/src/boring_parts.cc index 54c6863..e28f20b 100644 --- a/src/boring_parts.cc +++ b/src/boring_parts.cc @@ -98,7 +98,7 @@ int initOpenCL() { // Take the first one FIXME : do more ! device=devices[0]; - std::cout << "\tWill using device 0 (" << device << ")" << std::endl; + std::cout << "\tWill use device 0 (" << device << ")" << std::endl; delete [] devices; delete [] platforms; @@ -119,6 +119,8 @@ int initOpenCL() { CL_GLX_DISPLAY_KHR, (intptr_t) glXGetCurrentDisplay(), CL_GL_CONTEXT_KHR, (intptr_t) gGlCtx, 0 }; + + std::cout << "OpenCL initialization done." << std::endl; return 0; } #endif /*HAS_OPENCL*/ diff --git a/src/compil.sh b/src/compil.sh index 10cd630..84ed7c4 100755 --- a/src/compil.sh +++ b/src/compil.sh @@ -10,13 +10,13 @@ AMDAPP_PATH="/opt/AMDAPP" DEFINES="" INCLUDES="" -LIBS="-lglew" +LIBS="" # OpenCL if [ -d "$AMDAPP_PATH/include" ] then DEFINES="$DEFINES -DHAS_OPENCL" INCLUDES="$INCLUDES -I $AMDAPP_PATH/include" - LIBS="$LIBS -lOpenCL" + LIBS="$LIBS -L/opt/AMDAPP/lib/x86_64 -lGLEW -lOpenCL " else echo "WARNING : invalid AMDAPP_PATH : '$AMDAPP_PATH'" fi |