From: <vo...@us...> - 2008-10-19 06:38:44
|
Revision: 881 http://opde.svn.sourceforge.net/opde/?rev=881&view=rev Author: volca Date: 2008-10-19 06:38:34 +0000 (Sun, 19 Oct 2008) Log Message: ----------- removing some outdated defines Modified Paths: -------------- trunk/config.h.cmake Modified: trunk/config.h.cmake =================================================================== --- trunk/config.h.cmake 2008-10-19 06:32:54 UTC (rev 880) +++ trunk/config.h.cmake 2008-10-19 06:38:34 UTC (rev 881) @@ -1,47 +1,44 @@ -#ifndef _CONFIG_H -#define _CONFIG_H - -#cmakedefine HAVE_INTTYPES_H 1 - -#cmakedefine OPDE_DEBUG -#cmakedefine __STATIC_GEOMETRY -#cmakedefine CUSTOM_IMAGE_HOOKS -#cmakedefine PYTHON_SUPPORT - -#define OPDE_VER_MAJOR ${OPDE_VER_MAJOR} -#define OPDE_VER_MINOR ${OPDE_VER_MINOR} -#define OPDE_VER_PATCH ${OPDE_VER_PATCH} - -#cmakedefine __OPDE_BIG_ENDIAN ${BIG_ENDIAN} - -#if defined (_MSC_VER) -// disable the class needs to have a dll-interface... -#pragma warning(disable:4251) -// No suitable definition for explicit template spec warning disable -#pragma warning(disable:4661) -#endif - -// DLL export/import stuff for OpdeLib -// If the build target is OpdeLib, the OpdeLib_EXPORTS is defined, -// otherwise it is not. Trouble is we need it unset for all library targets, -// so that all the static libs build and can be linked together. -// We also want OPDELIB_EXPORT to be dllimport for executables -// Thus, we define our own macros in the CMakeLists.txt files that define the -// contents of the OPDELIB_EXPORT -#if defined (_WIN32) // It is said that mingw also tolerates __declspec - #if defined(OPDELIB_DLL_TARGET) - #define OPDELIB_EXPORT __declspec(dllexport) - #elif defined(OPDE_EXE_TARGET) - #define OPDELIB_EXPORT __declspec(dllimport) - #else - #define OPDELIB_EXPORT - #endif /* OpdeLib_EXPORTS */ +#ifndef _CONFIG_H +#define _CONFIG_H + +#cmakedefine HAVE_INTTYPES_H 1 + +#cmakedefine OPDE_DEBUG + +#define OPDE_VER_MAJOR ${OPDE_VER_MAJOR} +#define OPDE_VER_MINOR ${OPDE_VER_MINOR} +#define OPDE_VER_PATCH ${OPDE_VER_PATCH} + +#cmakedefine __OPDE_BIG_ENDIAN ${BIG_ENDIAN} + +#if defined (_MSC_VER) +// disable the class needs to have a dll-interface... +#pragma warning(disable:4251) +// No suitable definition for explicit template spec warning disable +#pragma warning(disable:4661) +#endif + +// DLL export/import stuff for OpdeLib +// If the build target is OpdeLib, the OpdeLib_EXPORTS is defined, +// otherwise it is not. Trouble is we need it unset for all library targets, +// so that all the static libs build and can be linked together. +// We also want OPDELIB_EXPORT to be dllimport for executables +// Thus, we define our own macros in the CMakeLists.txt files that define the +// contents of the OPDELIB_EXPORT +#if defined (_WIN32) // It is said that mingw also tolerates __declspec + #if defined(OPDELIB_DLL_TARGET) + #define OPDELIB_EXPORT __declspec(dllexport) + #elif defined(OPDE_EXE_TARGET) + #define OPDELIB_EXPORT __declspec(dllimport) + #else + #define OPDELIB_EXPORT + #endif /* OpdeLib_EXPORTS */ #elif defined(GCC4) #if defined(OPDELIB_DLL_TARGET) #define OPDELIB_EXPORT __attribute__ ((visibility("default"))) #endif /* OPDELIB_DLL_TARGET */ #else /* defined (GCC4) */ - #define OPDELIB_EXPORT -#endif - -#endif + #define OPDELIB_EXPORT +#endif + +#endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |