Commit Graph

12 Commits

Author SHA1 Message Date
rivers d50d8d903a Changed to have USE_GRAPHICSMAGICK=NO on all platforms because the SetImage conflict leads to run-time crashes on Linux
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15775 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-12-19 23:35:35 +00:00
rivers 398d09231c Change order for clarity, and may because the previous order did not do dbd file right?
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15758 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-12-18 23:37:30 +00:00
rivers 963cc61d0c Cleaned up; made andor be PROD_SYS_LIB on Linux so can do STATIC_BUILD; set new variable USE_GRAPHICSMAGICK=NO on windows-x64 because of function name conflict
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15738 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-12-18 18:52:01 +00:00
rivers 55c2856f82 Changes to work with new commonDriverMakefile
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15704 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-12-13 20:18:44 +00:00
rivers ec8b13fc55 Added commented out lines for tests on Linux; change so all archs use DBD file without GraphicsMagick because of name conflict with SetImage()
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14596 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-03-06 22:22:53 +00:00
rivers f70501adc6 Inserted commented out lines for FKTest.c
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14489 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-15 21:53:29 +00:00
rivers 9ff027cda4 Commented out lines to build accumTest
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14435 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-07 17:01:30 +00:00
rivers 6028fb346b Changes to build with different DBD file on windows-x64 so only that arch does not use the GraphicsMagick plugin due to name confict on SetImage functions
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14416 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-02 18:06:54 +00:00
rivers 225fc07a73 Use STATIC_BUILD=NO on Linux, because Andor's only has a shareable version of their library
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14412 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-02-02 00:47:55 +00:00
rivers 7ecf9f0edf Renamed library to be andor on both 32 and 64-bit systems
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14347 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-01-09 15:37:22 +00:00
rivers bc5ccd397a Use commonDriverMakefile; add support for Windows; use andorCCDAppInclude.dbd; change Andor to lowercase andor
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14337 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-01-04 19:14:11 +00:00
rivers a850a9638a New driver for Andor CCDs from Matt Pearson at Diamond Light Source
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14335 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-01-04 00:08:09 +00:00