From eed87c32e43d813737ce990e8d9a1fc1835d9c13 Mon Sep 17 00:00:00 2001 From: rnv Date: Wed, 1 Feb 2012 12:21:41 +0000 Subject: [PATCH] win32 compilation of the Geometry module. --- src/Material/Makefile.am | 7 +++++-- src/Material/Material.h | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Material/Makefile.am b/src/Material/Makefile.am index 5c1931345..34347a0f1 100644 --- a/src/Material/Makefile.am +++ b/src/Material/Makefile.am @@ -45,7 +45,10 @@ libMaterial_la_CPPFLAGS = \ $(GUI_CXXFLAGS) \ -I$(srcdir)/../OBJECT -libMaterial_la_LDFLAGS = \ - $(GUI_LDFLAGS) -lVTKViewer -lOCCViewer -lsuit -lSalomeApp +libMaterial_la_LDFLAGS = -lVTKViewer -lOCCViewer -lsuit -lSalomeApp \ + $(GUI_LDFLAGS) -lqtx \ + $(QT_MT_LIBS) \ + $(CAS_LDFLAGS) -lTKV3d -lTKGeomBase \ + $(VTK_LIBS) dist_salomeres_DATA = resources/SalomeMaterial.xml diff --git a/src/Material/Material.h b/src/Material/Material.h index 3f7a39b3a..6bf4c0624 100644 --- a/src/Material/Material.h +++ b/src/Material/Material.h @@ -24,7 +24,7 @@ #define MATERIAL_H #if defined WIN32 -# if defined MATERIAL_SALOME_EXPORTS || defined MATERIAL_EXPORTS || defined SalomeMaterial_EXPORTS +# if defined MATERIAL_SALOME_EXPORTS || defined Material_EXPORTS # define MATERIAL_SALOME_EXPORT _declspec( dllexport ) # else # define MATERIAL_SALOME_EXPORT _declspec( dllimport )