diff options
| author | Aaron Plattner <aplattner@nvidia.com> | 2010-04-23 15:14:59 -0700 |
|---|---|---|
| committer | Aaron Plattner <aplattner@nvidia.com> | 2010-04-23 15:14:59 -0700 |
| commit | 6f8fa9948d16bc84ac7cbe8f400ad306541f1b51 (patch) | |
| tree | 89ed51c9c4bf1f4c2819d548cdd7f1087848cace | |
| parent | 4c358775c673bc96c7bdbb8232dfeb27670d76c1 (diff) | |
195.36.24195.36.24
| -rw-r--r-- | DRIVER_VERSION | 2 | ||||
| -rw-r--r-- | command-list.c | 40 |
2 files changed, 22 insertions, 20 deletions
diff --git a/DRIVER_VERSION b/DRIVER_VERSION index 670ced4..29049f2 100644 --- a/DRIVER_VERSION +++ b/DRIVER_VERSION @@ -1 +1 @@ -195.36.15 +195.36.24 diff --git a/command-list.c b/command-list.c index 57db6ef..dcaeae2 100644 --- a/command-list.c +++ b/command-list.c @@ -565,18 +565,19 @@ static void find_conflicting_libraries(Options *op, FileList *l); static ConflictingFileInfo __xfree86_libs[] = { - { "libGLcore.", 10, /* strlen("libGLcore.") */ NULL }, - { "libGL.", 6, /* strlen("libGL.") */ NULL }, - { "libGLwrapper.", 13, /* strlen("libGLwrapper.") */ NULL }, - { "libglx.", 7, /* strlen("libglx.") */ "glxModuleData" }, - { "libXvMCNVIDIA", 13, /* strlen("libXvMCNVIDIA") */ NULL }, - { "libnvidia-cfg.", 14, /* strlen("libnvidia-cfg.") */ NULL }, - { "nvidia_drv.", 11, /* strlen("nvidia_drv.") */ NULL }, - { "libcuda.", 8, /* strlen("libcuda.") */ NULL }, - { "libvdpau.", 9, /* strlen("libvdpau.") */ NULL }, - { "libvdpau_trace.", 15, /* strlen("libvdpau_trace.") */ NULL }, - { "libvdpau_nvidia.", 16, /* strlen("libvdpau_nvidia.") */ NULL }, - { NULL, 0, NULL } + { "libGLcore.", 10, /* strlen("libGLcore.") */ NULL }, + { "libGL.", 6, /* strlen("libGL.") */ NULL }, + { "libGLwrapper.", 13, /* strlen("libGLwrapper.") */ NULL }, + { "libglx.", 7, /* strlen("libglx.") */ "glxModuleData" }, + { "libXvMCNVIDIA", 13, /* strlen("libXvMCNVIDIA") */ NULL }, + { "libnvidia-cfg.", 14, /* strlen("libnvidia-cfg.") */ NULL }, + { "nvidia_drv.", 11, /* strlen("nvidia_drv.") */ NULL }, + { "libcuda.", 8, /* strlen("libcuda.") */ NULL }, + { "libvdpau.", 9, /* strlen("libvdpau.") */ NULL }, + { "libvdpau_trace.", 15, /* strlen("libvdpau_trace.") */ NULL }, + { "libvdpau_nvidia.", 16, /* strlen("libvdpau_nvidia.") */ NULL }, + { "libnvidia-compiler.", 19, /* strlen("libnvidia-compiler.") */ NULL }, + { NULL, 0, NULL } }; /* @@ -614,13 +615,14 @@ static void find_conflicting_xfree86_libraries_fullpath(Options *op, static ConflictingFileInfo __opengl_libs[] = { - { "libGLcore.", 10, /* strlen("libGLcore.") */ NULL }, - { "libGL.", 6, /* strlen("libGL.") */ NULL }, - { "libnvidia-tls.", 14, /* strlen("libnvidia-tls.") */ NULL }, - { "libGLwrapper.", 13, /* strlen("libGLwrapper.") */ NULL }, - { "libnvidia-cfg.", 14, /* strlen("libnvidia-cfg.") */ NULL }, - { "libcuda.", 8, /* strlen("libcuda.") */ NULL }, - { NULL, 0, NULL } + { "libGLcore.", 10, /* strlen("libGLcore.") */ NULL }, + { "libGL.", 6, /* strlen("libGL.") */ NULL }, + { "libnvidia-tls.", 14, /* strlen("libnvidia-tls.") */ NULL }, + { "libGLwrapper.", 13, /* strlen("libGLwrapper.") */ NULL }, + { "libnvidia-cfg.", 14, /* strlen("libnvidia-cfg.") */ NULL }, + { "libcuda.", 8, /* strlen("libcuda.") */ NULL }, + { "libnvidia-compiler.", 19, /* strlen("libnvidia-compiler.") */ NULL }, + { NULL, 0, NULL } }; /* |