From 4610ba957aad7461be6a75b7304d80b227cc8258 Mon Sep 17 00:00:00 2001 From: eap Date: Mon, 11 Apr 2011 08:28:29 +0000 Subject: [PATCH] med-2.1 file no longer supported --- src/CONVERTOR/Makefile.am | 4 ++-- src/CONVERTOR/VISU_MedConvertor.cxx | 4 ++-- src/PIPELINE/Makefile.am | 2 +- src/VISU_I/Makefile.am | 2 -- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/CONVERTOR/Makefile.am b/src/CONVERTOR/Makefile.am index 6a9093d9..7ea4ec03 100644 --- a/src/CONVERTOR/Makefile.am +++ b/src/CONVERTOR/Makefile.am @@ -98,7 +98,7 @@ libVisuConvertor_la_LDFLAGS= \ $(KERNEL_LDFLAGS) -lSALOMEBasics \ $(CAS_KERNEL) \ $(CAS_MATH) \ - $(MED_LDFLAGS) -lMEDWrapper -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 -lMEDWrapperBase \ + $(MED_LDFLAGS) -lMEDWrapper -lMEDWrapper_V2_2 -lMEDWrapperBase \ $(GUI_LDFLAGS) -lVTKViewer # Executables targets @@ -106,4 +106,4 @@ bin_PROGRAMS= VISUConvertor dist_VISUConvertor_SOURCES= VISUConvertor.cxx VISUConvertor_CPPFLAGS=$(libVisuConvertor_la_CPPFLAGS) VISUConvertor_LDADD=$(libVisuConvertor_la_LDFLAGS) \ - -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 -lMEDWrapperBase -lMEDWrapper -lmed_V2_1 -lVTKViewer -lsuit -lqtx libVisuConvertor.la + -lMEDWrapper_V2_2 -lMEDWrapperBase -lMEDWrapper -lVTKViewer -lsuit -lqtx libVisuConvertor.la diff --git a/src/CONVERTOR/VISU_MedConvertor.cxx b/src/CONVERTOR/VISU_MedConvertor.cxx index 8ee84ca6..d52f8704 100644 --- a/src/CONVERTOR/VISU_MedConvertor.cxx +++ b/src/CONVERTOR/VISU_MedConvertor.cxx @@ -1187,8 +1187,8 @@ namespace VISU MED::TInt GetPNOMLength(MED::EVersion theVersion) { - if(theVersion == MED::eV2_1) - return MED::GetPNOMLength(); +// if(theVersion == MED::eV2_1) +// return MED::GetPNOMLength(); return MED::GetPNOMLength(); } diff --git a/src/PIPELINE/Makefile.am b/src/PIPELINE/Makefile.am index 6aec80a1..301fca3c 100644 --- a/src/PIPELINE/Makefile.am +++ b/src/PIPELINE/Makefile.am @@ -149,4 +149,4 @@ dist_VISU_img2vti_SOURCES= VISU_img2vti.cxx AM_CPPFLAGS+=$(libVisuPipeLine_la_CPPFLAGS) LDADD=$(libVisuPipeLine_la_LDFLAGS) libVisuPipeLine.la \ - -lOpUtil -lMEDWrapper -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 -lMEDWrapperBase -lmed_V2_1 -lsuit -lqtx -lSALOMEBasics -lvtkWidgets + -lOpUtil -lMEDWrapper -lMEDWrapper_V2_2 -lMEDWrapperBase -lsuit -lqtx -lSALOMEBasics -lvtkWidgets diff --git a/src/VISU_I/Makefile.am b/src/VISU_I/Makefile.am index 8e56999e..f247e230 100644 --- a/src/VISU_I/Makefile.am +++ b/src/VISU_I/Makefile.am @@ -215,7 +215,5 @@ VISU_I_LDADD=\ -lMEDWrapper \ -lMEDWrapperBase \ -lMEDWrapper_V2_2 \ - -lMEDWrapper_V2_1 \ - -lmed_V2_1 \ -lmedmem \ @CORBA_LIBS@ -- 2.39.2