Skip to content

Build module with MingW (and other compilers) with Ubuntu host on our GitLab server. #39

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
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Build module with MingW (and other compilers) with Ubuntu host on our GitLab server. #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b771890
Merged with Master branch and addressed the issues raised by https://…
May 16, 2022
39bf212
MingW already establishes it's own unhandled exception handler, which…
May 17, 2022
176ff45
Both USR_CFLAGS and USR_CXXFLAGS need to be set, I think.
May 17, 2022
c706760
Reverted undesired changes - these did not help.
May 19, 2022
1b5b589
Need to define XMLPUBFUN __declspec(dllimport) for DLL importing builds.
May 19, 2022
7253063
Allow multiple symbol defs for mingw builds.
May 23, 2022
ab5b0e5
__GNUC__ is #defined when building with mingw.
May 30, 2022
219f3f7
Don't need builds directory.
May 30, 2022
975be19
Yes, we still need the force:multiple.
May 30, 2022
121173c
Revert "Don't need builds directory."
pheest Aug 9, 2025
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 supportApp/GraphicsMagickSrc/Magick++/lib/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ ifeq ($(WITH_GRAPHICSMAGICK),YES)
ifeq ($(GRAPHICSMAGICK_PREFIX_SYMBOLS),YES)
USR_CXXFLAGS += -DPREFIX_MAGICK_SYMBOLS
endif
ifeq (mingw, $(findstring mingw, $(T_A)))
# multiple definition of `_Unwind_Resume on Linux. I don't know how to fix it.
USR_LDFLAGS += -Wl,-allow-multiple-definition
endif

USR_INCLUDES += -I$(TOP)/supportApp/GraphicsMagickSrc
USR_INCLUDES += -I$(TOP)/supportApp/GraphicsMagickSrc/lcms/include
Expand Down
2 changes: 1 addition & 1 deletion supportApp/GraphicsMagickSrc/coders/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ ifeq ($(WITH_GRAPHICSMAGICK),YES)
endif
endif

LIB_SYS_LIBS_WIN32 += User32 Gdi32 OleAut32
LIB_SYS_LIBS_WIN32 += user32 gdi32 oleaut32

endif # ($(GRAPHICSMAGICK_EXTERNAL),NO)
endif # ($(WITH_GRAPHICSMAGICK),YES)
Expand Down
2 changes: 1 addition & 1 deletion supportApp/GraphicsMagickSrc/magick/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ ifeq ($(WITH_GRAPHICSMAGICK),YES)
endif
endif

LIB_SYS_LIBS_WIN32 += Advapi32 User32 Gdi32
LIB_SYS_LIBS_WIN32 += advapi32 user32 gdi32
LIB_SYS_LIBS_Linux += Xext

endif # ($(GRAPHICSMAGICK_EXTERNAL),NO)
Expand Down
1 change: 0 additions & 1 deletion supportApp/GraphicsMagickSrc/ttf/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
TOP = ../../..
include $(TOP)/configure/CONFIG

DIRS += builds
DIRS += src

include $(TOP)/configure/RULES_DIRS
2 changes: 1 addition & 1 deletion supportApp/bloscSrc/blosc/blosc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
#include <inttypes.h>
#endif /* _WIN32 */

#if defined(_WIN32) && !defined(__GNUC__)
#if defined(_WIN32)
#include "win32/pthread.h"
#include "win32/pthread.c"
#else
Expand Down
5 changes: 4 additions & 1 deletion supportApp/hdf5Src/H5win32defs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,16 @@ typedef __int64 h5_stat_size_t;
*/
#define HDmemset(X,C,Z) memset((void*)(X),C,Z)

#ifndef _TIMEZONE_DEFINED
#define _TIMEZONE_DEFINED
struct timezone {
int tz_minuteswest;
int tz_dsttime;
};
#endif

/* time.h before VS2015 does not include timespec */
#if (_MSC_VER < 1900)
#if defined (_MSC_VER) && (_MSC_VER < 1900)
struct timespec
{
time_t tv_sec; /* Seconds - >= 0 */
Expand Down
34 changes: 3 additions & 31 deletions supportApp/xml2Src/os/default/libxml/xmlexports.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
/** DOC_DISABLE */

/* Windows platform with MS compiler */
#if defined(_WIN32) && defined(_MSC_VER)
#if defined(_WIN32) && (defined(_MSC_VER) || defined(__MINGW32__))
#undef XMLPUBFUN
#undef XMLPUBVAR
#undef XMLCALL
Expand All @@ -60,10 +60,11 @@
#define XMLPUBFUN __declspec(dllexport)
#define XMLPUBVAR __declspec(dllexport)
#else
#define XMLPUBFUN
#if !defined(LIBXML_STATIC)
#define XMLPUBVAR __declspec(dllimport) extern
#define XMLPUBFUN __declspec(dllimport)
#else
#define XMLPUBFUN
#define XMLPUBVAR extern
#endif
#endif
Expand Down Expand Up @@ -102,35 +103,6 @@
#endif
#endif

/* Windows platform with GNU compiler (Mingw) */
#if defined(_WIN32) && defined(__MINGW32__)
#undef XMLPUBFUN
#undef XMLPUBVAR
#undef XMLCALL
#undef XMLCDECL
/*
* if defined(IN_LIBXML) this raises problems on mingw with msys
* _imp__xmlFree listed as missing. Try to workaround the problem
* by also making that declaration when compiling client code.
*/
#if defined(IN_LIBXML) && !defined(LIBXML_STATIC)
#define XMLPUBFUN __declspec(dllexport)
#define XMLPUBVAR __declspec(dllexport) extern
#else
#define XMLPUBFUN
#if !defined(LIBXML_STATIC)
#define XMLPUBVAR __declspec(dllimport) extern
#else
#define XMLPUBVAR extern
#endif
#endif
#define XMLCALL __cdecl
#define XMLCDECL __cdecl
#if !defined _REENTRANT
#define _REENTRANT
#endif
#endif

/* Cygwin platform, GNU compiler */
#if defined(_WIN32) && defined(__CYGWIN__)
#undef XMLPUBFUN
Expand Down
1 change: 1 addition & 0 deletions supportApp/xml2Src/xmllint.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* daniel@veillard.com
*/

#define IN_LIBXML
#include "libxml.h"

#include <string.h>
Expand Down