Skip to content

Commit

Permalink
[nggb] Activate!!
Browse files Browse the repository at this point in the history 
Replace Unix build scripts with the 'nextgen' versions. Remove old build
scripts. See doc/how-to-build.md for information on the new scripts.

git-svn-id: https://valelab.ucsf.edu/svn/micromanager2/trunk@13210 d0ab736e-dc22-4aeb-8dc9-08def0aa14fd
  • Loading branch information
mark committed Apr 22, 2014
1 parent 9fb0172 commit f364173
Show file tree
Hide file tree
Showing 139 changed files with 3,046 additions and 1,791 deletions.
16 changes: 8 additions & 8 deletions DeviceAdapters/AAAOTF/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
pkglibdir = $(DEVICEADAPTERPATH)
AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -fpermissive
pkglib_LTLIBRARIES = libmmgr_dal_AAAOTF.la
libmmgr_dal_AAAOTF_la_SOURCES = AAAOTF.cpp AAAOTF.h
libmmgr_dal_AAAOTF_la_LIBADD = $(MMDEVAPI_LIBADD)
libmmgr_dal_AAAOTF_la_LDFLAGS = $(MMDEVAPI_LDFLAGS)

EXTRA_DIST = AAAOTF.vcproj license.txt

AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -fpermissive
pkglib_LTLIBRARIES = libmmgr_dal_AAAOTF.la
libmmgr_dal_AAAOTF_la_SOURCES = AAAOTF.cpp AAAOTF.h
libmmgr_dal_AAAOTF_la_LIBADD = $(MMDEVAPI_LIBADD)
libmmgr_dal_AAAOTF_la_LDFLAGS = $(MMDEVAPI_LDFLAGS)

EXTRA_DIST = AAAOTF.vcproj license.txt
1 change: 1 addition & 0 deletions DeviceAdapters/AOTF/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@

EXTRA_DIST = license.txt AOTF.vcproj AOTF.cpp AOTF.h
16 changes: 8 additions & 8 deletions DeviceAdapters/ASIFW1000/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
pkglibdir = $(DEVICEADAPTERPATH)
AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -fpermissive
pkglib_LTLIBRARIES = libmmgr_dal_ASIFW1000.la
libmmgr_dal_ASIFW1000_la_SOURCES = ASIFW1000.cpp ASIFW1000.h ASIFW1000Hub.cpp ASIFW1000Hub.h
libmmgr_dal_ASIFW1000_la_LIBADD = $(MMDEVAPI_LIBADD)
libmmgr_dal_ASIFW1000_la_LDFLAGS = $(MMDEVAPI_LDFLAGS)

EXTRA_DIST = ASIFW1000.vcproj license.txt

AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -fpermissive
pkglib_LTLIBRARIES = libmmgr_dal_ASIFW1000.la
libmmgr_dal_ASIFW1000_la_SOURCES = ASIFW1000.cpp ASIFW1000.h ASIFW1000Hub.cpp ASIFW1000Hub.h
libmmgr_dal_ASIFW1000_la_LIBADD = $(MMDEVAPI_LIBADD)
libmmgr_dal_ASIFW1000_la_LDFLAGS = $(MMDEVAPI_LDFLAGS)

EXTRA_DIST = ASIFW1000.vcproj license.txt
16 changes: 8 additions & 8 deletions DeviceAdapters/ASIStage/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
pkglibdir = $(DEVICEADAPTERPATH)
AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -fpermissive
pkglib_LTLIBRARIES = libmmgr_dal_ASIStage.la
libmmgr_dal_ASIStage_la_SOURCES = ASIStage.cpp ASIStage.h h
libmmgr_dal_ASIStage_la_LIBADD = $(MMDEVAPI_LIBADD)
libmmgr_dal_ASIStage_la_LDFLAGS = $(MMDEVAPI_LDFLAGS)

EXTRA_DIST = ASIStage.vcproj license.txt

AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -fpermissive
pkglib_LTLIBRARIES = libmmgr_dal_ASIStage.la
libmmgr_dal_ASIStage_la_SOURCES = ASIStage.cpp ASIStage.h h
libmmgr_dal_ASIStage_la_LIBADD = $(MMDEVAPI_LIBADD)
libmmgr_dal_ASIStage_la_LDFLAGS = $(MMDEVAPI_LDFLAGS)

