From 97e7bae3545c44f98a2abaabcf5ec6f1a53b8b53 Mon Sep 17 00:00:00 2001 From: Mark Rivers Date: Tue, 15 Apr 2014 15:34:29 -0500 Subject: [PATCH] Minor reformatting --- iocs/andorIOC/andorApp/src/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/iocs/andorIOC/andorApp/src/Makefile b/iocs/andorIOC/andorApp/src/Makefile index b58f0e4..ea9544d 100755 --- a/iocs/andorIOC/andorApp/src/Makefile +++ b/iocs/andorIOC/andorApp/src/Makefile @@ -23,15 +23,15 @@ $(PROD_NAME)_SRCS += $(PROD_NAME)_registerRecordDeviceDriver.cpp $(PROD_NAME)Mai PROD_LIBS += andorCCD ifeq (win32-x86, $(findstring win32-x86, $(T_A))) -PROD_LIBS += ATMCD32M -PROD_LIBS_WIN32 += ShamrockCIFm + PROD_LIBS += ATMCD32M + PROD_LIBS += ShamrockCIFm else ifeq (windows-x64, $(findstring windows-x64, $(T_A))) -# Note: we must built the application without GraphicsMagick for windows-x64. -# This is because of a conflict with the Andor library (SetImage function) -# that only occurs on windows-x64. -USE_GRAPHICSMAGICK=NO -PROD_LIBS += atmcd64m + # Note: we must built the application without GraphicsMagick for windows-x64. + # This is because of a conflict with the Andor library (SetImage function) + # that only occurs on windows-x64. + USE_GRAPHICSMAGICK=NO + PROD_LIBS += atmcd64m endif # Test application