From 833accf1b6e8ebc4011157eddbe6e20668590337 Mon Sep 17 00:00:00 2001 From: "Joshua M. Doe" Date: Wed, 24 Jun 2015 07:05:00 -0400 Subject: [PATCH] niimaqdxsrc: add 64-bit import library as NI doesn't provide one --- sys/niimaqdx/CMakeLists.txt | 23 ++++---- sys/niimaqdx/win64/niimaqdx.def | 92 ++++++++++++++++++++++++++++++++ sys/niimaqdx/win64/niimaqdx.lib | Bin 0 -> 23734 bytes 3 files changed, 106 insertions(+), 9 deletions(-) create mode 100644 sys/niimaqdx/win64/niimaqdx.def create mode 100644 sys/niimaqdx/win64/niimaqdx.lib diff --git a/sys/niimaqdx/CMakeLists.txt b/sys/niimaqdx/CMakeLists.txt index c20dfd8..ec2e5b3 100644 --- a/sys/niimaqdx/CMakeLists.txt +++ b/sys/niimaqdx/CMakeLists.txt @@ -1,12 +1,12 @@ add_definitions(-DHAVE_CONFIG_H) -set (SOURCES +set(SOURCES gstniimaqdx.c) -set (HEADERS +set(HEADERS gstniimaqdx.h) -include_directories (AFTER +include_directories(AFTER . ${NIIMAQDX_INCLUDE_DIR}) @@ -14,13 +14,18 @@ add_library(libgstniimaqdx MODULE ${SOURCES} ${HEADERS} ) +# National Instruments doesn't provide a .lib for 64-bit, so use our own +if (CMAKE_SIZEOF_VOID_P EQUAL 8) + set(NIIMAQDX_LIBRARIES "${CMAKE_CURRENT_SOURCE_DIR}/win64/niimaqdx.lib") +endif() + target_link_libraries(libgstniimaqdx - general ${GLIB2_LIBRARIES} - general ${GOBJECT_LIBRARIES} - general ${GSTREAMER_LIBRARY} - general ${GSTREAMER_BASE_LIBRARY} - general ${GSTREAMER_VIDEO_LIBRARY} - general ${NIIMAQDX_LIBRARIES}) + ${GLIB2_LIBRARIES} + ${GOBJECT_LIBRARIES} + ${GSTREAMER_LIBRARY} + ${GSTREAMER_BASE_LIBRARY} + ${GSTREAMER_VIDEO_LIBRARY} + ${NIIMAQDX_LIBRARIES}) install (TARGETS libgstniimaqdx LIBRARY DESTINATION lib/gstreamer-0.10) diff --git a/sys/niimaqdx/win64/niimaqdx.def b/sys/niimaqdx/win64/niimaqdx.def new file mode 100644 index 0000000..21bb7e2 --- /dev/null +++ b/sys/niimaqdx/win64/niimaqdx.def @@ -0,0 +1,92 @@ +EXPORTS +IMAQdxAllocate +IMAQdxBenchmarkGenICamXMLLoad +IMAQdxCalculateBayerGains +IMAQdxCalculatePacketSize +IMAQdxCloseCamera +IMAQdxConfigureAcquisition +IMAQdxConfigureGrab +IMAQdxDebugAttributesToFile +IMAQdxDiscoverEthernetCameras +IMAQdxDispose +IMAQdxEnumerateAttributeValues +IMAQdxEnumerateAttributeValuesCW +IMAQdxEnumerateAttributes +IMAQdxEnumerateAttributes2 +IMAQdxEnumerateAttributes2CW +IMAQdxEnumerateAttributes3 +IMAQdxEnumerateAttributes3CW +IMAQdxEnumerateAttributesCW +IMAQdxEnumerateCameraFiles +IMAQdxEnumerateCameras +IMAQdxEnumerateCamerasCW +IMAQdxEnumerateVideoModes +IMAQdxEnumerateVideoModesCW +IMAQdxGetActionCommandPort +IMAQdxGetAttribute +IMAQdxGetAttributeCW +IMAQdxGetAttributeDescription +IMAQdxGetAttributeDescriptionCW +IMAQdxGetAttributeDisplayName +IMAQdxGetAttributeDisplayNameCW +IMAQdxGetAttributeIncrement +IMAQdxGetAttributeIncrementCW +IMAQdxGetAttributeMaximum +IMAQdxGetAttributeMaximumCW +IMAQdxGetAttributeMinimum +IMAQdxGetAttributeMinimumCW +IMAQdxGetAttributeRepresentation +IMAQdxGetAttributeTooltip +IMAQdxGetAttributeTooltipCW +IMAQdxGetAttributeType +IMAQdxGetAttributeUnits +IMAQdxGetAttributeUnitsCW +IMAQdxGetAttributeVisibility +IMAQdxGetCameraProperty +IMAQdxGetCameraStatus +IMAQdxGetDriverName +IMAQdxGetDriverName2 +IMAQdxGetDriverVersion +IMAQdxGetErrorString +IMAQdxGetErrorStringCW +IMAQdxGetFullyQualifiedAttributeName +IMAQdxGetImage +IMAQdxGetImageCW +IMAQdxGetImageData +IMAQdxGetImageDataCW +IMAQdxGetRawBufferSize +IMAQdxGrab +IMAQdxGrabCW +IMAQdxIsAttributeReadable +IMAQdxIsAttributeReadableCW +IMAQdxIsAttributeWritable +IMAQdxIsAttributeWritableCW +IMAQdxOpenCamera +IMAQdxReadAttributes +IMAQdxReadAttributesFromString +IMAQdxReadMemory +IMAQdxReadRegister +IMAQdxRegisterAttributeUpdatedEvent +IMAQdxRegisterFrameDoneEvent +IMAQdxRegisterPnpEvent +IMAQdxRenameInterface +IMAQdxResetCamera +IMAQdxResetEthernetCameraAddress +IMAQdxSequence +IMAQdxSequenceCW +IMAQdxSetAttribute +IMAQdxSetAttributeCW +IMAQdxSetAttributeFromParamInfo +IMAQdxSetAttributeFromVoidPtr +IMAQdxSnap +IMAQdxSnapCW +IMAQdxStartAcquisition +IMAQdxStopAcquisition +IMAQdxSwitchCameraDriver +IMAQdxUnconfigureAcquisition +IMAQdxValidateAcquisition +IMAQdxWriteAttributes +IMAQdxWriteAttributesToString +IMAQdxWriteMemory +IMAQdxWriteRegister +IMAQdxWriteSettingsToRegistry diff --git a/sys/niimaqdx/win64/niimaqdx.lib b/sys/niimaqdx/win64/niimaqdx.lib new file mode 100644 index 0000000000000000000000000000000000000000..018a9aeb9cdf32ba72073fe949fe4e54394f7359 GIT binary patch literal 23734 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