diff --git a/code/nel/include/nel/georges/form.h b/code/nel/include/nel/georges/form.h index da5c0ea88..68d9c58e3 100644 --- a/code/nel/include/nel/georges/form.h +++ b/code/nel/include/nel/georges/form.h @@ -22,7 +22,7 @@ #include "form_elm.h" #include "header.h" -extern bool convertFormFile (const std::string &oldFileName, const std::string &newFileName); +NLGEORGES_API extern bool convertFormFile(const std::string &oldFileName, const std::string &newFileName); namespace NLGEORGES { diff --git a/code/nel/include/nel/georges/u_form.h b/code/nel/include/nel/georges/u_form.h index d53e415f7..cc79d0a17 100644 --- a/code/nel/include/nel/georges/u_form.h +++ b/code/nel/include/nel/georges/u_form.h @@ -38,7 +38,7 @@ class UForm : public NLMISC::CRefCount { public: - virtual ~UForm (); + virtual ~UForm() {} /** * Access form nodes diff --git a/code/nel/include/nel/georges/u_form_loader.h b/code/nel/include/nel/georges/u_form_loader.h index c1cb30cfb..c1c653c24 100644 --- a/code/nel/include/nel/georges/u_form_loader.h +++ b/code/nel/include/nel/georges/u_form_loader.h @@ -58,10 +58,10 @@ public: virtual UType *loadFormType (const std::string &filename) = 0; /// Create a form loader - static UFormLoader *createLoader (); + NLGEORGES_API static UFormLoader *createLoader(); /// Create a form loader - static void releaseLoader (UFormLoader *loader); + NLGEORGES_API static void releaseLoader(UFormLoader *loader); }; diff --git a/code/nel/include/nel/misc/types_nl.h b/code/nel/include/nel/misc/types_nl.h index 30c14bb09..76dd9c21e 100644 --- a/code/nel/include/nel/misc/types_nl.h +++ b/code/nel/include/nel/misc/types_nl.h @@ -556,9 +556,15 @@ typedef uint16 ucchar; #else #define NLSOUND_LOWLEVEL_API NL_DECL_DLLIMP #endif +#ifdef NLGEORGES_DLLEXP +#define NLGEORGES_API NL_DECL_DLLEXP +#else +#define NLGEORGES_API NL_DECL_DLLIMP +#endif #else #define NLMISC_API #define NLSOUND_LOWLEVEL_API +#define NLGEORGES_API #endif // To define a 64bits constant; ie: UINT64_CONSTANT(0x123456781234) diff --git a/code/nel/src/georges/CMakeLists.txt b/code/nel/src/georges/CMakeLists.txt index 802324d31..9468d7577 100644 --- a/code/nel/src/georges/CMakeLists.txt +++ b/code/nel/src/georges/CMakeLists.txt @@ -3,7 +3,7 @@ FILE(GLOB HEADERS ../../include/nel/georges/*.h) # SOURCE_GROUP(headers FILES ${HEADERS}) -NL_TARGET_LIB(nelgeorges ${HEADERS} ${SRC}) +NL_TARGET_LIB2(nelgeorges ${HEADERS} ${SRC}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) @@ -13,6 +13,10 @@ NL_ADD_RUNTIME_FLAGS(nelgeorges) NL_ADD_LIB_SUFFIX(nelgeorges) +IF(WIN32 AND NOT WITH_STATIC2) + ADD_DEFINITIONS(-DNLGEORGES_DLLEXP) +ENDIF() + ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) IF(WITH_PCH) diff --git a/code/nel/src/georges/form.cpp b/code/nel/src/georges/form.cpp index a02b9e8cd..021f037dc 100644 --- a/code/nel/src/georges/form.cpp +++ b/code/nel/src/georges/form.cpp @@ -64,12 +64,6 @@ void warning (bool exception, const char *format, ... ) // UForm // *************************************************************************** -UForm::~UForm () -{ -} - -// *************************************************************************** - UFormElm& CForm::getRootNode () { return Elements;