win32 compilation of the Geometry module.

diff --git a/src/Material/Makefile.am b/src/Material/Makefile.am
index 5c1931345e062ffb66c270a658995b5c265587d7..34347a0f1aa96a79502a358d347c0094c9fd93f2 100644 (file)
--- 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 3f7a39b3a52834307e20c48f934989a87cdbbe54..6bf4c062476e5b80457bb6bde4e65fbf71bd1ba3 100644 (file)
--- 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 )