[liblouis-liblouisxml] [liblouisutdml] push by mwhapples - Defined LBUAPI to fix exporting of API functions when building with mi... on 2014-09-19 12:03 GMT
- From: liblouisutdml@xxxxxxxxxxxxxx
- To: liblouis-liblouisxml@xxxxxxxxxxxxx
- Date: Fri, 19 Sep 2014 12:03:38 +0000
Revision: ecdcb518327f
Branch: default
Author: Michael Whapples
Date: Fri Sep 19 12:15:34 2014 UTC
Log: Defined LBUAPI to fix exporting of API functions when building
with mingw-w64 and building Java bindings.
https://code.google.com/p/liblouisutdml/source/detail?r=ecdcb518327f
Modified:
/liblouisutdml/Makefile.am
/liblouisutdml/liblouisutdml.h
/liblouisutdml/logging.c
=======================================
--- /liblouisutdml/Makefile.am Thu Jun 19 14:55:56 2014 UTC
+++ /liblouisutdml/Makefile.am Fri Sep 19 12:15:34 2014 UTC
@@ -15,6 +15,8 @@
lib_LTLIBRARIES = liblouisutdml.la
+liblouisutdml_la_CPPFLAGS = \
+ -DLBUAPI
liblouisutdml_la_CFLAGS = \
$(BASE_DEPENDENCIES_CFLAGS)
=======================================
--- /liblouisutdml/liblouisutdml.h Tue Jul 29 12:08:57 2014 UTC
+++ /liblouisutdml/liblouisutdml.h Fri Sep 19 12:15:34 2014 UTC
@@ -41,20 +41,30 @@
/* Function prototypes are documented briefly below. For more extensive
documentation see liblouisutdml.html or type info liblouisutdml. */
+#ifdef _WIN32
+#ifdef LBUAPI
+#define LBUAPI __declspec(dllexport)
+#else
+#define LBUAPI __declspec(dllimport)
+#endif
+#else
+#define LBUAPI
+#endif
+
#ifndef EXPORT_CALL
#ifdef _WIN32
#define EXPORT_CALL __stdcall
- char *EXPORT_CALL lou_getProgramPath (void);
+ LBUAPI char *EXPORT_CALL lou_getProgramPath (void);
#else
#define EXPORT_CALL
#endif
#endif
- char *EXPORT_CALL lbu_version (void);
+ LBUAPI char *EXPORT_CALL lbu_version (void);
/* Returns the version of liblouisutdml and liblouis. */
- void EXPORT_CALL lbu_loadXMLCatalog(const char *fiilename);
- void *EXPORT_CALL lbu_initialize (const char *configFileList,
+ LBUAPI void EXPORT_CALL lbu_loadXMLCatalog(const char *fiilename);
+ LBUAPI void *EXPORT_CALL lbu_initialize (const char *configFileList,
const char *logFileName,
const char *settingsString);
@@ -80,7 +90,7 @@
louisDots = 1<<24
} ProcessingModes;
- int EXPORT_CALL lbu_translateString
+ LBUAPI int EXPORT_CALL lbu_translateString
(const char *configFileList,
const char *inbuf, int inlen, widechar *outbuf, int *outlen,
const char *logFileName, const char *settingsString, unsigned int
mode);
@@ -103,32 +113,32 @@
if a conplete translation could not be done. */
- int EXPORT_CALL lbu_backTranslateString
+ LBUAPI int EXPORT_CALL lbu_backTranslateString
(const char *configFileList,
const char *inbuf, int inlen, widechar *outbuf, int *outlen,
const char *logFileName, const char *settingsString, unsigned int
mode);
- int EXPORT_CALL lbu_translateFile (const char *configFileList, const char
+ LBUAPI int EXPORT_CALL lbu_translateFile (const char *configFileList,
const char
*inputFileName,
const char *outputFileName,
const char *logFileName,
const char *settingsString,
unsigned int mode);
- int EXPORT_CALL lbu_translateTextFile (const char *configFileList,
+ LBUAPI int EXPORT_CALL lbu_translateTextFile (const char *configFileList,
const char *inputFileName,
const char *outputFileName,
const char *logFileName,
const char *settingsString,
unsigned int mode);
- int EXPORT_CALL lbu_backTranslateFile (const char *configFileList,
+ LBUAPI int EXPORT_CALL lbu_backTranslateFile (const char *configFileList,
const char *inputFileName,
const char *outputFileName,
const char *logFileName,
const char *settingsString,
unsigned int mode);
- int EXPORT_CALL
+ LBUAPI int EXPORT_CALL
lbu_charToDots (const char *tableList, const unsigned char *inbuf,
unsigned char *outbuf, int length, const char
*logFile,
@@ -137,7 +147,7 @@
/* Convert the utf8 character string in inbuf to Unicode braille dot
patterns and place the result as a utf8 string in outbuf. */
- int EXPORT_CALL
+ LBUAPI int EXPORT_CALL
lbu_dotsToChar (const char *tableList, const unsigned char *inbuf,
unsigned char *outbuf, int length, const char
*logFile,
@@ -146,7 +156,7 @@
/* Convert the utf8 string of dot patterns in inbuf to characters and
place the result as a utf8 string in outbuf. */
- int EXPORT_CALL
+ LBUAPI int EXPORT_CALL
lbu_checkTable (const char *tableList, const char *logFile, unsigned
int
mode);
@@ -155,20 +165,20 @@
found logFile will be empty. */
/* Set/get the path to which temporary files will be written */
-char *EXPORT_CALL lbu_setWriteablePath (const char *path);
-char *EXPORT_CALL lbu_getWriteablePath ();
+LBUAPI char *EXPORT_CALL lbu_setWriteablePath (const char *path);
+LBUAPI char *EXPORT_CALL lbu_getWriteablePath ();
-void EXPORT_CALL lbu_registerLogCallback(logcallback callback);
+LBUAPI void EXPORT_CALL lbu_registerLogCallback(logcallback callback);
-void EXPORT_CALL lbu_setLogLevel(logLevels level);
+LBUAPI void EXPORT_CALL lbu_setLogLevel(logLevels level);
-void EXPORT_CALL lbu_logFile(const char *fileName);
+LBUAPI void EXPORT_CALL lbu_logFile(const char *fileName);
-void EXPORT_CALL lbu_logEnd();
+LBUAPI void EXPORT_CALL lbu_logEnd();
/* This function should be called at the end of the application to free
all memory allocated by liblouisutdml or liblouis. */
-void EXPORT_CALL lbu_free (void);
+LBUAPI void EXPORT_CALL lbu_free (void);
#ifdef __cplusplus
}
=======================================
--- /liblouisutdml/logging.c Thu Jun 5 16:25:54 2014 UTC
+++ /liblouisutdml/logging.c Fri Sep 19 12:15:34 2014 UTC
@@ -27,7 +27,7 @@
#include <stdarg.h>
#include <string.h>
-#include "louis.h"
+#include "louisutdml.h"
void logWidecharBuf(logLevels level, const char *msg, const widechar
*wbuf, int wlen)
{
For a description of the software, to download it and links to
project pages go to http://www.abilitiessoft.com
Other related posts:
- » [liblouis-liblouisxml] [liblouisutdml] push by mwhapples - Defined LBUAPI to fix exporting of API functions when building with mi... on 2014-09-19 12:03 GMT - liblouisutdml
