1
1

Removing everything in CFLAGS which adds debug version of windows libraries. There are some issues with the way we use memory which results in perpetual assertion failures on windows

This commit was SVN r4181.
Этот коммит содержится в:
Prabhanjan Kambadur 2005-01-27 00:13:44 +00:00
родитель e851aa9118
Коммит 6075354290
2 изменённых файлов: 11 добавлений и 19 удалений

Просмотреть файл

@ -22,7 +22,7 @@ topdir := $(shell cygpath -m $(CURDIR))/../..
gen_base = ${topdir}/src/win32/generated_include gen_base = ${topdir}/src/win32/generated_include
copy_base = ${topdir}/src/mca/ copy_base = ${topdir}/src/mca/
prefix = ${topdir}/src/Debug prefix = ${topdir}/src/Debug
installdir = ${prefix}/lib installdir = ${topdir}/src/Debug/lib
# list of components to build with the c compiler # list of components to build with the c compiler
C_SUBDIRS = \ C_SUBDIRS = \
@ -67,16 +67,12 @@ CFLAGS = \
/DHAVE_CONFIG_H \ /DHAVE_CONFIG_H \
/DOMPI_SYSCONFDIR="\"${installdir}/share\"" \ /DOMPI_SYSCONFDIR="\"${installdir}/share\"" \
/EHsc \ /EHsc \
/MLd \ /ML \
/W0 \ /W0 \
/Wp64 \ /Wp64 \
/ZI \
/Zi \
/TC \ /TC \
/D_MBCS \ /D_MBCS \
/Gm \ /LD\
/Od \
/LDd \
/nologo \ /nologo \
/c /c
@ -87,19 +83,18 @@ CPPFLAGS = \
/DHAVE_CONFIG_H \ /DHAVE_CONFIG_H \
/DOMPI_SYSCONFDIR="\"${installdir}/share\"" \ /DOMPI_SYSCONFDIR="\"${installdir}/share\"" \
/EHsc \ /EHsc \
/MLd \ /ML \
/W0 \ /W0 \
/Wp64 \ /Wp64 \
/ZI \
/Zi \
/D_MBCS \ /D_MBCS \
/Gm \ /LD \
/Od \
/LDd \
/nologo \ /nologo \
/c /c
# link with ompi.lib to resolve external symbols # link with ompi.lib to resolve external symbols
#OMPILIB = \
"${topdir}/vcproj/ompi/Debug/libmpi.lib"
OMPILIB = \ OMPILIB = \
"${topdir}/src/libmpi.lib" "${topdir}/src/libmpi.lib"

Просмотреть файл

@ -99,16 +99,11 @@ CFLAGS = \
/DHAVE_CONFIG_H \ /DHAVE_CONFIG_H \
/D_WINDLL \ /D_WINDLL \
/EHsc \ /EHsc \
/MLd \ /ML \
/W0 \ /W0 \
/Wp64 \ /Wp64 \
/ZI \
/Zi \
/TC \ /TC \
/D_MBCS \ /D_MBCS \
/Gm \
/Od \
/LDd \
/Fo"${topdir}/src/Debug/" \ /Fo"${topdir}/src/Debug/" \
/nologo \ /nologo \
/c /c
@ -134,6 +129,8 @@ LINK = link
LINKFLAGS = \ LINKFLAGS = \
/DLL \ /DLL \
/OPT:NOICF \
/OPT:NOREF \
/IMPLIB:libmpi.lib\ /IMPLIB:libmpi.lib\
/nologo \ /nologo \
/OUT:libmpi.dll /OUT:libmpi.dll