mirror of https://git.wownero.com/dsc/mxe.git
133 lines
3.7 KiB
Diff
133 lines
3.7 KiB
Diff
This file is part of MXE.
|
|
See index.html for further information.
|
|
|
|
From e04e1c624c65e0acb0249aa3c4980d95e79f592c Mon Sep 17 00:00:00 2001
|
|
From: Mark Brand <mabrand@mabrand.nl>
|
|
Date: Mon, 18 Jun 2012 13:23:21 +0200
|
|
Subject: [PATCH] fixes for mxe
|
|
|
|
|
|
diff --git a/cmake/WtFindBoost-vintage.txt b/cmake/WtFindBoost-vintage.txt
|
|
index e48b21e..1198139 100644
|
|
--- a/cmake/WtFindBoost-vintage.txt
|
|
+++ b/cmake/WtFindBoost-vintage.txt
|
|
@@ -70,6 +70,7 @@ ELSE(MSVC)
|
|
boost_thread-${BOOST_COMPILER}-mt-${BOOST_FLAGS}-${BOOST_VERSION}
|
|
boost_thread-${BOOST_COMPILER}-mt-${BOOST_VERSION}
|
|
boost_thread-${BOOST_COMPILER}-mt
|
|
+ boost_thread${BOOST_COMPILER}-mt
|
|
boost_thread-mt-${BOOST_VERSION}
|
|
boost_thread-mt
|
|
boost_thread-${BOOST_COMPILER}-${BOOST_VERSION}
|
|
diff --git a/cmake/WtFindGm.txt b/cmake/WtFindGm.txt
|
|
index 76697fc..9bc0fa1 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/WtFindHaru.txt b/cmake/WtFindHaru.txt
|
|
index 4dba35f..642bd58 100644
|
|
--- a/cmake/WtFindHaru.txt
|
|
+++ b/cmake/WtFindHaru.txt
|
|
@@ -44,6 +44,7 @@ IF(WIN32)
|
|
FIND_LIBRARY(Z_LIB
|
|
NAMES
|
|
zlib
|
|
+ libz
|
|
PATHS
|
|
${HARU_PREFIX}/lib
|
|
${USERLIB_PREFIX}/lib
|
|
@@ -58,6 +59,17 @@ IF(WIN32)
|
|
SET(HARU_SUPPORT_LIBS ${HARU_SUPPORT_LIBS} ${Z_LIB})
|
|
ENDIF(Z_LIB)
|
|
ENDIF(HARU_LIB_RELEASE AND HARU_LIB_DEBUG)
|
|
+
|
|
+ IF(HARU_LIB_RELEASE)
|
|
+ SET(HARU_LIB optimized ${HARU_LIB_RELEASE})
|
|
+ IF(PNG_LIB_RELEASE)
|
|
+ SET(HARU_SUPPORT_LIBS ${HARU_SUPPORT_LIBS} optimized ${PNG_LIB_RELEASE})
|
|
+ ENDIF(PNG_LIB_RELEASE)
|
|
+ IF(Z_LIB)
|
|
+ SET(HARU_SUPPORT_LIBS ${HARU_SUPPORT_LIBS} optimized ${Z_LIB})
|
|
+ ENDIF(Z_LIB)
|
|
+ ENDIF(HARU_LIB_RELEASE)
|
|
+
|
|
SET(HARU_SUPPORT_LIBS_FOUND TRUE)
|
|
ELSE(WIN32)
|
|
FIND_LIBRARY(HARU_LIB
|
|
diff --git a/cmake/WtFindPangoFt2.txt b/cmake/WtFindPangoFt2.txt
|
|
index cd1e640..b1bbe3d 100644
|
|
--- a/cmake/WtFindPangoFt2.txt
|
|
+++ b/cmake/WtFindPangoFt2.txt
|
|
@@ -36,11 +36,15 @@ 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})
|
|
+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})
|
|
+ENDIF(PANGO_FT2_LIBS)
|
|
|
|
IF (PANGO_INCLUDE_DIR
|
|
AND FT2_INCLUDE_DIR
|
|
diff --git a/cmake/WtFindSsl.txt b/cmake/WtFindSsl.txt
|
|
index fdbcb5f..578baf1 100644
|
|
--- a/cmake/WtFindSsl.txt
|
|
+++ b/cmake/WtFindSsl.txt
|
|
@@ -81,6 +81,11 @@ IF(WIN32)
|
|
AND SSL_LIB_DEBUG
|
|
AND SSL_TOO_LIB_RELEASE
|
|
AND SSL_TOO_LIB_DEBUG)
|
|
+
|
|
+ IF(SSL_INCLUDE_DIRS AND OPENSSL_LIBS)
|
|
+ SET(SSL_FOUND true)
|
|
+ SET(SSL_LIBRARIES optimized ${OPENSSL_LIBS})
|
|
+ ENDIF(SSL_INCLUDE_DIRS AND OPENSSL_LIBS)
|
|
ELSE (WIN32)
|
|
FIND_LIBRARY(SSL_LIB
|
|
NAMES
|
|
diff --git a/src/Wt/WRasterImage.C b/src/Wt/WRasterImage.C
|
|
index 471edfa..95632be 100644
|
|
--- a/src/Wt/WRasterImage.C
|
|
+++ b/src/Wt/WRasterImage.C
|
|
@@ -39,15 +39,6 @@
|
|
#define M_PI 3.14159265358979323846
|
|
#endif
|
|
|
|
-#ifdef WIN32
|
|
-namespace {
|
|
- double round(double x)
|
|
- {
|
|
- return floor(x + 0.5);
|
|
- }
|
|
-}
|
|
-#endif
|
|
-
|
|
namespace {
|
|
static const double EPSILON = 1E-5;
|
|
|
|
--
|
|
1.7.10.4
|
|
|