From 80f86c52a18bbb7dfef0eac4a81f0e484b95619d Mon Sep 17 00:00:00 2001 From: jsteube Date: Tue, 15 Dec 2015 19:18:45 +0100 Subject: [PATCH] Cleanup makefile Remove unused CUDA library defs --- lib/cuda.def | 381 ------------------------------------------------- lib/cuda64.def | 381 ------------------------------------------------- src/Makefile | 36 ++--- 3 files changed, 18 insertions(+), 780 deletions(-) delete mode 100644 lib/cuda.def delete mode 100644 lib/cuda64.def diff --git a/lib/cuda.def b/lib/cuda.def deleted file mode 100644 index 09df122ba..000000000 --- a/lib/cuda.def +++ /dev/null @@ -1,381 +0,0 @@ -; -; Definition file of nvcuda.dll -; Automatic generated by gendef -; written by Kai Tietz 2008 -; -LIBRARY "nvcuda.dll" -EXPORTS -cuArray3DCreate@8 -cuArray3DCreate_v2@8 -cuArray3DGetDescriptor@8 -cuArray3DGetDescriptor_v2@8 -cuArrayCreate@8 -cuArrayCreate_v2@8 -cuArrayDestroy@4 -cuArrayGetDescriptor@8 -cuArrayGetDescriptor_v2@8 -cuCtxAttach@8 -cuCtxCreate@12 -cuCtxCreate_v2@12 -cuCtxDestroy@4 -cuCtxDestroy_v2@4 -cuCtxDetach@4 -cuCtxDisablePeerAccess@4 -cuCtxEnablePeerAccess@8 -cuCtxGetApiVersion@8 -cuCtxGetCacheConfig@4 -cuCtxGetCurrent@4 -cuCtxGetDevice@4 -cuCtxGetFlags@4 -cuCtxGetLimit@8 -cuCtxGetSharedMemConfig@4 -cuCtxGetStreamPriorityRange@8 -cuCtxPopCurrent@4 -cuCtxPopCurrent_v2@4 -cuCtxPushCurrent@4 -cuCtxPushCurrent_v2@4 -cuCtxSetCacheConfig@4 -cuCtxSetCurrent@4 -cuCtxSetLimit@8 -cuCtxSetSharedMemConfig@4 -cuCtxSynchronize@0 -cuD3D10CtxCreate@16 -cuD3D10CtxCreateOnDevice@16 -cuD3D10CtxCreate_v2@16 -cuD3D10GetDevice@8 -cuD3D10GetDevices@20 -cuD3D10GetDirect3DDevice@4 -cuD3D10MapResources@8 -cuD3D10RegisterResource@8 -cuD3D10ResourceGetMappedArray@12 -cuD3D10ResourceGetMappedPitch@16 -cuD3D10ResourceGetMappedPitch_v2@16 -cuD3D10ResourceGetMappedPointer@12 -cuD3D10ResourceGetMappedPointer_v2@12 -cuD3D10ResourceGetMappedSize@12 -cuD3D10ResourceGetMappedSize_v2@12 -cuD3D10ResourceGetSurfaceDimensions@20 -cuD3D10ResourceGetSurfaceDimensions_v2@20 -cuD3D10ResourceSetMapFlags@8 -cuD3D10UnmapResources@8 -cuD3D10UnregisterResource@4 -cuD3D11CtxCreate@16 -cuD3D11CtxCreateOnDevice@16 -cuD3D11CtxCreate_v2@16 -cuD3D11GetDevice@8 -cuD3D11GetDevices@20 -cuD3D11GetDirect3DDevice@4 -cuD3D9Begin@4 -cuD3D9CtxCreate@16 -cuD3D9CtxCreateOnDevice@16 -cuD3D9CtxCreate_v2@16 -cuD3D9End -cuD3D9GetDevice@8 -cuD3D9GetDevices@20 -cuD3D9GetDirect3DDevice@4 -cuD3D9MapResources@8 -cuD3D9MapVertexBuffer@12 -cuD3D9MapVertexBuffer_v2@12 -cuD3D9RegisterResource@8 -cuD3D9RegisterVertexBuffer@4 -cuD3D9ResourceGetMappedArray@16 -cuD3D9ResourceGetMappedPitch@20 -cuD3D9ResourceGetMappedPitch_v2@20 -cuD3D9ResourceGetMappedPointer@16 -cuD3D9ResourceGetMappedPointer_v2@16 -cuD3D9ResourceGetMappedSize@16 -cuD3D9ResourceGetMappedSize_v2@16 -cuD3D9ResourceGetSurfaceDimensions@24 -cuD3D9ResourceGetSurfaceDimensions_v2@24 -cuD3D9ResourceSetMapFlags@8 -cuD3D9UnmapResources@8 -cuD3D9UnmapVertexBuffer@4 -cuD3D9UnregisterResource@4 -cuD3D9UnregisterVertexBuffer@4 -cuDeviceCanAccessPeer@12 -cuDeviceComputeCapability@12 -cuDeviceGet@8 -cuDeviceGetAttribute@12 -cuDeviceGetByPCIBusId@8 -cuDeviceGetCount@4 -cuDeviceGetName@12 -cuDeviceGetPCIBusId@12 -cuDeviceGetProperties@8 -cuDevicePrimaryCtxGetState@12 -cuDevicePrimaryCtxRelease@4 -cuDevicePrimaryCtxReset@4 -cuDevicePrimaryCtxRetain@8 -cuDevicePrimaryCtxSetFlags@8 -cuDeviceTotalMem@8 -cuDeviceTotalMem_v2@8 -cuDriverGetVersion@4 -cuEventCreate@8 -cuEventDestroy@4 -cuEventDestroy_v2@4 -cuEventElapsedTime@12 -cuEventQuery@4 -cuEventRecord@8 -cuEventRecord_ptsz@8 -cuEventSynchronize@4 -cuFuncGetAttribute@12 -cuFuncSetBlockShape@16 -cuFuncSetCacheConfig@8 -cuFuncSetSharedMemConfig@8 -cuFuncSetSharedSize@8 -cuGLCtxCreate@12 -cuGLCtxCreate_v2@12 -cuGLGetDevices@16 -cuGLGetDevices_v2@16 -cuGLInit -cuGLMapBufferObject@12 -cuGLMapBufferObjectAsync@16 -cuGLMapBufferObjectAsync_v2@16 -cuGLMapBufferObjectAsync_v2_ptsz@16 -cuGLMapBufferObject_v2@12 -cuGLMapBufferObject_v2_ptds@12 -cuGLRegisterBufferObject@4 -cuGLSetBufferObjectMapFlags@8 -cuGLUnmapBufferObject@4 -cuGLUnmapBufferObjectAsync@8 -cuGLUnregisterBufferObject@4 -cuGetErrorName@8 -cuGetErrorString@8 -cuGetExportTable@8 -cuGraphicsD3D10RegisterResource@12 -cuGraphicsD3D11RegisterResource@12 -cuGraphicsD3D9RegisterResource@12 -cuGraphicsGLRegisterBuffer@12 -cuGraphicsGLRegisterImage@16 -cuGraphicsMapResources@12 -cuGraphicsMapResources_ptsz@12 -cuGraphicsResourceGetMappedMipmappedArray@8 -cuGraphicsResourceGetMappedPointer@12 -cuGraphicsResourceGetMappedPointer_v2@12 -cuGraphicsResourceSetMapFlags@8 -cuGraphicsResourceSetMapFlags_v2@8 -cuGraphicsSubResourceGetMappedArray@16 -cuGraphicsUnmapResources@12 -cuGraphicsUnmapResources_ptsz@12 -cuGraphicsUnregisterResource@4 -cuInit@4 -cuIpcCloseMemHandle@4 -cuIpcGetEventHandle@8 -cuIpcGetMemHandle@8 -cuIpcOpenEventHandle@68 -cuIpcOpenMemHandle@72 -cuLaunch@4 -cuLaunchGrid@12 -cuLaunchGridAsync@16 -cuLaunchKernel@44 -cuLaunchKernel_ptsz@44 -cuLinkAddData@32 -cuLinkAddData_v2@32 -cuLinkAddFile@24 -cuLinkAddFile_v2@24 -cuLinkComplete@12 -cuLinkCreate@16 -cuLinkCreate_v2@16 -cuLinkDestroy@4 -cuMemAlloc@8 -cuMemAllocHost@8 -cuMemAllocHost_v2@8 -cuMemAllocManaged@12 -cuMemAllocPitch@20 -cuMemAllocPitch_v2@20 -cuMemAlloc_v2@8 -cuMemFree@4 -cuMemFreeHost@4 -cuMemFree_v2@4 -cuMemGetAddressRange@12 -cuMemGetAddressRange_v2@12 -cuMemGetInfo@8 -cuMemGetInfo_v2@8 -cuMemHostAlloc@12 -cuMemHostGetDevicePointer@12 -cuMemHostGetDevicePointer_v2@12 -cuMemHostGetFlags@8 -cuMemHostRegister@12 -cuMemHostRegister_v2@12 -cuMemHostUnregister@4 -cuMemcpy2D@4 -cuMemcpy2DAsync@8 -cuMemcpy2DAsync_v2@8 -cuMemcpy2DAsync_v2_ptsz@8 -cuMemcpy2DUnaligned@4 -cuMemcpy2DUnaligned_v2@4 -cuMemcpy2DUnaligned_v2_ptds@4 -cuMemcpy2D_v2@4 -cuMemcpy2D_v2_ptds@4 -cuMemcpy3D@4 -cuMemcpy3DAsync@8 -cuMemcpy3DAsync_v2@8 -cuMemcpy3DAsync_v2_ptsz@8 -cuMemcpy3DPeer@4 -cuMemcpy3DPeerAsync@8 -cuMemcpy3DPeerAsync_ptsz@8 -cuMemcpy3DPeer_ptds@4 -cuMemcpy3D_v2@4 -cuMemcpy3D_v2_ptds@4 -cuMemcpy@12 -cuMemcpyAsync@16 -cuMemcpyAsync_ptsz@16 -cuMemcpyAtoA@20 -cuMemcpyAtoA_v2@20 -cuMemcpyAtoA_v2_ptds@20 -cuMemcpyAtoD@16 -cuMemcpyAtoD_v2@16 -cuMemcpyAtoD_v2_ptds@16 -cuMemcpyAtoH@16 -cuMemcpyAtoHAsync@20 -cuMemcpyAtoHAsync_v2@20 -cuMemcpyAtoHAsync_v2_ptsz@20 -cuMemcpyAtoH_v2@16 -cuMemcpyAtoH_v2_ptds@16 -cuMemcpyDtoA@16 -cuMemcpyDtoA_v2@16 -cuMemcpyDtoA_v2_ptds@16 -cuMemcpyDtoD@12 -cuMemcpyDtoDAsync@16 -cuMemcpyDtoDAsync_v2@16 -cuMemcpyDtoDAsync_v2_ptsz@16 -cuMemcpyDtoD_v2@12 -cuMemcpyDtoD_v2_ptds@12 -cuMemcpyDtoH@12 -cuMemcpyDtoHAsync@16 -cuMemcpyDtoHAsync_v2@16 -cuMemcpyDtoHAsync_v2_ptsz@16 -cuMemcpyDtoH_v2@12 -cuMemcpyDtoH_v2_ptds@12 -cuMemcpyHtoA@16 -cuMemcpyHtoAAsync@20 -cuMemcpyHtoAAsync_v2@20 -cuMemcpyHtoAAsync_v2_ptsz@20 -cuMemcpyHtoA_v2@16 -cuMemcpyHtoA_v2_ptds@16 -cuMemcpyHtoD@12 -cuMemcpyHtoDAsync@16 -cuMemcpyHtoDAsync_v2@16 -cuMemcpyHtoDAsync_v2_ptsz@16 -cuMemcpyHtoD_v2@12 -cuMemcpyHtoD_v2_ptds@12 -cuMemcpyPeer@20 -cuMemcpyPeerAsync@24 -cuMemcpyPeerAsync_ptsz@24 -cuMemcpyPeer_ptds@20 -cuMemcpy_ptds@12 -cuMemsetD16@12 -cuMemsetD16Async@16 -cuMemsetD16Async_ptsz@16 -cuMemsetD16_v2@12 -cuMemsetD16_v2_ptds@12 -cuMemsetD2D16@20 -cuMemsetD2D16Async@24 -cuMemsetD2D16Async_ptsz@24 -cuMemsetD2D16_v2@20 -cuMemsetD2D16_v2_ptds@20 -cuMemsetD2D32@20 -cuMemsetD2D32Async@24 -cuMemsetD2D32Async_ptsz@24 -cuMemsetD2D32_v2@20 -cuMemsetD2D32_v2_ptds@20 -cuMemsetD2D8@20 -cuMemsetD2D8Async@24 -cuMemsetD2D8Async_ptsz@24 -cuMemsetD2D8_v2@20 -cuMemsetD2D8_v2_ptds@20 -cuMemsetD32@12 -cuMemsetD32Async@16 -cuMemsetD32Async_ptsz@16 -cuMemsetD32_v2@12 -cuMemsetD32_v2_ptds@12 -cuMemsetD8@12 -cuMemsetD8Async@16 -cuMemsetD8Async_ptsz@16 -cuMemsetD8_v2@12 -cuMemsetD8_v2_ptds@12 -cuMipmappedArrayCreate@12 -cuMipmappedArrayDestroy@4 -cuMipmappedArrayGetLevel@12 -cuModuleGetFunction@12 -cuModuleGetGlobal@16 -cuModuleGetGlobal_v2@16 -cuModuleGetSurfRef@12 -cuModuleGetTexRef@12 -cuModuleLoad@8 -cuModuleLoadData@8 -cuModuleLoadDataEx@20 -cuModuleLoadFatBinary@8 -cuModuleUnload@4 -cuOccupancyMaxActiveBlocksPerMultiprocessor@16 -cuOccupancyMaxActiveBlocksPerMultiprocessorWithFlags@20 -cuOccupancyMaxPotentialBlockSize@24 -cuOccupancyMaxPotentialBlockSizeWithFlags@28 -cuParamSetSize@8 -cuParamSetTexRef@12 -cuParamSetf@12 -cuParamSeti@12 -cuParamSetv@16 -cuPointerGetAttribute@12 -cuPointerGetAttributes@16 -cuPointerSetAttribute@12 -cuProfilerInitialize@12 -cuProfilerStart -cuProfilerStop -cuStreamAddCallback@16 -cuStreamAddCallback_ptsz@16 -cuStreamAttachMemAsync@16 -cuStreamAttachMemAsync_ptsz@16 -cuStreamCreate@8 -cuStreamCreateWithPriority@12 -cuStreamDestroy@4 -cuStreamDestroy_v2@4 -cuStreamGetFlags@8 -cuStreamGetFlags_ptsz@8 -cuStreamGetPriority@8 -cuStreamGetPriority_ptsz@8 -cuStreamQuery@4 -cuStreamQuery_ptsz@4 -cuStreamSynchronize@4 -cuStreamSynchronize_ptsz@4 -cuStreamWaitEvent@12 -cuStreamWaitEvent_ptsz@12 -cuSurfObjectCreate@8 -cuSurfObjectDestroy@8 -cuSurfObjectGetResourceDesc@12 -cuSurfRefGetArray@8 -cuSurfRefSetArray@12 -cuTexObjectCreate@16 -cuTexObjectDestroy@8 -cuTexObjectGetResourceDesc@12 -cuTexObjectGetResourceViewDesc@12 -cuTexObjectGetTextureDesc@12 -cuTexRefCreate@4 -cuTexRefDestroy@4 -cuTexRefGetAddress@8 -cuTexRefGetAddressMode@12 -cuTexRefGetAddress_v2@8 -cuTexRefGetArray@8 -cuTexRefGetFilterMode@8 -cuTexRefGetFlags@8 -cuTexRefGetFormat@12 -cuTexRefGetMaxAnisotropy@8 -cuTexRefGetMipmapFilterMode@8 -cuTexRefGetMipmapLevelBias@8 -cuTexRefGetMipmapLevelClamp@12 -cuTexRefGetMipmappedArray@8 -cuTexRefSetAddress2D@16 -cuTexRefSetAddress2D_v2@16 -cuTexRefSetAddress2D_v3@16 -cuTexRefSetAddress@16 -cuTexRefSetAddressMode@12 -cuTexRefSetAddress_v2@16 -cuTexRefSetArray@12 -cuTexRefSetFilterMode@8 -cuTexRefSetFlags@8 -cuTexRefSetFormat@12 -cuTexRefSetMaxAnisotropy@8 -cuTexRefSetMipmapFilterMode@8 -cuTexRefSetMipmapLevelBias@8 -cuTexRefSetMipmapLevelClamp@12 -cuTexRefSetMipmappedArray@12 -cuWGLGetDevice@8 diff --git a/lib/cuda64.def b/lib/cuda64.def deleted file mode 100644 index 592fd47d8..000000000 --- a/lib/cuda64.def +++ /dev/null @@ -1,381 +0,0 @@ -; -; Definition file of nvcuda.dll -; Automatic generated by gendef -; written by Kai Tietz 2008 -; -LIBRARY "nvcuda.dll" -EXPORTS -cuArray3DCreate -cuArray3DCreate_v2 -cuArray3DGetDescriptor -cuArray3DGetDescriptor_v2 -cuArrayCreate -cuArrayCreate_v2 -cuArrayDestroy -cuArrayGetDescriptor -cuArrayGetDescriptor_v2 -cuCtxAttach -cuCtxCreate -cuCtxCreate_v2 -cuCtxDestroy -cuCtxDestroy_v2 -cuCtxDetach -cuCtxDisablePeerAccess -cuCtxEnablePeerAccess -cuCtxGetApiVersion -cuCtxGetCacheConfig -cuCtxGetCurrent -cuCtxGetDevice -cuCtxGetFlags -cuCtxGetLimit -cuCtxGetSharedMemConfig -cuCtxGetStreamPriorityRange -cuCtxPopCurrent -cuCtxPopCurrent_v2 -cuCtxPushCurrent -cuCtxPushCurrent_v2 -cuCtxSetCacheConfig -cuCtxSetCurrent -cuCtxSetLimit -cuCtxSetSharedMemConfig -cuCtxSynchronize -cuD3D10CtxCreate -cuD3D10CtxCreateOnDevice -cuD3D10CtxCreate_v2 -cuD3D10GetDevice -cuD3D10GetDevices -cuD3D10GetDirect3DDevice -cuD3D10MapResources -cuD3D10RegisterResource -cuD3D10ResourceGetMappedArray -cuD3D10ResourceGetMappedPitch -cuD3D10ResourceGetMappedPitch_v2 -cuD3D10ResourceGetMappedPointer -cuD3D10ResourceGetMappedPointer_v2 -cuD3D10ResourceGetMappedSize -cuD3D10ResourceGetMappedSize_v2 -cuD3D10ResourceGetSurfaceDimensions -cuD3D10ResourceGetSurfaceDimensions_v2 -cuD3D10ResourceSetMapFlags -cuD3D10UnmapResources -cuD3D10UnregisterResource -cuD3D11CtxCreate -cuD3D11CtxCreateOnDevice -cuD3D11CtxCreate_v2 -cuD3D11GetDevice -cuD3D11GetDevices -cuD3D11GetDirect3DDevice -cuD3D9Begin -cuD3D9CtxCreate -cuD3D9CtxCreateOnDevice -cuD3D9CtxCreate_v2 -cuD3D9End -cuD3D9GetDevice -cuD3D9GetDevices -cuD3D9GetDirect3DDevice -cuD3D9MapResources -cuD3D9MapVertexBuffer -cuD3D9MapVertexBuffer_v2 -cuD3D9RegisterResource -cuD3D9RegisterVertexBuffer -cuD3D9ResourceGetMappedArray -cuD3D9ResourceGetMappedPitch -cuD3D9ResourceGetMappedPitch_v2 -cuD3D9ResourceGetMappedPointer -cuD3D9ResourceGetMappedPointer_v2 -cuD3D9ResourceGetMappedSize -cuD3D9ResourceGetMappedSize_v2 -cuD3D9ResourceGetSurfaceDimensions -cuD3D9ResourceGetSurfaceDimensions_v2 -cuD3D9ResourceSetMapFlags -cuD3D9UnmapResources -cuD3D9UnmapVertexBuffer -cuD3D9UnregisterResource -cuD3D9UnregisterVertexBuffer -cuDeviceCanAccessPeer -cuDeviceComputeCapability -cuDeviceGet -cuDeviceGetAttribute -cuDeviceGetByPCIBusId -cuDeviceGetCount -cuDeviceGetName -cuDeviceGetPCIBusId -cuDeviceGetProperties -cuDevicePrimaryCtxGetState -cuDevicePrimaryCtxRelease -cuDevicePrimaryCtxReset -cuDevicePrimaryCtxRetain -cuDevicePrimaryCtxSetFlags -cuDeviceTotalMem -cuDeviceTotalMem_v2 -cuDriverGetVersion -cuEventCreate -cuEventDestroy -cuEventDestroy_v2 -cuEventElapsedTime -cuEventQuery -cuEventRecord -cuEventRecord_ptsz -cuEventSynchronize -cuFuncGetAttribute -cuFuncSetBlockShape -cuFuncSetCacheConfig -cuFuncSetSharedMemConfig -cuFuncSetSharedSize -cuGLCtxCreate -cuGLCtxCreate_v2 -cuGLGetDevices -cuGLGetDevices_v2 -cuGLInit -cuGLMapBufferObject -cuGLMapBufferObjectAsync -cuGLMapBufferObjectAsync_v2 -cuGLMapBufferObjectAsync_v2_ptsz -cuGLMapBufferObject_v2 -cuGLMapBufferObject_v2_ptds -cuGLRegisterBufferObject -cuGLSetBufferObjectMapFlags -cuGLUnmapBufferObject -cuGLUnmapBufferObjectAsync -cuGLUnregisterBufferObject -cuGetErrorName -cuGetErrorString -cuGetExportTable -cuGraphicsD3D10RegisterResource -cuGraphicsD3D11RegisterResource -cuGraphicsD3D9RegisterResource -cuGraphicsGLRegisterBuffer -cuGraphicsGLRegisterImage -cuGraphicsMapResources -cuGraphicsMapResources_ptsz -cuGraphicsResourceGetMappedMipmappedArray -cuGraphicsResourceGetMappedPointer -cuGraphicsResourceGetMappedPointer_v2 -cuGraphicsResourceSetMapFlags -cuGraphicsResourceSetMapFlags_v2 -cuGraphicsSubResourceGetMappedArray -cuGraphicsUnmapResources -cuGraphicsUnmapResources_ptsz -cuGraphicsUnregisterResource -cuInit -cuIpcCloseMemHandle -cuIpcGetEventHandle -cuIpcGetMemHandle -cuIpcOpenEventHandle -cuIpcOpenMemHandle -cuLaunch -cuLaunchGrid -cuLaunchGridAsync -cuLaunchKernel -cuLaunchKernel_ptsz -cuLinkAddData -cuLinkAddData_v2 -cuLinkAddFile -cuLinkAddFile_v2 -cuLinkComplete -cuLinkCreate -cuLinkCreate_v2 -cuLinkDestroy -cuMemAlloc -cuMemAllocHost -cuMemAllocHost_v2 -cuMemAllocManaged -cuMemAllocPitch -cuMemAllocPitch_v2 -cuMemAlloc_v2 -cuMemFree -cuMemFreeHost -cuMemFree_v2 -cuMemGetAddressRange -cuMemGetAddressRange_v2 -cuMemGetInfo -cuMemGetInfo_v2 -cuMemHostAlloc -cuMemHostGetDevicePointer -cuMemHostGetDevicePointer_v2 -cuMemHostGetFlags -cuMemHostRegister -cuMemHostRegister_v2 -cuMemHostUnregister -cuMemcpy2D -cuMemcpy2DAsync -cuMemcpy2DAsync_v2 -cuMemcpy2DAsync_v2_ptsz -cuMemcpy2DUnaligned -cuMemcpy2DUnaligned_v2 -cuMemcpy2DUnaligned_v2_ptds -cuMemcpy2D_v2 -cuMemcpy2D_v2_ptds -cuMemcpy3D -cuMemcpy3DAsync -cuMemcpy3DAsync_v2 -cuMemcpy3DAsync_v2_ptsz -cuMemcpy3DPeer -cuMemcpy3DPeerAsync -cuMemcpy3DPeerAsync_ptsz -cuMemcpy3DPeer_ptds -cuMemcpy3D_v2 -cuMemcpy3D_v2_ptds -cuMemcpy -cuMemcpyAsync -cuMemcpyAsync_ptsz -cuMemcpyAtoA -cuMemcpyAtoA_v2 -cuMemcpyAtoA_v2_ptds -cuMemcpyAtoD -cuMemcpyAtoD_v2 -cuMemcpyAtoD_v2_ptds -cuMemcpyAtoH -cuMemcpyAtoHAsync -cuMemcpyAtoHAsync_v2 -cuMemcpyAtoHAsync_v2_ptsz -cuMemcpyAtoH_v2 -cuMemcpyAtoH_v2_ptds -cuMemcpyDtoA -cuMemcpyDtoA_v2 -cuMemcpyDtoA_v2_ptds -cuMemcpyDtoD -cuMemcpyDtoDAsync -cuMemcpyDtoDAsync_v2 -cuMemcpyDtoDAsync_v2_ptsz -cuMemcpyDtoD_v2 -cuMemcpyDtoD_v2_ptds -cuMemcpyDtoH -cuMemcpyDtoHAsync -cuMemcpyDtoHAsync_v2 -cuMemcpyDtoHAsync_v2_ptsz -cuMemcpyDtoH_v2 -cuMemcpyDtoH_v2_ptds -cuMemcpyHtoA -cuMemcpyHtoAAsync -cuMemcpyHtoAAsync_v2 -cuMemcpyHtoAAsync_v2_ptsz -cuMemcpyHtoA_v2 -cuMemcpyHtoA_v2_ptds -cuMemcpyHtoD -cuMemcpyHtoDAsync -cuMemcpyHtoDAsync_v2 -cuMemcpyHtoDAsync_v2_ptsz -cuMemcpyHtoD_v2 -cuMemcpyHtoD_v2_ptds -cuMemcpyPeer -cuMemcpyPeerAsync -cuMemcpyPeerAsync_ptsz -cuMemcpyPeer_ptds -cuMemcpy_ptds -cuMemsetD16 -cuMemsetD16Async -cuMemsetD16Async_ptsz -cuMemsetD16_v2 -cuMemsetD16_v2_ptds -cuMemsetD2D16 -cuMemsetD2D16Async -cuMemsetD2D16Async_ptsz -cuMemsetD2D16_v2 -cuMemsetD2D16_v2_ptds -cuMemsetD2D32 -cuMemsetD2D32Async -cuMemsetD2D32Async_ptsz -cuMemsetD2D32_v2 -cuMemsetD2D32_v2_ptds -cuMemsetD2D8 -cuMemsetD2D8Async -cuMemsetD2D8Async_ptsz -cuMemsetD2D8_v2 -cuMemsetD2D8_v2_ptds -cuMemsetD32 -cuMemsetD32Async -cuMemsetD32Async_ptsz -cuMemsetD32_v2 -cuMemsetD32_v2_ptds -cuMemsetD8 -cuMemsetD8Async -cuMemsetD8Async_ptsz -cuMemsetD8_v2 -cuMemsetD8_v2_ptds -cuMipmappedArrayCreate -cuMipmappedArrayDestroy -cuMipmappedArrayGetLevel -cuModuleGetFunction -cuModuleGetGlobal -cuModuleGetGlobal_v2 -cuModuleGetSurfRef -cuModuleGetTexRef -cuModuleLoad -cuModuleLoadData -cuModuleLoadDataEx -cuModuleLoadFatBinary -cuModuleUnload -cuOccupancyMaxActiveBlocksPerMultiprocessor -cuOccupancyMaxActiveBlocksPerMultiprocessorWithFlags -cuOccupancyMaxPotentialBlockSize -cuOccupancyMaxPotentialBlockSizeWithFlags -cuParamSetSize -cuParamSetTexRef -cuParamSetf -cuParamSeti -cuParamSetv -cuPointerGetAttribute -cuPointerGetAttributes -cuPointerSetAttribute -cuProfilerInitialize -cuProfilerStart -cuProfilerStop -cuStreamAddCallback -cuStreamAddCallback_ptsz -cuStreamAttachMemAsync -cuStreamAttachMemAsync_ptsz -cuStreamCreate -cuStreamCreateWithPriority -cuStreamDestroy -cuStreamDestroy_v2 -cuStreamGetFlags -cuStreamGetFlags_ptsz -cuStreamGetPriority -cuStreamGetPriority_ptsz -cuStreamQuery -cuStreamQuery_ptsz -cuStreamSynchronize -cuStreamSynchronize_ptsz -cuStreamWaitEvent -cuStreamWaitEvent_ptsz -cuSurfObjectCreate -cuSurfObjectDestroy -cuSurfObjectGetResourceDesc -cuSurfRefGetArray -cuSurfRefSetArray -cuTexObjectCreate -cuTexObjectDestroy -cuTexObjectGetResourceDesc -cuTexObjectGetResourceViewDesc -cuTexObjectGetTextureDesc -cuTexRefCreate -cuTexRefDestroy -cuTexRefGetAddress -cuTexRefGetAddressMode -cuTexRefGetAddress_v2 -cuTexRefGetArray -cuTexRefGetFilterMode -cuTexRefGetFlags -cuTexRefGetFormat -cuTexRefGetMaxAnisotropy -cuTexRefGetMipmapFilterMode -cuTexRefGetMipmapLevelBias -cuTexRefGetMipmapLevelClamp -cuTexRefGetMipmappedArray -cuTexRefSetAddress2D -cuTexRefSetAddress2D_v2 -cuTexRefSetAddress2D_v3 -cuTexRefSetAddress -cuTexRefSetAddressMode -cuTexRefSetAddress_v2 -cuTexRefSetArray -cuTexRefSetFilterMode -cuTexRefSetFlags -cuTexRefSetFormat -cuTexRefSetMaxAnisotropy -cuTexRefSetMipmapFilterMode -cuTexRefSetMipmapLevelBias -cuTexRefSetMipmapLevelClamp -cuTexRefSetMipmappedArray -cuWGLGetDevice diff --git a/src/Makefile b/src/Makefile index 27aa1fc5f..613d19bf0 100644 --- a/src/Makefile +++ b/src/Makefile @@ -40,9 +40,9 @@ CUDA := deps/cuda-7.5 CUDALIBPATH32 := deps/NVIDIA-Linux-x86_64-352.21/32 CUDALIBPATH64 := deps/NVIDIA-Linux-x86_64-352.21 -AMDAPP := deps/amd-app-sdk -AMDAPPLIBPATH32 := $(OCL)/lib/x86 -AMDAPPLIBPATH64 := $(OCL)/lib/x86_64 +AMDAPP := deps/amd-app-sdk +AMDAPPLIBPATH32 := $(AMDAPP)/lib/x86 +AMDAPPLIBPATH64 := $(AMDAPP)/lib/x86_64 ADL := deps/adl-sdk GDK := deps/nvidia-gdk @@ -56,7 +56,7 @@ OCL := $(AMDAPP) OCLLIBPATH32 := $(AMDAPPLIBPATH32) OCLLIBPATH64 := $(AMDAPPLIBPATH64) -NVML := $(GDK)/usr/include/nvidia/gdk/ +NVML := $(GDK)/usr/include/nvidia/gdk NVMLLIBPATH32 := $(CUDALIBPATH32) NVMLLIBPATH64 := $(CUDALIBPATH64) @@ -102,11 +102,11 @@ CFLAGS_64 := -m64 CFLAGS_LINUX := -D_POSIX -DLINUX CFLAGS_WIN := -D_WIN -DWIN -D__MSVCRT__ -D__USE_MINGW_ANSI_STDIO=1 -CFLAGS_LINUX += -I$(OCL)/include/ -I$(ADL)/include/ -I$(NVML)/ -CFLAGS_WIN += -I$(OCL)/include/ -I$(ADL)/include/ -I$(NVAPI)/ +CFLAGS_LINUX += -I$(OCL)/include/ -I$(ADL)/include/ -I$(NVML)/ +CFLAGS_WIN += -I$(OCL)/include/ -I$(ADL)/include/ -I$(NVAPI)/ -LFLAGS_LINUX := -lpthread -lOpenCL -ldl -LFLAGS_WIN := -lpsapi -L./lib +LFLAGS_LINUX := -lpthread -lOpenCL -ldl +LFLAGS_WIN := -lpsapi ## ## Targets: Global @@ -189,25 +189,25 @@ lib/libOpenCL64.a: ## obj/%.oclHashcat.LINUX.32.o: src/%.c - $(CC_LINUX_32) $(CFLAGS) $(CFLAGS_LINUX) $(CFLAGS_32) $(CFLAGS_LINUX) -c -o $@ $< + $(CC_LINUX_32) $(CFLAGS) $(CFLAGS_LINUX) $(CFLAGS_32) -c -o $@ $< obj/%.oclHashcat.LINUX.64.o: src/%.c - $(CC_LINUX_64) $(CFLAGS) $(CFLAGS_LINUX) $(CFLAGS_64) $(CFLAGS_LINUX) -c -o $@ $< + $(CC_LINUX_64) $(CFLAGS) $(CFLAGS_LINUX) $(CFLAGS_64) -c -o $@ $< obj/%.oclHashcat.WIN.32.o: src/%.c - $(CC_WIN_32) $(CFLAGS) $(CFLAGS_WIN) $(CFLAGS_32) $(CFLAGS_WIN) -c -o $@ $< + $(CC_WIN_32) $(CFLAGS) $(CFLAGS_WIN) $(CFLAGS_32) -c -o $@ $< obj/%.oclHashcat.WIN.64.o: src/%.c - $(CC_WIN_64) $(CFLAGS) $(CFLAGS_WIN) $(CFLAGS_64) $(CFLAGS_WIN) -c -o $@ $< + $(CC_WIN_64) $(CFLAGS) $(CFLAGS_WIN) $(CFLAGS_64) -c -o $@ $< oclHashcat32.bin: src/oclHashcat.c obj/ext_OpenCL.oclHashcat.LINUX.32.o obj/ext_nvml.oclHashcat.LINUX.32.o obj/ext_ADL.oclHashcat.LINUX.32.o obj/shared.oclHashcat.LINUX.32.o obj/rp_gpu_on_cpu.oclHashcat.LINUX.32.o - $(CC_LINUX_32) $(CFLAGS) $(CFLAGS_LINUX) $(CFLAGS_32) $(CFLAGS_LINUX) -o $@ -DCOMPTIME=$(NOW) $^ -L$(OCLLIBPATH32) $(LFLAGS_LINUX) -L$(NVMLLIBPATH32) -DINSTALL_FOLDER=\"$(INSTALL_FOLDER)\" -DSHARED_FOLDER=\"$(SHARED_FOLDER)\" -DDOCUMENT_FOLDER=\"$(DOCUMENT_FOLDER)\" + $(CC_LINUX_32) $(CFLAGS) $(CFLAGS_LINUX) $(CFLAGS_32) -o $@ -DCOMPTIME=$(NOW) $^ -L$(OCLLIBPATH32) $(LFLAGS_LINUX) -DINSTALL_FOLDER=\"$(INSTALL_FOLDER)\" -DSHARED_FOLDER=\"$(SHARED_FOLDER)\" -DDOCUMENT_FOLDER=\"$(DOCUMENT_FOLDER)\" oclHashcat64.bin: src/oclHashcat.c obj/ext_OpenCL.oclHashcat.LINUX.64.o obj/ext_nvml.oclHashcat.LINUX.64.o obj/ext_ADL.oclHashcat.LINUX.64.o obj/shared.oclHashcat.LINUX.64.o obj/rp_gpu_on_cpu.oclHashcat.LINUX.64.o - $(CC_LINUX_64) $(CFLAGS) $(CFLAGS_LINUX) $(CFLAGS_64) $(CFLAGS_LINUX) -o $@ -DCOMPTIME=$(NOW) $^ -L$(OCLLIBPATH64) $(LFLAGS_LINUX) -L$(NVMLLIBPATH64) -DINSTALL_FOLDER=\"$(INSTALL_FOLDER)\" -DSHARED_FOLDER=\"$(SHARED_FOLDER)\" -DDOCUMENT_FOLDER=\"$(DOCUMENT_FOLDER)\" + $(CC_LINUX_64) $(CFLAGS) $(CFLAGS_LINUX) $(CFLAGS_64) -o $@ -DCOMPTIME=$(NOW) $^ -L$(OCLLIBPATH64) $(LFLAGS_LINUX) -DINSTALL_FOLDER=\"$(INSTALL_FOLDER)\" -DSHARED_FOLDER=\"$(SHARED_FOLDER)\" -DDOCUMENT_FOLDER=\"$(DOCUMENT_FOLDER)\" -oclHashcat32.exe: src/oclHashcat.c obj/ext_OpenCL.oclHashcat.WIN.32.o obj/ext_nvapi.oclHashcat.WIN.32.o obj/ext_ADL.oclHashcat.WIN.32.o obj/shared.oclHashcat.WIN.32.o obj/rp_gpu_on_cpu.oclHashcat.WIN.32.o lib/libOpenCL.a /usr/i686-w64-mingw32/lib/CRT_glob.o - $(CC_WIN_32) $(CFLAGS) $(CFLAGS_WIN) $(CFLAGS_32) $(CFLAGS_WIN) -o $@ -DCOMPTIME=$(NOW) $^ -L$(OCLLIBPATH32) $(LFLAGS_WIN) -static-libgcc $(NVAPI)/x86/nvapi.lib +oclHashcat32.exe: src/oclHashcat.c obj/ext_OpenCL.oclHashcat.WIN.32.o obj/ext_nvapi.oclHashcat.WIN.32.o obj/ext_ADL.oclHashcat.WIN.32.o obj/shared.oclHashcat.WIN.32.o obj/rp_gpu_on_cpu.oclHashcat.WIN.32.o lib/libOpenCL.a /usr/i686-w64-mingw32/lib/CRT_glob.o $(NVAPI)/x86/nvapi.lib + $(CC_WIN_32) $(CFLAGS) $(CFLAGS_WIN) $(CFLAGS_32) -o $@ -DCOMPTIME=$(NOW) $^ -L$(OCLLIBPATH32) $(LFLAGS_WIN) -static-libgcc -oclHashcat64.exe: src/oclHashcat.c obj/ext_OpenCL.oclHashcat.WIN.64.o obj/ext_nvapi.oclHashcat.WIN.64.o obj/ext_ADL.oclHashcat.WIN.64.o obj/shared.oclHashcat.WIN.64.o obj/rp_gpu_on_cpu.oclHashcat.WIN.64.o lib/libOpenCL64.a /usr/x86_64-w64-mingw32/lib/CRT_glob.o - $(CC_WIN_64) $(CFLAGS) $(CFLAGS_WIN) $(CFLAGS_64) $(CFLAGS_WIN) -o $@ -DCOMPTIME=$(NOW) $^ -L$(OCLLIBPATH64) $(LFLAGS_WIN) -static-libgcc $(NVAPI)/amd64/nvapi64.lib +oclHashcat64.exe: src/oclHashcat.c obj/ext_OpenCL.oclHashcat.WIN.64.o obj/ext_nvapi.oclHashcat.WIN.64.o obj/ext_ADL.oclHashcat.WIN.64.o obj/shared.oclHashcat.WIN.64.o obj/rp_gpu_on_cpu.oclHashcat.WIN.64.o lib/libOpenCL64.a /usr/x86_64-w64-mingw32/lib/CRT_glob.o $(NVAPI)/amd64/nvapi64.lib + $(CC_WIN_64) $(CFLAGS) $(CFLAGS_WIN) $(CFLAGS_64) -o $@ -DCOMPTIME=$(NOW) $^ -L$(OCLLIBPATH64) $(LFLAGS_WIN) -static-libgcc