From fcbec04b9c0004c172a8ffe6a7138eb7320a7c24 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Fri, 26 Feb 2016 00:50:19 +0100 Subject: [PATCH] we don't support static build [on windows] anyway --- include/simgrid_config.h.in | 11 ++--------- include/xbt/base.h | 14 +------------- tools/cmake/src/internal_config.h.in | 15 +++------------ 3 files changed, 6 insertions(+), 34 deletions(-) diff --git a/include/simgrid_config.h.in b/include/simgrid_config.h.in index 279ba4614b..7e118863d9 100644 --- a/include/simgrid_config.h.in +++ b/include/simgrid_config.h.in @@ -31,20 +31,13 @@ SIMGRID_VERSION_PATCH) /* take care of DLL usage madness */ - #ifdef _XBT_DLL_EXPORT #ifndef DLL_EXPORT #define DLL_EXPORT #endif #else - #ifdef _XBT_DLL_STATIC - #ifndef DLL_STATIC - #define DLL_STATIC - #endif - #else - #ifndef DLL_EXPORT - #define DLL_IMPORT - #endif + #ifndef DLL_EXPORT + #define DLL_IMPORT #endif #endif diff --git a/include/xbt/base.h b/include/xbt/base.h index 11800076eb..466e7a5928 100644 --- a/include/xbt/base.h +++ b/include/xbt/base.h @@ -179,9 +179,6 @@ * * * If you build the DLL, define the DLL_EXPORT symbol so that all symbols * actually get exported by this file. - - * * If you do a static windows compilation, define DLL_STATIC, both when - * compiling the application files and when compiling the library. * * * If you link your application against the DLL or if you do a UNIX build, * don't do anything special. This file will do the right thing for you @@ -218,17 +215,8 @@ # define XBT_PUBLIC_CLASS class __declspec(dllexport) # define XBT_PRIVATE -/* Pack everything up statically */ -#elif defined(DLL_STATIC) -# define XBT_PUBLIC(type) type -# define XBT_EXPORT_NO_IMPORT(type) type -# define XBT_IMPORT_NO_EXPORT(type) type -# define XBT_PUBLIC_DATA(type) extern type -# define XBT_PUBLIC_CLASS class -# define XBT_PRIVATE - /* Link against the DLL */ -#elif (defined(_XBT_WIN32) && !defined(DLL_EXPORT) && !defined(DLL_STATIC)) +#elif (defined(_XBT_WIN32) && !defined(DLL_EXPORT)) # define XBT_PUBLIC(type) __declspec(dllimport) type # define XBT_EXPORT_NO_IMPORT(type) type # define XBT_IMPORT_NO_EXPORT(type) __declspec(dllimport) type diff --git a/tools/cmake/src/internal_config.h.in b/tools/cmake/src/internal_config.h.in index ed84952415..a26e698a83 100644 --- a/tools/cmake/src/internal_config.h.in +++ b/tools/cmake/src/internal_config.h.in @@ -3,7 +3,7 @@ /* Warning: The file internal_config.h is AUTOMATICALLY GENERATED by Cmake. * Edit the template instead: tools/cmake/src/internal_config.h.in */ -/* Copyright (c) 2004-2014. The SimGrid Team. +/* Copyright (c) 2004-2016. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -16,14 +16,8 @@ #define DLL_EXPORT #endif #else - #ifdef _XBT_DLL_STATIC - #ifndef DLL_STATIC - #define DLL_STATIC - #endif - #else - #ifndef DLL_EXPORT - #define DLL_IMPORT - #endif + #ifndef DLL_IMPORT + #define DLL_IMPORT #endif #endif @@ -56,9 +50,6 @@ #cmakedefine HAVE_CGRAPH_H @CGRAPH_H@ #cmakedefine HAVE_AGRAPH_H @AGRAPH_H@ -/* Define if building universal (internal helper macro) */ -#cmakedefine AC_APPLE_UNIVERSAL_BUILD @AC_APPLE_UNIVERSAL_BUILD@ - /* Path to the addr2line tool */ #cmakedefine ADDR2LINE "@ADDR2LINE@" -- 2.20.1