From 55d8e368d79bec45bfdd6639770d5dfd7efcee08 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Thu, 18 Feb 1999 03:20:32 +0000 Subject: [PATCH] Updated DLL definitions for VC++ 6.0 - now define "FL_STATIC" for static library to avoid warnings & errors. git-svn-id: file:///fltk/svn/fltk/trunk@286 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- FL/Enumerations.H | 7 +++++-- FL/filename.H | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/FL/Enumerations.H b/FL/Enumerations.H index 4cb85c9fd..6e0988bc3 100644 --- a/FL/Enumerations.H +++ b/FL/Enumerations.H @@ -1,5 +1,5 @@ // -// "$Id: Enumerations.H,v 1.12 1999/02/16 21:59:33 mike Exp $" +// "$Id: Enumerations.H,v 1.13 1999/02/18 03:20:31 mike Exp $" // // Enumerations for the Fast Light Tool Kit (FLTK). // @@ -34,6 +34,9 @@ # ifdef FL_DLL # define FL_EXPORT __declspec(dllexport) # define FL_IMPORT __declspec(dllimport) +# elif defined(FL_STATIC) +# define FL_EXPORT +# define FL_IMPORT # else # define FL_EXPORT __declspec(dllimport) # define FL_IMPORT __declspec(dllexport) @@ -368,5 +371,5 @@ enum Fl_Damage { #endif // -// End of "$Id: Enumerations.H,v 1.12 1999/02/16 21:59:33 mike Exp $". +// End of "$Id: Enumerations.H,v 1.13 1999/02/18 03:20:31 mike Exp $". // diff --git a/FL/filename.H b/FL/filename.H index bfde28f9c..051c9f4f8 100644 --- a/FL/filename.H +++ b/FL/filename.H @@ -1,5 +1,5 @@ // -// "$Id: filename.H,v 1.6 1999/02/16 21:59:47 mike Exp $" +// "$Id: filename.H,v 1.7 1999/02/18 03:20:32 mike Exp $" // // Filename header file for the Fast Light Tool Kit (FLTK). // @@ -34,6 +34,9 @@ # ifdef FL_DLL # define FL_EXPORT __declspec(dllexport) # define FL_IMPORT __declspec(dllimport) +# elif defined(FL_STATIC) +# define FL_EXPORT +# define FL_IMPORT # else # define FL_EXPORT __declspec(dllimport) # define FL_IMPORT __declspec(dllexport) @@ -79,5 +82,5 @@ FL_EXPORT int filename_list(const char *d, struct dirent ***list); #endif // -// End of "$Id: filename.H,v 1.6 1999/02/16 21:59:47 mike Exp $". +// End of "$Id: filename.H,v 1.7 1999/02/18 03:20:32 mike Exp $". //