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 4f029361f..fc055c3fe 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 @@ -11,7 +11,67 @@ -include $(TOP)/configure/os/CONFIG_SITE.Common.Common -EXCEED = Exceed6.1 + +EXCEED = Exceed7.0 + +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/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 /DMOTIFAPP +endif + +MOTIF_LIB = $(X11_LIB) +MOTIF_INC = $(X11_INC) JAVA_DIR = c:\\jdk1.3 JAVA_INC = $(JAVA_DIR)/include @@ -30,20 +90,6 @@ IDL = /usr/local/idl # IDL=$(IDL)/external/rpc is the sun4 version IDLRPC = $(IDL)/external/rpc.solaris -ifeq ($(EXCEED),Exceed5) -# Exceed 5 -X11_LIB = c:/exceed5/xdk/lib -X11_INC = c:/exceed5/xdk/include -MOTIF_LIB = $(X11_LIB) -MOTIF_INC = $(X11_INC) -else -# Exceed 6 and 6.1 -X11_LIB = c:/exceed/xdk/lib -X11_INC = c:/exceed/xdk/include -MOTIF_LIB = $(X11_LIB) -MOTIF_INC = $(X11_INC) -endif - OPENWIN = INTERVIEWS_BIN = WINGZ_INC = @@ -58,3 +104,8 @@ XRTGRAPH = SCIPLOT = ../../src/medmdev/medm +# z library created in SDDS extension +ZLIB_CFLAG = -DzLib +ZLIB_PROD_LIB = z +z_DIR = $(EPICS_EXTENSIONS_LIB) +