EXTRA_DIST = ASIStage.vcproj license.txt
60 changes: 30 additions & 30 deletions DeviceAdapters/ASITiger/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
pkglibdir = $(DEVICEADAPTERPATH)
AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -fpermissive
pkglib_LTLIBRARIES = libmmgr_dal_ASITiger.la
libmmgr_dal_ASITiger_la_SOURCES = \
ASICRISP.cpp \
ASICRISP.h \
ASIClocked.cpp \
ASIClocked.h \
ASIDevice.cpp \
ASIDevice.h \
ASIFWheel.cpp \
ASIFWheel.h \
ASIHub.cpp \
ASIHub.h \
ASIPiezo.cpp \
ASIPiezo.h \
ASIScanner.cpp \
ASIScanner.h \
ASITiger.cpp \
ASITiger.h \
ASITigerComm.cpp \
ASITigerComm.h \
ASIXYStage.cpp \
ASIXYStage.h \
ASIZStage.cpp \
ASIZStage.h
libmmgr_dal_ASITiger_la_LIBADD = $(MMDEVAPI_LIBADD)
libmmgr_dal_ASITiger_la_LDFLAGS = $(MMDEVAPI_LDFLAGS)

EXTRA_DIST = ASITiger.vcproj license.txt

AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -fpermissive
pkglib_LTLIBRARIES = libmmgr_dal_ASITiger.la
libmmgr_dal_ASITiger_la_SOURCES = \
ASICRISP.cpp \
ASICRISP.h \
ASIClocked.cpp \
ASIClocked.h \
ASIDevice.cpp \
ASIDevice.h \
ASIFWheel.cpp \
ASIFWheel.h \
ASIHub.cpp \
ASIHub.h \
ASIPiezo.cpp \
ASIPiezo.h \
ASIScanner.cpp \
ASIScanner.h \
ASITiger.cpp \
ASITiger.h \
ASITigerComm.cpp \
ASITigerComm.h \
ASIXYStage.cpp \
ASIXYStage.h \
ASIZStage.cpp \
ASIZStage.h
libmmgr_dal_ASITiger_la_LIBADD = $(MMDEVAPI_LIBADD)
libmmgr_dal_ASITiger_la_LDFLAGS = $(MMDEVAPI_LDFLAGS)

EXTRA_DIST = ASITiger.vcproj license.txt
16 changes: 8 additions & 8 deletions DeviceAdapters/ASIWPTR/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
pkglibdir = $(DEVICEADAPTERPATH)
AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -fpermissive
pkglib_LTLIBRARIES = libmmgr_dal_ASIWPTR.la
libmmgr_dal_ASIWPTR_la_SOURCES = wptr.cpp wptr.h h
libmmgr_dal_ASIWPTR_la_LIBADD = $(MMDEVAPI_LIBADD)
libmmgr_dal_ASIWPTR_la_LDFLAGS = $(MMDEVAPI_LDFLAGS)

EXTRA_DIST = ASIWPTR.vcproj license.txt

AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -fpermissive
pkglib_LTLIBRARIES = libmmgr_dal_ASIWPTR.la
libmmgr_dal_ASIWPTR_la_SOURCES = wptr.cpp wptr.h h
libmmgr_dal_ASIWPTR_la_LIBADD = $(MMDEVAPI_LIBADD)
libmmgr_dal_ASIWPTR_la_LDFLAGS = $(MMDEVAPI_LDFLAGS)

EXTRA_DIST = ASIWPTR.vcproj license.txt
2 changes: 1 addition & 1 deletion DeviceAdapters/Aladdin/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pkglibdir = $(DEVICEADAPTERPATH)

AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -fpermissive
pkglib_LTLIBRARIES = libmmgr_dal_Aladdin.la
libmmgr_dal_Aladdin_la_SOURCES = Aladdin.cpp Aladdin.h
Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/Andor/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pkglibdir = $(DEVICEADAPTERPATH)

AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -fpermissive
pkglib_LTLIBRARIES = libmmgr_dal_Andor.la
libmmgr_dal_Andor_la_SOURCES = Andor.cpp Andor.h
Expand Down
14 changes: 7 additions & 7 deletions DeviceAdapters/AndorLaserCombiner/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pkglibdir = $(DEVICEADAPTERPATH)
AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -fpermissive
pkglib_LTLIBRARIES = libmmgr_dal_AndorLaserCombiner.la
libmmgr_dal_AndorLaserCombiner_la_SOURCES = AndorLaserCombiner.cpp AndorLaserCombiner.h \
../../MMDevice/MMDevice.h ../../MMDevice/DeviceBase.h
libmmgr_dal_AndorLaserCombiner_la_LIBADD = $(MMDEVAPI_LIBADD)
libmmgr_dal_AndorLaserCombiner_la_LDFLAGS = $(MMDEVAPI_LDFLAGS)

AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -fpermissive
pkglib_LTLIBRARIES = libmmgr_dal_AndorLaserCombiner.la
libmmgr_dal_AndorLaserCombiner_la_SOURCES = AndorLaserCombiner.cpp AndorLaserCombiner.h \
../../MMDevice/MMDevice.h ../../MMDevice/DeviceBase.h
libmmgr_dal_AndorLaserCombiner_la_LIBADD = $(MMDEVAPI_LIBADD)
libmmgr_dal_AndorLaserCombiner_la_LDFLAGS = $(MMDEVAPI_LDFLAGS)
16 changes: 8 additions & 8 deletions DeviceAdapters/AndorSDK3/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
pkglibdir = $(DEVICEADAPTERPATH)
AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -fpermissive $(BOOST_CPPFLAGS)
pkglib_LTLIBRARIES = libmmgr_dal_DemoCamera.la
libmmgr_dal_DemoCamera_la_SOURCES = DemoCamera.cpp DemoCamera.h ../../MMDevice/MMDevice.h
libmmgr_dal_DemoCamera_la_LDFLAGS = $(MMDEVAPI_LDFLAGS)
libmmgr_dal_DemoCamera_la_LIBADD = $(MMDEVAPI_LIBADD)

EXTRA_DIST = DemoCamera.vcproj license.txt

AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -fpermissive $(BOOST_CPPFLAGS)
pkglib_LTLIBRARIES = libmmgr_dal_DemoCamera.la
libmmgr_dal_DemoCamera_la_SOURCES = DemoCamera.cpp DemoCamera.h ../../MMDevice/MMDevice.h
libmmgr_dal_DemoCamera_la_LDFLAGS = $(MMDEVAPI_LDFLAGS)
libmmgr_dal_DemoCamera_la_LIBADD = $(MMDEVAPI_LIBADD)

EXTRA_DIST = DemoCamera.vcproj license.txt
2 changes: 1 addition & 1 deletion DeviceAdapters/Aquinas/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pkglibdir = $(DEVICEADAPTERPATH)

AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -fpermissive
pkglib_LTLIBRARIES = libmmgr_dal_Aquinas.la
libmmgr_dal_Aquinas_la_SOURCES = Aquinas.cpp Aquinas.h \
Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/Arduino/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pkglibdir = $(DEVICEADAPTERPATH)

AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -fpermissive
pkglib_LTLIBRARIES = libmmgr_dal_Arduino.la
libmmgr_dal_Arduino_la_SOURCES = Arduino.cpp Arduino.h \
Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/CARVII/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pkglibdir = $(DEVICEADAPTERPATH)

AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -fpermissive
pkglib_LTLIBRARIES = libmmgr_dal_CARVII.la
libmmgr_dal_CARVII_la_SOURCES = CARVII.cpp CARVII.h CARVIIHub.h CARVIIHub.cpp ../../MMDevice/MMDevice.h ../../MMDevice/DeviceBase.h ../../MMDevice/ModuleInterface.h
Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/CONEX/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pkglibdir = $(DEVICEADAPTERPATH)

AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -fpermissive
pkglib_LTLIBRARIES = libmmgr_dal_CONEX.la
libmmgr_dal_CONEX_la_SOURCES = Conex_Axis.h Conex_Axis.cpp
Expand Down
16 changes: 8 additions & 8 deletions DeviceAdapters/CSUW1/Makefile.am
100755 → 100644
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
pkglibdir = $(DEVICEADAPTERPATH)
AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -fpermissive
pkglib_LTLIBRARIES = libmmgr_dal_CSUW1.la
libmmgr_dal_CSUW1_la_SOURCES = CSUW1.cpp CSUW1.h CSUW1Hub.cpp CSUW1Hub.h
libmmgr_dal_CSUW1_la_LIBADD = $(MMDEVAPI_LIBADD)
libmmgr_dal_CSUW1_la_LDFLAGS = $(MMDEVAPI_LDFLAGS)

