From 768ef87cac0b58e8fa6e133af4d7f076909623e8 Mon Sep 17 00:00:00 2001 From: Joachim Schoeberl Date: Tue, 18 May 2010 11:28:15 +0000 Subject: [PATCH] suggestions by E.A. (salome) --- libsrc/general/Makefile.am | 4 ++-- libsrc/general/template.hpp | 2 +- libsrc/meshing/global.hpp | 2 +- ng/Makefile.am | 2 +- ng/menustat.tcl | 2 +- ng/ngpkg.cpp | 6 +++--- nglib/Makefile.am | 2 +- nglib/nglib.cpp | 6 +++--- nglib/nglib.h | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/libsrc/general/Makefile.am b/libsrc/general/Makefile.am index ad5d8337..9c555b02 100644 --- a/libsrc/general/Makefile.am +++ b/libsrc/general/Makefile.am @@ -6,8 +6,8 @@ include_HEADERS = ngexception.hpp AM_CPPFLAGS = $(MPI_INCLUDES) -I$(top_srcdir)/libsrc/include METASOURCES = AUTO -noinst_LTLIBRARIES = libgeneral.la -libgeneral_la_SOURCES = array.cpp bitarray.cpp dynamicmem.cpp flags.cpp \ +noinst_LTLIBRARIES = libgen.la +libgen_la_SOURCES = array.cpp bitarray.cpp dynamicmem.cpp flags.cpp \ hashtabl.cpp mystring.cpp ngexception.cpp optmem.cpp parthreads.cpp \ profiler.cpp seti.cpp sort.cpp spbita2d.cpp symbolta.cpp table.cpp diff --git a/libsrc/general/template.hpp b/libsrc/general/template.hpp index e717bf6d..80352fcd 100644 --- a/libsrc/general/template.hpp +++ b/libsrc/general/template.hpp @@ -33,7 +33,7 @@ extern ostream * myerr; /** Error messages display. Error messages are displayed by this function */ -extern void MyError (const char * ch); +DLL_HEADER extern void MyError (const char * ch); /** Rings the bell. diff --git a/libsrc/meshing/global.hpp b/libsrc/meshing/global.hpp index a79b5a4c..49c4a422 100644 --- a/libsrc/meshing/global.hpp +++ b/libsrc/meshing/global.hpp @@ -13,7 +13,7 @@ */ /// -extern double GetTime (); +DLL_HEADER extern double GetTime (); extern void ResetTime (); /// diff --git a/ng/Makefile.am b/ng/Makefile.am index 88f83876..bbab1142 100644 --- a/ng/Makefile.am +++ b/ng/Makefile.am @@ -15,7 +15,7 @@ netgen_LDADD = $(top_builddir)/libsrc/visualization/libvisual.a \ $(top_builddir)/libsrc/meshing/libmesh.la \ $(top_builddir)/libsrc/gprim/libgprim.la \ $(top_builddir)/libsrc/linalg/libla.la \ - $(top_builddir)/libsrc/general/libgeneral.la \ + $(top_builddir)/libsrc/general/libgen.la \ $(OCCLIBS) -L$(TK_BIN_DIR)/Togl1.7 $(TOGLLIBDIR) -lTogl1.7 $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS) # add for static linkage of ngsolve: diff --git a/ng/menustat.tcl b/ng/menustat.tcl index 4bad901c..a852d45e 100644 --- a/ng/menustat.tcl +++ b/ng/menustat.tcl @@ -839,7 +839,7 @@ menu .ngmenu.help .ngmenu.help add command -label "About..." \ -command { -tk_messageBox -message "This is NETGEN \nmainly written by \nJoachim Schöberl \nthanks to \nRobert Gaisbauer, Johannes Gerstmayr, Philippose Rajan" +tk_messageBox -message "This is NETGEN \nmainly written by \nJoachim Schoeberl \nthanks to \nRobert Gaisbauer, Johannes Gerstmayr, Philippose Rajan" } # tk_menuBar .mbar .mbar.file .mbar.mesh .mbar.test .mbar.help diff --git a/ng/ngpkg.cpp b/ng/ngpkg.cpp index 45559707..8e539c7f 100644 --- a/ng/ngpkg.cpp +++ b/ng/ngpkg.cpp @@ -246,7 +246,7 @@ namespace netgen #ifndef SMALLLIB // Destination for messages, errors, ... - void Ng_PrintDest(const char * s) + DLL_HEADER void Ng_PrintDest(const char * s) { #ifdef PARALLEL int id, ntasks; @@ -263,7 +263,7 @@ namespace netgen (*mycout) << "p" << id << ": " << s << flush ; } - void MyError(const char * ch) + DLL_HEADER void MyError(const char * ch) { cout << ch; (*testout) << "Error !!! " << ch << endl << flush; @@ -277,7 +277,7 @@ namespace netgen } #ifndef SMALLLIB - double GetTime () + DLL_HEADER double GetTime () { return double(clock() - starttimea) / CLOCKS_PER_SEC; } diff --git a/nglib/Makefile.am b/nglib/Makefile.am index d8320e6a..209b686d 100644 --- a/nglib/Makefile.am +++ b/nglib/Makefile.am @@ -16,7 +16,7 @@ libnglib_la_LIBADD = \ $(top_builddir)/libsrc/meshing/libmesh.la \ $(top_builddir)/libsrc/gprim/libgprim.la \ $(top_builddir)/libsrc/linalg/libla.la \ - $(top_builddir)/libsrc/general/libgeneral.la \ + $(top_builddir)/libsrc/general/libgen.la \ $(OCCLIBS) $(MPI_LIBS) libnglib_la_LDFLAGS = -avoid-version diff --git a/nglib/nglib.cpp b/nglib/nglib.cpp index 173ba185..cfc24990 100644 --- a/nglib/nglib.cpp +++ b/nglib/nglib.cpp @@ -963,18 +963,18 @@ namespace netgen char geomfilename[255]; - void MyError (const char * ch) + DLL_HEADER void MyError (const char * ch) { cerr << ch; } //Destination for messages, errors, ... - void Ng_PrintDest(const char * s) + DLL_HEADER void Ng_PrintDest(const char * s) { (*mycout) << s << flush; } - double GetTime () + DLL_HEADER double GetTime () { return 0; } diff --git a/nglib/nglib.h b/nglib/nglib.h index bee5c698..3fb97a6e 100644 --- a/nglib/nglib.h +++ b/nglib/nglib.h @@ -24,7 +24,7 @@ // Philippose - 14.02.2009 // Modifications for creating a DLL in Windows #ifdef WIN32 - #ifdef NGLIB_EXPORTS + #ifdef NGLIB_EXPORTS || nglib_EXPORTS #define DLL_HEADER __declspec(dllexport) #else #define DLL_HEADER __declspec(dllimport)