Updated windows makefiles and config.h to build on windows VSC2019 - L. Rettig (FHI)
This commit is contained in:
@@ -1,39 +1,38 @@
|
||||
INCLUDES = -IC:\CAFE\cafe-1.0.0-beta-3\cpp\include -IC:\local\boost_1_63_0\boost \
|
||||
-IC:\local\boost_1_63_0 -IC:\EPICS\base-3.14.12.5\include -IC:\EPICS\base-3.14.12.5\include\os\WIN32
|
||||
INCLUDES = -IC:\EPICS\CAFE\cpp\include -IC:\EPICS\CAFE\cpp -IC:\EPICS\boost_1_81_0\boost \
|
||||
-IC:\EPICS\boost_1_81_0 -IC:\epics\epics-base\include -IC:\epics\epics-base\include\os\WIN32 \
|
||||
-Ic:\EPICS\epics-base\include\compiler\msvc \
|
||||
#-IC:\Qt\qt-4.8.6-x64-msvc2010\include -Ic:\Qt\qt-4.8.6-x64-msvc2010\include -Ic:\Qt\qt-4.8.6-x64-msvc2010\include\QtCore \
|
||||
#-IC:\Qt\qt-4.8.6-msvc2010\include\QtXml
|
||||
#-IC:\Qt\qt-4.8.6-msvc2010\include\QtXml \
|
||||
#-IC:\Users\chrin\AppData\Local\Continuum\Anaconda3\envs\py345\include
|
||||
|
||||
LIB_DEST=lib\cafe-noqt
|
||||
|
||||
CXX=cl
|
||||
CXXFLAGS = /W4 /EHsc /c /MT
|
||||
OUTPUT_OPTION = /o "$@"
|
||||
LIB_LOCAL = C:\epics\base-3.14.12.5\lib\windows-x64\Com.lib C:\epics\base-3.14.12.5\lib\windows-x64\ca.lib \
|
||||
C:\local\boost_1_63_0\lib64-msvc-10.0\libboost_thread-vc100-mt-s-1_63.lib \
|
||||
C:\local\boost_1_63_0\lib64-msvc-10.0\libboost_system-vc100-mt-s-1_63.lib
|
||||
CXXFLAGS = -DUSE_TYPED_RSET -EHsc -nologo -FC -D__STDC__=0 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -Ox -GL -Oy- -W3 -MD -DEPICS_BUILD_DLL -DEPICS_CALL_DLL -c
|
||||
|
||||
#OUTPUT_OPTION = /o "$@"
|
||||
OUTPUT_OPTION = /Fo"$@"
|
||||
LIB_LOCAL = C:\epics\epics-base\lib\win32-x86\Com.lib C:\epics\epics-base\lib\win32-x86\ca.lib \
|
||||
#C:\EPICS\boost_1_81_0\stage\lib\\libboost_thread-vc142-mt-x32-1_81.lib \
|
||||
#C:\EPICS\boost_1_81_0\stage\lib\\libboost_system-vc142-mt-gd-x32-1_81.lib \
|
||||
#C:\EPICS\boost_1_81_0\stage\lib\\libboost_date_time-vc142-mt-gd-x32-1_81.lib \
|
||||
#C:\EPICS\boost_1_81_0\stage\lib\\libboost_chrono-vc142-mt-x32-1_81.lib \
|
||||
#C:\EPICS\boost_1_81_0\stage\lib\\libboost_exception-vc142-mt-gd-x32-1_81.lib \
|
||||
#C:\Qt\qt-4.8.6-x64-msvc2010\lib\QtCore4.lib C:\Qt\qt-4.8.6-x64-msvc2010\lib\QtXml4.lib \
|
||||
#C:\Users\chrin\AppData\Local\Continuum\Anaconda3\envs\py345\libs\python34.lib
|
||||
#C:\Users\chrin\AppData\Local\Continuum\Anaconda3\envs\py345\libs\python34.lib \
|
||||
|
||||
OBJS= src\cafeCache.obj src\cafeGroup.obj src\cafe.obj src\cafeVectors.obj \
|
||||
src\callbackHandlerCreate.obj src\callbackHandlerMonitor.obj src\conduitGroup.obj src\conduit.obj \
|
||||
src\connectCallbacks.obj src\connectGroup.obj \
|
||||
src\connect.obj src\exceptionsHelper.obj src\granules.obj src\handleHelper.obj src\helper.obj \
|
||||
src\methodCallbacks.obj src\policyHelper.obj src\transpose.obj \
|
||||
src\cafeXML.obj src\loadCollectionXMLParser.obj src\loadGroupXMLParser.obj \
|
||||
src\restorePVGroupXMLParser.obj $(LIB_LOCAL)
|
||||
|
||||
OBJS= cafeCache.obj cafeGroup.obj cafe.obj cafeVectors.obj \
|
||||
callbackHandlerCreate.obj callbackHandlerMonitor.obj conduitGroup.obj conduit.obj \
|
||||
connectCallbacks.obj connectGroup.obj \
|
||||
connect.obj exceptionsHelper.obj granules.obj handleHelper.obj helper.obj \
|
||||
methodCallbacks.obj policyHelper.obj transpose.obj \
|
||||
cafeXML.obj loadCollectionXMLParser.obj loadGroupXMLParser.obj \
|
||||
restorePVGroupXMLParser.obj $(LIB_LOCAL)
|
||||
cafe.lib: $(OBJS)
|
||||
LIB $(OBJS) /out:cafe.lib
|
||||
|
||||
|
||||
|
||||
$(LIB_DEST)\cafe.lib: $(OBJS)
|
||||
LIB $(OBJS) /out:$(LIB_DEST)\cafe.lib
|
||||
|
||||
|
||||
%.obj: src\%.cpp
|
||||
%.obj: %.cpp
|
||||
$(CXX) $(CXXFLAGS) $(INCLUDES) $(OUTPUT_OPTION) $<
|
||||
|
||||
|
||||
clean:
|
||||
del *.obj
|
||||
del src\*.obj
|
||||
|
||||
|
||||
|
||||
39
MakefileWin/Makefile_noqt_windows7
Normal file
39
MakefileWin/Makefile_noqt_windows7
Normal file
@@ -0,0 +1,39 @@
|
||||
INCLUDES = -IC:\CAFE\cafe-1.0.0-beta-3\cpp\include -IC:\local\boost_1_63_0\boost \
|
||||
-IC:\local\boost_1_63_0 -IC:\EPICS\base-3.14.12.5\include -IC:\EPICS\base-3.14.12.5\include\os\WIN32
|
||||
#-IC:\Qt\qt-4.8.6-x64-msvc2010\include -Ic:\Qt\qt-4.8.6-x64-msvc2010\include -Ic:\Qt\qt-4.8.6-x64-msvc2010\include\QtCore \
|
||||
#-IC:\Qt\qt-4.8.6-msvc2010\include\QtXml
|
||||
#-IC:\Users\chrin\AppData\Local\Continuum\Anaconda3\envs\py345\include
|
||||
|
||||
LIB_DEST=lib\cafe-noqt
|
||||
|
||||
CXX=cl
|
||||
CXXFLAGS = /W4 /EHsc /c /MT
|
||||
OUTPUT_OPTION = /o "$@"
|
||||
LIB_LOCAL = C:\epics\base-3.14.12.5\lib\windows-x64\Com.lib C:\epics\base-3.14.12.5\lib\windows-x64\ca.lib \
|
||||
C:\local\boost_1_63_0\lib64-msvc-10.0\libboost_thread-vc100-mt-s-1_63.lib \
|
||||
C:\local\boost_1_63_0\lib64-msvc-10.0\libboost_system-vc100-mt-s-1_63.lib
|
||||
#C:\Qt\qt-4.8.6-x64-msvc2010\lib\QtCore4.lib C:\Qt\qt-4.8.6-x64-msvc2010\lib\QtXml4.lib \
|
||||
#C:\Users\chrin\AppData\Local\Continuum\Anaconda3\envs\py345\libs\python34.lib
|
||||
|
||||
|
||||
OBJS= cafeCache.obj cafeGroup.obj cafe.obj cafeVectors.obj \
|
||||
callbackHandlerCreate.obj callbackHandlerMonitor.obj conduitGroup.obj conduit.obj \
|
||||
connectCallbacks.obj connectGroup.obj \
|
||||
connect.obj exceptionsHelper.obj granules.obj handleHelper.obj helper.obj \
|
||||
methodCallbacks.obj policyHelper.obj transpose.obj \
|
||||
cafeXML.obj loadCollectionXMLParser.obj loadGroupXMLParser.obj \
|
||||
restorePVGroupXMLParser.obj $(LIB_LOCAL)
|
||||
|
||||
|
||||
|
||||
$(LIB_DEST)\cafe.lib: $(OBJS)
|
||||
LIB $(OBJS) /out:$(LIB_DEST)\cafe.lib
|
||||
|
||||
|
||||
%.obj: src\%.cpp
|
||||
$(CXX) $(CXXFLAGS) $(INCLUDES) $(OUTPUT_OPTION) $<
|
||||
|
||||
clean:
|
||||
del *.obj
|
||||
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
|
||||
/* epics major release */
|
||||
#define EPICS_MAJOR 3
|
||||
#define EPICS_MAJOR 7
|
||||
|
||||
/* epics minor release */
|
||||
#define EPICS_MINOR 14
|
||||
#define EPICS_MINOR 0
|
||||
|
||||
/* epics patch release */
|
||||
#define EPICS_PATCH 12
|
||||
#define EPICS_PATCH 6
|
||||
|
||||
/* epics version */
|
||||
#define HAVE_EPICS 3.14.12
|
||||
#define HAVE_EPICS 7.0.6
|
||||
|
||||
/* Define to 1 if you have the <epicsTypes.h> header file. */
|
||||
#define HAVE_EPICSTYPES_H 1
|
||||
@@ -23,3 +23,6 @@
|
||||
/* Define to 1 if you have the <Python.h> header file. */
|
||||
/*#define HAVE_PYTHON_H 1 */
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#define _CRT_SECURE_NO_WARNINGS
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user