EXTRA_DIST = CSUW1.vcproj license.txt

AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -fpermissive
pkglib_LTLIBRARIES = libmmgr_dal_CSUW1.la
libmmgr_dal_CSUW1_la_SOURCES = CSUW1.cpp CSUW1.h CSUW1Hub.cpp CSUW1Hub.h
libmmgr_dal_CSUW1_la_LIBADD = $(MMDEVAPI_LIBADD)
libmmgr_dal_CSUW1_la_LDFLAGS = $(MMDEVAPI_LDFLAGS)

EXTRA_DIST = CSUW1.vcproj license.txt
2 changes: 1 addition & 1 deletion DeviceAdapters/Cobolt/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pkglibdir = $(DEVICEADAPTERPATH)

AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -fpermissive
pkglib_LTLIBRARIES = libmmgr_dal_Cobolt.la
libmmgr_dal_Cobolt_la_SOURCES = Cobolt.cpp Cobolt.h \
Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/CoherentCube/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pkglibdir = $(DEVICEADAPTERPATH)

AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -fpermissive
pkglib_LTLIBRARIES = libmmgr_dal_CoherentCube.la
libmmgr_dal_CoherentCube_la_SOURCES = CoherentCube.cpp CoherentCube.h \
Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/Conix/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pkglibdir = $(DEVICEADAPTERPATH)

AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -fpermissive
pkglib_LTLIBRARIES = libmmgr_dal_Conix.la
libmmgr_dal_Conix_la_SOURCES = Conix.cpp Conix.h
Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/Corvus/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pkglibdir = $(DEVICEADAPTERPATH)

AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -fpermissive
pkglib_LTLIBRARIES = libmmgr_dal_Corvus.la
libmmgr_dal_Corvus_la_SOURCES = Corvus.cpp Corvus.h
Expand Down
1 change: 1 addition & 0 deletions DeviceAdapters/DTOpenLayer/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@

EXTRA_DIST = DTOpenLayer.vcproj license.txt DTOpenLayer.cpp DTOpenLayer.h
2 changes: 1 addition & 1 deletion DeviceAdapters/DemoCamera/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pkglibdir = $(DEVICEADAPTERPATH)

AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -fpermissive $(BOOST_CPPFLAGS)
pkglib_LTLIBRARIES = libmmgr_dal_DemoCamera.la
libmmgr_dal_DemoCamera_la_SOURCES = DemoCamera.cpp DemoCamera.h ../../MMDevice/MMDevice.h
Expand Down
12 changes: 6 additions & 6 deletions DeviceAdapters/FocalPoint/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pkglibdir = $(DEVICEADAPTERPATH)
AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -fpermissive
pkglib_LTLIBRARIES = libmmgr_dal_FocalPoint.la
libmmgr_dal_FocalPoint_la_SOURCES = FocalPoint.cpp FocalPoint.h h
libmmgr_dal_FocalPoint_la_LIBADD = $(MMDEVAPI_LIBADD)
libmmgr_dal_FocalPoint_la_LDFLAGS = $(MMDEVAPI_LDFLAGS)

AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -fpermissive
pkglib_LTLIBRARIES = libmmgr_dal_FocalPoint.la
libmmgr_dal_FocalPoint_la_SOURCES = FocalPoint.cpp FocalPoint.h h
libmmgr_dal_FocalPoint_la_LIBADD = $(MMDEVAPI_LIBADD)
libmmgr_dal_FocalPoint_la_LDFLAGS = $(MMDEVAPI_LDFLAGS)
16 changes: 8 additions & 8 deletions DeviceAdapters/FreeSerialPort/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
pkglibdir = $(DEVICEADAPTERPATH)
AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -fpermissive $(BOOST_CPPFLAGS)
pkglib_LTLIBRARIES = libmmgr_dal_FreeSerialPort.la
libmmgr_dal_FreeSerialPort_la_SOURCES = FreeSerialPort.cpp FreeSerialPort.h
libmmgr_dal_FreeSerialPort_la_LIBADD = $(MMDEVAPI_LIBADD)
libmmgr_dal_FreeSerialPort_la_LDFLAGS = $(MMDEVAPI_LDFLAGS)

