merge feature/changesAfter3_0_2; resolve conflicts
This commit is contained in:
1 parent
35429bf4df
commit
92be294bbf
87 files changed
+561
-445
No files matched your search
@@ -3,14 +3,21 @@ TOP=..
|
||||
include $(TOP)/configure/CONFIG
|
||||
#----------------------------------------
|
||||
# ADD MACRO DEFINITIONS AFTER THIS LINE
|
||||
#=============================
|
||||
|
||||
#==================================================
|
||||
# Build an IOC support library
|
||||
#
|
||||
|
||||
|
||||
PROD_HOST += powerSupplyMain
|
||||
powerSupplyMain_SRCS += powerSupplyMain.cpp
|
||||
powerSupplyMain_LIBS += powerSupply
|
||||
|
||||
powerSupplyMain_LIBS += pvDatabase
|
||||
powerSupplyMain_LIBS += pvAccess
|
||||
powerSupplyMain_LIBS += pvData
|
||||
powerSupplyMain_LIBS += Com
|
||||
powerSupplyMain_LIBS += powerSupply
|
||||
|
||||
#===========================
|
||||
|
||||
|
||||
Reference in new issue
Block a user