Changes for R3.14

This commit is contained in:
Janet B. Anderson
2001-07-25 14:44:46 +00:00
parent 5178220160
commit fd6d55f1ae
5 changed files with 10 additions and 12 deletions
+8 -6
View File
@@ -4,15 +4,17 @@ SRC := $(CAS)/generic
CA := $(CAS)/../ca
IOSRC := $(CAS)/io/bsdSocket
STSRC := $(SRC)/st
USR_VPATH := $(SRC) $(STSRC) $(IOSRC)
include $(TOP)/configure/CONFIG
SRC_DIRS += $(CAS)/generic
SRC_DIRS += $(SRC)
SRC_DIRS += $(IOSRC)
SRC_DIRS += $(STSRC)
SRC_DIRS += $(CA)
# sometimes it's good to have different C/C++ flags, not now:
USR_CFLAGS = -I$(SRC) -I$(IOSRC) -I$(STSRC) -I$(CA) -DcaNetAddrSock
USR_CXXFLAGS = $(USR_CFLAGS)
USR_CPPFLAGS = -DcaNetAddrSock
#USR_CXXFLAGS = $(USR_CFLAGS)
INC += casdef.h
INC += casEventMask.h
@@ -60,8 +62,8 @@ LIBRARY = cas
DLL_LIBS = ca gdd Com
SYS_DLL_LIBS = ws2_32
PROD_LIBS := cas ca gdd Com
SYS_PROD_LIBS_WIN32 := ws2_32
#PROD_LIBS := cas ca gdd Com
#SYS_PROD_LIBS_WIN32 := ws2_32
include $(TOP)/configure/RULES
+2
View File
@@ -12,6 +12,8 @@ PROD_HOST_WIN32 = ca_test iocLogServer
SYS_PROD_LIBS_WIN32 = ws2_32 advapi32 user32
ca_test_SRCS = ca_test_main.c ca_test.c
iocLogServer_SRCS = iocLogServer.c
startCArepeater_SRCS = startCArepeater.c
OBJS = ca_test
-2
View File
@@ -10,8 +10,6 @@ SRCS += devLibVxWorks.c
OBJS_vxWorks += drvTS
LIBRARY_vxWorks = vxDb
OBJLIB_vxWorks = vxDb
OBJLIB_SRCS = $(SRCS)
-2
View File
@@ -14,8 +14,6 @@ SRCS+= devXxSkeletonGpib.c
OBJS_vxWorks += $(SRCS:%.c=%)
LIBRARY_vxWorks += devLibOpt
OBJLIB_vxWorks += devLibOpt
OBJLIB_SRCS = $(SRCS)
-2
View File
@@ -7,8 +7,6 @@ INC += epicsDynLink.h
SRCS += veclist.c
SRCS += epicsDynLink.c
LIBRARY_vxWorks += vxCom
OBJLIB_vxWorks += vxCom
OBJLIB_SRCS += $(SRCS)