From 90f63d7efb2f23c526b050e65076bd3f4cbb47d8 Mon Sep 17 00:00:00 2001 From: rivers Date: Tue, 18 Dec 2012 18:48:55 +0000 Subject: [PATCH] Removed DLLs not allowed to redistribute and move Windows files to os/ directories git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15737 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b --- ADApp/andorSupport/Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ADApp/andorSupport/Makefile b/ADApp/andorSupport/Makefile index ef7cac8..7600bae 100755 --- a/ADApp/andorSupport/Makefile +++ b/ADApp/andorSupport/Makefile @@ -13,12 +13,10 @@ INC += ATMCD32D.h INC += atmcdLXd.h ifeq (win32-x86, $(findstring win32-x86, $(T_A))) -LIB_INSTALLS_WIN32 += ../ATMCD32M.lib -BIN_INSTALLS_WIN32 += ../atmcd32d.dll +LIB_INSTALLS_WIN32 += ../os/win32-x86/ATMCD32M.lib else ifeq (windows-x64, $(findstring windows-x64, $(T_A))) -LIB_INSTALLS_WIN32 += ../atmcd64m.lib -BIN_INSTALLS_WIN32 += ../atmcd64d.dll +LIB_INSTALLS_WIN32 += ../os/windows-x64/atmcd64m.lib else ifeq (linux-x86_64, $(findstring linux-x86_64, $(T_A))) LIB_INSTALLS_Linux += ../os/linux-x86_64/libandor.so.2