From 73a7d7dc58714e2aa6e1257846db199f0ac0d2c3 Mon Sep 17 00:00:00 2001 From: rivers Date: Wed, 20 Oct 2010 15:20:44 +0000 Subject: [PATCH] Clean up, don't force STATIC_BUILD on win32 git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@11854 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b --- configure/CONFIG | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/configure/CONFIG b/configure/CONFIG index 6bbfbf1..a7675b1 100755 --- a/configure/CONFIG +++ b/configure/CONFIG @@ -12,10 +12,18 @@ include $(TOP)/configure/CONFIG_APP # before this takes effect. #IOCS_APPL_TOP = -STATIC_BUILD=YES +# We don't set STATIC_BUILD for WIN32 or Cygwin, use base to configure +ifeq (WIN32, $(OS_CLASS)) + SHARED_LIBRARIES=YES + STATIC_BUILD=NO +endif ifeq (Darwin, $(OS_CLASS)) STATIC_BUILD=NO endif +ifeq (Linux, $(OS_CLASS)) + STATIC_BUILD=YES +endif ifeq (solaris, $(OS_CLASS)) + STATIC_BUILD=YES SHARED_LIBRARIES=NO endif