This file is part of MXE. See LICENSE.md for licensing information. Contains ad hoc patches for cross building. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sat, 1 Apr 2017 15:17:43 +0200 Subject: [PATCH 1/3] Wt fixes diff --git a/cmake/WtFindGm.txt b/cmake/WtFindGm.txt index 1111111..2222222 100644 --- a/cmake/WtFindGm.txt +++ b/cmake/WtFindGm.txt @@ -59,6 +59,12 @@ IF(WIN32) ELSE(GM_LIB AND GMPP_LIB AND GM_LIB_DEBUG AND GMPP_LIB_DEBUG AND GM_INCLUDE_DIR) SET(GM_FOUND FALSE) ENDIF(GM_LIB AND GMPP_LIB AND GM_LIB_DEBUG AND GMPP_LIB_DEBUG AND GM_INCLUDE_DIR) + + IF(GM_INCLUDE_DIR AND GM_LIBS) + SET(GM_FOUND TRUE) + SET(GM_INCLUDE_DIRS ${GM_INCLUDE_DIR}) + SET(GM_LIBRARIES optimized ${GM_LIBS}) + ENDIF(GM_INCLUDE_DIR AND GM_LIBS) ELSE(WIN32) FIND_LIBRARY(GM_LIB NAMES diff --git a/cmake/WtFindPangoFt2.txt b/cmake/WtFindPangoFt2.txt index 1111111..2222222 100644 --- a/cmake/WtFindPangoFt2.txt +++ b/cmake/WtFindPangoFt2.txt @@ -47,13 +47,17 @@ SET(PANGO_FT2_INCLUDE_DIRS ${GLIB2_INCLUDE_DIR} ${GLIB2_CONFIG_INCLUDE_DIR}) -SET(PANGO_FT2_LIBRARIES - ${PANGO_FT2_LIBRARY} - ${PANGO_LIBRARY} - ${GOBJECT2_LIBRARY} - ${GLIB2_LIBRARY} - ${FONTCONFIG_LIBRARY} - ) +IF(PANGO_FT2_LIBS) + SET(PANGO_FT2_LIBRARIES optimized ${PANGO_FT2_LIBS}) +ELSE(PANGO_FT2_LIBS) + SET(PANGO_FT2_LIBRARIES + ${PANGO_FT2_LIBRARY} + ${PANGO_LIBRARY} + ${GOBJECT2_LIBRARY} + ${GLIB2_LIBRARY} + ${FONTCONFIG_LIBRARY} + ) +ENDIF(PANGO_FT2_LIBS) IF (PANGO_INCLUDE_DIR AND FT2_INCLUDE_DIR From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Mon, 17 Sep 2018 23:31:42 +0200 Subject: [PATCH 2/3] fix missing gmtime_r definition diff --git a/src/http/Reply.C b/src/http/Reply.C index 1111111..2222222 100644 --- a/src/http/Reply.C +++ b/src/http/Reply.C @@ -13,6 +13,7 @@ // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // +#include #include "Configuration.h" #include "Connection.h" #include "Reply.h" From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sat, 6 Jul 2019 17:25:06 +0200 Subject: [PATCH 3/3] fix build on case senstive filesystem diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1111111..2222222 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -574,7 +574,7 @@ IF(HAVE_SSL) TARGET_LINK_LIBRARIES(wt PRIVATE ${OPENSSL_LIBRARIES}) INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR}) IF(WIN32) - TARGET_LINK_LIBRARIES(wt PRIVATE Crypt32.lib) + TARGET_LINK_LIBRARIES(wt PRIVATE crypt32.lib) ENDIF(WIN32) ELSE(HAVE_SSL) MESSAGE("** Disabling crypto support (Auth::SHA1HashFunction, HTTPS support): requires OpenSSL.") diff --git a/src/Wt/Dbo/backend/MySQL.C b/src/Wt/Dbo/backend/MySQL.C index 1111111..2222222 100644 --- a/src/Wt/Dbo/backend/MySQL.C +++ b/src/Wt/Dbo/backend/MySQL.C @@ -9,8 +9,8 @@ #ifdef WT_WIN32 #define NOMINMAX - // WinSock2.h warns that it should be included before windows.h -#include + // winsock2.h warns that it should be included before windows.h +#include #endif // WT_WIN32 #include "Wt/Dbo/backend/MySQL.h" diff --git a/src/Wt/Dbo/backend/Postgres.C b/src/Wt/Dbo/backend/Postgres.C index 1111111..2222222 100644 --- a/src/Wt/Dbo/backend/Postgres.C +++ b/src/Wt/Dbo/backend/Postgres.C @@ -9,8 +9,8 @@ #ifdef WT_WIN32 #define NOMINMAX -// WinSock2.h warns that it should be included before windows.h -#include +// winsock2.h warns that it should be included before windows.h +#include #endif // WT_WIN32 #include "Wt/Dbo/backend/Postgres.h"