Skip to content

W32: prevent "dllexport" from being added to globalvardefs when building for static linking #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
umlaeute wants to merge 1 commit into
base: master
Choose a base branch
from
Open

W32: prevent "dllexport" from being added to globalvardefs when building for static linking #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions include/flite.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,15 @@ extern "C" {
#include "cst_units.h"
#include "cst_tokenstream.h"

#ifdef FLITE_STATIC
#define GLOBALVARDEF
#else
#ifdef WIN32
/* For Visual Studio 2012 global variable definitions */
#define GLOBALVARDEF __declspec(dllexport)
#else
#define GLOBALVARDEF
#endif
#endif
extern GLOBALVARDEF cst_val *flite_voice_list;
extern GLOBALVARDEF cst_lang flite_lang_list[20];
Expand Down
4 changes: 4 additions & 0 deletions src/synth/flite.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,16 @@
#include "cst_clunits.h"
#include "cst_cg.h"

#ifdef FLITE_STATIC
#define GLOBALVARDEF
#else
#ifdef WIN32
/* For Visual Studio 2012 global variable definitions */
#define GLOBALVARDEF __declspec(dllexport)
#else
#define GLOBALVARDEF
#endif
#endif

/* This is a global, which isn't ideal, this may change */
/* It is set when flite_set_voice_list() is called which happens in */
Expand Down