cuda: dllapi lower case

mba811 · Apr 1, 2014 · 0a49755 · 0a49755
1 parent 6e0a29d
commit 0a49755
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/src/VideoDecoderCUDA.cpp b/src/VideoDecoderCUDA.cpp
@@ -113,7 +113,7 @@ class VideoDecoderCUDAPrivate : public VideoDecoderPrivate
       , host_data_size(0)
     {
 #if QTAV_HAVE(DLLAPI_CUDA)
-        can_load = DllAPI::testLoad("nvcuvid");
+        can_load = dllapi::testLoad("nvcuvid");
 #endif //QTAV_HAVE(DLLAPI_CUDA)
         available = false;
         cuctx = 0;

diff --git a/src/cuda/dllapi/cuda.cpp b/src/cuda/dllapi/cuda.cpp
@@ -4,7 +4,7 @@
 #include "dllapi_p.h"
 #include "dllapi.h"
 
-using namespace DllAPI;
+using namespace dllapi;
 //namespace dllapi {
 //namespace cuda {
 

diff --git a/src/cuda/dllapi/cuviddec.cpp b/src/cuda/dllapi/cuviddec.cpp
@@ -5,7 +5,7 @@
 #include "dllapi_p.h"
 #include "dllapi.h"
 
-using namespace DllAPI;
+using namespace dllapi;
 //namespace dllapi {
 //namespace cuvid {
 

diff --git a/src/cuda/dllapi/nvcuvid.cpp b/src/cuda/dllapi/nvcuvid.cpp
@@ -2,7 +2,7 @@
 #include "dllapi_p.h"
 #include "dllapi.h"
 
-using namespace DllAPI;
+using namespace dllapi;
 //namespace dllapi {
 //namespace cuvid {
 

diff --git a/src/libQtAV.pro b/src/libQtAV.pro
@@ -113,7 +113,7 @@ config_gl {
     SDK_HEADERS += QtAV/GLWidgetRenderer.h
     OTHER_FILES += shaders/yuv_rgb.f.glsl shaders/rgb.f.glsl
 }
-#CONFIG += config_cuda config_dllapi config_dllapi_cuda
+CONFIG += config_cuda config_dllapi config_dllapi_cuda
 config_cuda {
     DEFINES += QTAV_HAVE_CUDA=1
     HEADERS += cuda/helper_cuda.h
@@ -123,8 +123,7 @@ config_cuda {
         DEFINES += QTAV_HAVE_DLLAPI_CUDA=1
         INCLUDEPATH += cuda/dllapi
         INCLUDEPATH += ../depends/dllapi/src
-include(../depends/dllapi/src/libDllAPI.pri)
-        LIBS += -lDllAPI
+include(../depends/dllapi/src/libdllapi.pri)
         HEADERS += cuda/dllapi/cuda.h cuda/dllapi/nvcuvid.h cuda/dllapi/cuviddec.h
         SOURCES += cuda/dllapi/cuda.cpp cuda/dllapi/nvcuvid.cpp cuda/dllapi/cuviddec.cpp
     } else {