Added WIN32_RUNTIME definitions.

This commit is contained in:
Janet B. Anderson
2006-12-04 22:45:43 +00:00
parent 4d30f6adaa
commit f48fe4c1c0

View File

@@ -11,53 +11,6 @@
-include $(TOP)/configure/os/CONFIG_SITE.Common.Common
# If objects were compiled with different default runtime libraries
# (not a good idea), specify which one you want to use in the product
# by making it the default and the others nodefault. Use
# WIN32_RUNTIME = MD, MT, or ML in Makefile.Host if you want to do
# this. It will avoid LNK4098 warnings.
# msvcrt.lib -MD Multi-thread DLL
# msvcrtd.lib -MDd Multi-thread DLL, Debug
# libcmt.lib -MT Multi-thread
# libcmtd.lib -MTd Multi-thread, Debug
# libc.lib -ML Single-thread
# libcd.lib -MLd Single-thread, Debug
# MD Multi-thread DLL product
ARCH_DEP_LDFLAGS_MD_NO += /DEFAULTLIB:"msvcrtd.lib"
ARCH_DEP_LDFLAGS_MD_NO += /NODEFAULTLIB:"msvcrt.lib"
ARCH_DEP_LDFLAGS_MD_YES += /DEFAULTLIB:"msvcrt.lib"
ARCH_DEP_LDFLAGS_MD_YES += /NODEFAULTLIB:"msvcrtd.lib"
ARCH_DEP_LDFLAGS_MD += $(ARCH_DEP_LDFLAGS_MD_$(HOST_OPT))
ARCH_DEP_LDFLAGS_MD += /NODEFAULTLIB:"libcmt.lib"
ARCH_DEP_LDFLAGS_MD += /NODEFAULTLIB:"libcmtd.lib"
ARCH_DEP_LDFLAGS_MD += /NODEFAULTLIB:"libc.lib"
ARCH_DEP_LDFLAGS_MD += /NODEFAULTLIB:"libcd.lib"
# MT Multi-threaded product
ARCH_DEP_LDFLAGS_MT_NO += /DEFAULTLIB:"libcmtd.lib"
ARCH_DEP_LDFLAGS_MT_NO += /NODEFAULTLIB:"libcmt.lib"
ARCH_DEP_LDFLAGS_MT_YES += /DEFAULTLIB:"libcmt.lib"
ARCH_DEP_LDFLAGS_MT_YES += /NODEFAULTLIB:"libcmtd.lib"
ARCH_DEP_LDFLAGS_MT += $(ARCH_DEP_LDFLAGS_MT_$(HOST_OPT))
ARCH_DEP_LDFLAGS_MT += /NODEFAULTLIB:"msvcrt.lib"
ARCH_DEP_LDFLAGS_MT += /NODEFAULTLIB:"msvcrtd.lib"
ARCH_DEP_LDFLAGS_MT += /NODEFAULTLIB:"libc.lib"
ARCH_DEP_LDFLAGS_MT += /NODEFAULTLIB:"libcd.lib"
# ML Single-threaded product
ARCH_DEP_LDFLAGS_ML_NO += /DEFAULTLIB:"libcd.lib"
ARCH_DEP_LDFLAGS_ML_NO += /NODEFAULTLIB:"libc.lib"
ARCH_DEP_LDFLAGS_ML_YES += /DEFAULTLIB:"libc.lib"
ARCH_DEP_LDFLAGS_ML_YES += /NODEFAULTLIB:"libcd.lib"
ARCH_DEP_LDFLAGS_ML += $(ARCH_DEP_LDFLAGS_ML_$(HOST_OPT))
ARCH_DEP_LDFLAGS_ML += /NODEFAULTLIB:"msvcrt.lib"
ARCH_DEP_LDFLAGS_ML += /NODEFAULTLIB:"msvcrtd.lib"
ARCH_DEP_LDFLAGS_ML += /NODEFAULTLIB:"libcmt.lib"
ARCH_DEP_LDFLAGS_ML += /NODEFAULTLIB:"libcmtd.lib"
ARCH_DEP_LDFLAGS += $(ARCH_DEP_LDFLAGS_$(WIN32_RUNTIME))
# ---------- java definitions
JAVA_DIR=c:/j2sdk1.4.1_01
@@ -100,4 +53,3 @@ SCIPLOT = ../../src/medmdev/medm
ZLIB_CFLAG = -DzLib
ZLIB_PROD_LIB = z
z_DIR = $(EPICS_EXTENSIONS_LIB)