diff --git a/src/makeBaseExt/top/configure/os/CONFIG_SITE.win32-x86.win32-x86 b/src/makeBaseExt/top/configure/os/CONFIG_SITE.win32-x86.win32-x86 index 4db189b29..5a1b6b617 100644 --- a/src/makeBaseExt/top/configure/os/CONFIG_SITE.win32-x86.win32-x86 +++ b/src/makeBaseExt/top/configure/os/CONFIG_SITE.win32-x86.win32-x86 @@ -76,25 +76,6 @@ IDL = /usr/local/idl # IDL=$(IDL)/external/rpc is the sun4 version IDLRPC = $(IDL)/external/rpc.solaris -X11_LIB = c:/Exceed/Exceed/xdk/lib -X11_INC = c:/Exceed/Exceed/xdk/include -EXCEED_XLIBS=XmStatic XmStatXt XlibGui Xlib HCLXmu -XmStatic_DIR=$(X11_LIB) -XmStatXt_DIR=$(X11_LIB) -XlibGui_DIR=$(X11_LIB) -Xlib_DIR=$(X11_LIB) -HCLXmu_DIR=$(X11_LIB) -EXCEED_CFLAGS=/DXMSTATIC /DMOTIFAPP - -# Override for XFree86/LessTif -#X11_LIB = c:/Cygwin/usr/X11R6/lib -#X11_INC = c:/Cygwin/usr/X11R6/include -#EXCEED_XLIBS = Xm Xt Xp Xmu X11 Xext -#EXCEED_CFLAGS = - -MOTIF_LIB = $(X11_LIB) -MOTIF_INC = $(X11_INC) - OPENWIN = INTERVIEWS_BIN = WINGZ_INC = @@ -106,10 +87,119 @@ QUESTWIN = # and you want the extensions for MEDM XRTGRAPH_EXTENSIONS = NO XRTGRAPH = - -SCIPLOT = ../../src/medmdev/medm +# Define SCIPLOT if you don't have XRT/graph +#SCIPLOT = YES # z library created in SDDS extension ZLIB_CFLAG = -DzLib ZLIB_PROD_LIB = z z_DIR = $(EPICS_EXTENSIONS_LIB) + +CLAPACK_INCLUDE = c:/CLAPACK/include +CLAPACK_LIB = c:/CLAPACK/lib + + +EXCEED = Exceed7.10 + +ifeq ($(EXCEED),Exceed5) + X11_LIB = c:/exceed5/xdk/lib + X11_INC = c:/exceed5/xdk/include + EXCEED_XLIBS=xmstatic xt xlibgui xlib xmu + xmstatic_DIR=$(X11_LIB) + xt_DIR=$(X11_LIB) + xlibgui_DIR=$(X11_LIB) + xlib_DIR=$(X11_LIB) + xmu_DIR=$(X11_LIB) + EXCEED_CFLAGS= +endif +ifeq ($(EXCEED),Exceed6.0) + X11_LIB = c:/exceed/xdk/lib + X11_INC = c:/exceed/xdk/include + EXCEED_XLIBS=xmstatic HCLXt xlibgui xlib HCLXmu + xmstatic_DIR=$(X11_LIB) + HCLXt_DIR=$(X11_LIB) + xlibgui_DIR=$(X11_LIB) + xlib_DIR=$(X11_LIB) + HCLXmu_DIR=$(X11_LIB) + EXCEED_CFLAGS= +endif +ifeq ($(EXCEED),Exceed6.1) + X11_LIB = c:/exceed/xdk/lib + X11_INC = c:/exceed/xdk/include + EXCEED_XLIBS=XmStatic XmStatXt xlibgui xlib HCLXmu + XmStatic_DIR=$(X11_LIB) + XmStatXt_DIR=$(X11_LIB) + xlibgui_DIR=$(X11_LIB) + xlib_DIR=$(X11_LIB) + HCLXmu_DIR=$(X11_LIB) + EXCEED_CFLAGS=/DXMSTATIC +endif +ifeq ($(EXCEED),Exceed6.2) + X11_LIB = c:/exceed/xdk/lib + X11_INC = c:/exceed/xdk/include + EXCEED_XLIBS=XmStatic XmStatXt xlibgui Xlib hclXmu + XmStatic_DIR=$(X11_LIB) + XmStatXt_DIR=$(X11_LIB) + xlibgui_DIR=$(X11_LIB) + Xlib_DIR=$(X11_LIB) + hclXmu_DIR=$(X11_LIB) + EXCEED_CFLAGS=/DXMSTATIC +endif +ifeq ($(EXCEED),Exceed7.0) + X11_LIB = c:/Exceed/Exceed/xdk/lib + X11_INC = c:/Exceed/Exceed/xdk/include + EXCEED_XLIBS=XmStatic XmStatXt XlibGui Xlib HCLXmu + XmStatic_DIR=$(X11_LIB) + XmStatXt_DIR=$(X11_LIB) + XlibGui_DIR=$(X11_LIB) + Xlib_DIR=$(X11_LIB) + HCLXmu_DIR=$(X11_LIB) + EXCEED_CFLAGS=/DXMSTATIC /DMOTIFAPP +endif +ifeq ($(EXCEED),Exceed7.10) + X11_LIB = c:/Exceed7.10/XDK/lib + X11_INC = c:/Exceed7.10/XDK/include + EXCEED_XLIBS=XmStatic XmStatXt XlibGui Xlib HCLXmu + XmStatic_DIR=$(X11_LIB) + XmStatXt_DIR=$(X11_LIB) + XlibGui_DIR=$(X11_LIB) + Xlib_DIR=$(X11_LIB) + HCLXmu_DIR=$(X11_LIB) + EXCEED_CFLAGS=/DXMSTATIC /DMOTIFAPP +endif +ifeq ($(EXCEED),Exceed10.0) + XDK=C:/Exceed10.0/xdk + X11_LIB = $(XDK)/lib + X11_INC = $(XDK)/include + #X11_LIB = c:/Exceed10.0/XDK/lib + #X11_INC = c:/Exceed10.0/XDK/include + EXCEED_XLIBS=XmStatic XmStatXt Xlib HCLXmu + XmStatic_DIR=$(X11_LIB) + XmStatXt_DIR=$(X11_LIB) + Xlib_DIR=$(X11_LIB) + HCLXmu_DIR=$(X11_LIB) + EXCEED_CFLAGS=/DXMSTATIC /DMOTIFAPP +endif +ifeq ($(EXCEED),Exceed12.0) + XDK=C:/Exceed10.0/XDK + X11_LIB = $(XDK)/lib + X11_INC = $(XDK)/include + EXCEED_XLIBS=XmStatic XmStatXt Xlib HCLXmu + XmStatic_DIR=$(X11_LIB) + XmStatXt_DIR=$(X11_LIB) + Xlib_DIR=$(X11_LIB) + HCLXmu_DIR=$(X11_LIB) + EXCEED_CFLAGS=/DXMSTATIC /DMOTIFAPP +endif + +###################################################### +# Override for XFree86/LessTif +#X11_LIB = c:/Cygwin/usr/X11R6/lib +#X11_INC = c:/Cygwin/usr/X11R6/include +#EXCEED_XLIBS = Xm Xt Xp Xmu X11 Xext +#EXCEED_CFLAGS = +###################################################### + +MOTIF_LIB = $(X11_LIB) +MOTIF_INC = $(X11_INC) +