EXTRA_DIST = license.txt

AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -fpermissive $(BOOST_CPPFLAGS)
pkglib_LTLIBRARIES = libmmgr_dal_FreeSerialPort.la
libmmgr_dal_FreeSerialPort_la_SOURCES = FreeSerialPort.cpp FreeSerialPort.h
libmmgr_dal_FreeSerialPort_la_LIBADD = $(MMDEVAPI_LIBADD)
libmmgr_dal_FreeSerialPort_la_LDFLAGS = $(MMDEVAPI_LDFLAGS)

EXTRA_DIST = license.txt
14 changes: 8 additions & 6 deletions DeviceAdapters/HIDManager/Makefile.am
100755 → 100644
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
pkglibdir = $(DEVICEADAPTERPATH)
AM_CFLAGS = -I$(HIDAPIINCDIR)/hidapi
AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -I$(HIDAPIINCDIR) -fpermissive


AM_CPPFLAGS = $(HIDAPI_CPPFLAGS)
AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) $(HIDAPI_CFLAGS)
AM_LDFLAGS = $(MMDEVAPI_LDFLAGS) $(HIDAPI_LDFLAGS)

pkglib_LTLIBRARIES = libmmgr_dal_HIDManager.la
libmmgr_dal_HIDManager_la_SOURCES = HIDManager.cpp HIDManager.h $(HIDAPICDIR)/hid.c
libmmgr_dal_HIDManager_la_LIBADD = $(MMDEVAPI_LIBADD) $(SERIALFRAMEWORKS)
libmmgr_dal_HIDManager_la_LDFLAGS = $(MMDEVAPI_LDFLAGS)
libmmgr_dal_HIDManager_la_SOURCES = HIDManager.cpp HIDManager.h
libmmgr_dal_HIDManager_la_LIBADD = $(MMDEVAPI_LIBADD) $(HIDAPI_LIBS)

EXTRA_DIST = license.txt
2 changes: 1 addition & 1 deletion DeviceAdapters/IDS_uEye/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pkglibdir = $(DEVICEADAPTERPATH)

AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -fpermissive
UEYELIB = -lueye_api
pkglib_LTLIBRARIES = libmmgr_dal_IDS_uEye.la
Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/IIDC/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pkglibdir = $(DEVICEADAPTERPATH)


# To allow building with outdated versions of Boost (present by default on many
# Linux distributions), use the older Boost.Thread interface, even though it
Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/ITC18/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pkglibdir = $(DEVICEADAPTERPATH)

AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -fpermissive
pkglib_LTLIBRARIES = libmmgr_dal_MMITC18.la
libmmgr_dal_MMITC18_la_SOURCES = MMITC18.cpp MMITC18.h \
Expand Down
16 changes: 8 additions & 8 deletions DeviceAdapters/ImageProcessorChain/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
pkglibdir = $(DEVICEADAPTERPATH)
AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -fpermissive $(BOOST_CPPFLAGS)
pkglib_LTLIBRARIES = libmmgr_dal_ImageProcessorChain.la
libmmgr_dal_ImageProcessorChain_la_SOURCES = ImageProcessorChain.cpp ImageProcessorChain.h ../../MMDevice/MMDevice.h
libmmgr_dal_ImageProcessorChain_la_LDFLAGS = $(MMDEVAPI_LDFLAGS)
libmmgr_dal_ImageProcessorChain_la_LIBADD = $(MMDEVAPI_LIBADD)

EXTRA_DIST = ImageProcessorChain.vcproj license.txt

AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -fpermissive $(BOOST_CPPFLAGS)
pkglib_LTLIBRARIES = libmmgr_dal_ImageProcessorChain.la
libmmgr_dal_ImageProcessorChain_la_SOURCES = ImageProcessorChain.cpp ImageProcessorChain.h ../../MMDevice/MMDevice.h
libmmgr_dal_ImageProcessorChain_la_LDFLAGS = $(MMDEVAPI_LDFLAGS)
libmmgr_dal_ImageProcessorChain_la_LIBADD = $(MMDEVAPI_LIBADD)

EXTRA_DIST = ImageProcessorChain.vcproj license.txt
2 changes: 1 addition & 1 deletion DeviceAdapters/K8055/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pkglibdir = $(DEVICEADAPTERPATH)

AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -fpermissive
pkglib_LTLIBRARIES = libmmgr_dal_K8055.la
libmmgr_dal_K8055_la_SOURCES = K8055.cpp K8055.h K8055Interface.h K8055Interface.cpp
Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/K8061/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pkglibdir = $(DEVICEADAPTERPATH)

AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -fpermissive
pkglib_LTLIBRARIES = libmmgr_dal_K8061.la
libmmgr_dal_K8061_la_SOURCES = K8061.cpp K8061.h K8061Interface.h K8061Interface.cpp \
Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/LeicaDMI/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pkglibdir = $(DEVICEADAPTERPATH)

AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -fpermissive
pkglib_LTLIBRARIES = libmmgr_dal_LeicaDMI.la
libmmgr_dal_LeicaDMI_la_SOURCES = LeicaDMI.cpp LeicaDMI.h LeicaDMIModel.cpp LeicaDMIModel.h LeicaDMIScopeInterface.cpp LeicaDMIScopeInterface.h
Expand Down
16 changes: 8 additions & 8 deletions DeviceAdapters/LeicaDMR/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
pkglibdir = $(DEVICEADAPTERPATH)
AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -fpermissive
pkglib_LTLIBRARIES = libmmgr_dal_LeicaDMR.la
libmmgr_dal_LeicaDMR_la_SOURCES = LeicaDMR.cpp LeicaDMR.h LeicaDMRHub.cpp LeicaDMRHub.h
libmmgr_dal_LeicaDMR_la_LIBADD = $(MMDEVAPI_LIBADD)
libmmgr_dal_LeicaDMR_la_LDFLAGS = $(MMDEVAPI_LDFLAGS)

EXTRA_DIST = LeicaDMR.vcproj license.txt

AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -fpermissive
pkglib_LTLIBRARIES = libmmgr_dal_LeicaDMR.la
libmmgr_dal_LeicaDMR_la_SOURCES = LeicaDMR.cpp LeicaDMR.h LeicaDMRHub.cpp LeicaDMRHub.h
libmmgr_dal_LeicaDMR_la_LIBADD = $(MMDEVAPI_LIBADD)
libmmgr_dal_LeicaDMR_la_LDFLAGS = $(MMDEVAPI_LDFLAGS)

EXTRA_DIST = LeicaDMR.vcproj license.txt
2 changes: 1 addition & 1 deletion DeviceAdapters/LeicaDMSTC/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pkglibdir = $(DEVICEADAPTERPATH)

AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -fpermissive
pkglib_LTLIBRARIES = libmmgr_dal_LeicaDMSTC.la
libmmgr_dal_LeicaDMSTC_la_SOURCES = LeicaDMSTC.cpp LeicaDMSTC.h LeicaDMSTCHub.cpp LeicaDMSTCHub.h
Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/Ludl/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pkglibdir = $(DEVICEADAPTERPATH)

AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -fpermissive
pkglib_LTLIBRARIES = libmmgr_dal_Ludl.la
libmmgr_dal_Ludl_la_SOURCES = Ludl.cpp Ludl.h
Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/LudlLow/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pkglibdir = $(DEVICEADAPTERPATH)

AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -fpermissive
pkglib_LTLIBRARIES = libmmgr_dal_LudlLow.la
libmmgr_dal_LudlLow_la_SOURCES = Ludl.cpp Ludl.h
Expand Down
2 changes: 1 addition & 1 deletion DeviceAdapters/LumencorSpectra/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pkglibdir = $(DEVICEADAPTERPATH)

AM_CXXFLAGS = $(MMDEVAPI_CXXFLAGS) -fpermissive
pkglib_LTLIBRARIES = libmmgr_dal_LumencorSpectra.la
libmmgr_dal_LumencorSpectra_la_SOURCES = Spectra.cpp prior.h
Expand Down
Loading

0 comments on commit f364173

Please sign in to comment.