mirror of https://git.wownero.com/dsc/mxe.git
161 lines
5.0 KiB
Diff
161 lines
5.0 KiB
Diff
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 <bnagaev@gmail.com>
|
|
Date: Fri, 9 Oct 2015 11:13:12 +0200
|
|
Subject: [PATCH 1/6] fix case in headers windows.h, winsock2.h
|
|
|
|
|
|
diff --git a/examples/osghangglide/hat.cpp b/examples/osghangglide/hat.cpp
|
|
index 1111111..2222222 100644
|
|
--- a/examples/osghangglide/hat.cpp
|
|
+++ b/examples/osghangglide/hat.cpp
|
|
@@ -17,7 +17,7 @@
|
|
*/
|
|
|
|
#ifdef _MSC_VER
|
|
-#include <Windows.h>
|
|
+#include <windows.h>
|
|
#pragma warning( disable : 4244 )
|
|
#endif
|
|
|
|
diff --git a/src/osgPlugins/ply/typedefs.h b/src/osgPlugins/ply/typedefs.h
|
|
index 1111111..2222222 100644
|
|
--- a/src/osgPlugins/ply/typedefs.h
|
|
+++ b/src/osgPlugins/ply/typedefs.h
|
|
@@ -13,8 +13,8 @@
|
|
#define MESH_TYPEDEFS_H
|
|
|
|
# if defined(_MSC_VER)
|
|
-# include <Winsock2.h>
|
|
-# include <Windows.h>
|
|
+# include <winsock2.h>
|
|
+# include <windows.h>
|
|
# endif
|
|
|
|
# include <osg/Notify>
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Rashad Kanavath <rashad.kanavath@c-s.fr>
|
|
Date: Sun, 10 Jan 2016 14:04:18 +1100
|
|
Subject: [PATCH 2/6] openscenegraph: use previously built openthreads
|
|
|
|
|
|
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
|
index 1111111..2222222 100644
|
|
--- a/src/CMakeLists.txt
|
|
+++ b/src/CMakeLists.txt
|
|
@@ -8,7 +8,6 @@ ENDIF()
|
|
|
|
#the old construct SUBDIRS( was substituded by ADD_SUBDIRECTORY that is to be preferred according on CMake docs.
|
|
FOREACH( mylibfolder
|
|
- OpenThreads
|
|
osg
|
|
osgDB
|
|
osgUtil
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Tony Theodore <tonyt@logyst.com>
|
|
Date: Sun, 10 Jan 2016 14:19:57 +1100
|
|
Subject: [PATCH 3/6] use pkg-config for gstreamer detection in mingw
|
|
|
|
|
|
diff --git a/CMakeModules/FindGStreamer.cmake b/CMakeModules/FindGStreamer.cmake
|
|
index 1111111..2222222 100644
|
|
--- a/CMakeModules/FindGStreamer.cmake
|
|
+++ b/CMakeModules/FindGStreamer.cmake
|
|
@@ -65,7 +65,7 @@
|
|
# )
|
|
#endmacro()
|
|
|
|
-if (WIN32)
|
|
+if (WIN32 AND NOT MINGW)
|
|
macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _header _library)
|
|
find_path(${_component_prefix}_INCLUDE_DIRS
|
|
NAMES ${_header}
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Boris Nagaev <bnagaev@gmail.com>
|
|
Date: Mon, 22 Feb 2016 03:35:28 +0300
|
|
Subject: [PATCH 4/6] disable ffmpeg
|
|
|
|
OpenSceneGraph is using removed features of ffmpeg, which have
|
|
been deprecated for 3+ years.
|
|
|
|
See https://github.com/mxe/mxe/issues/1230#issuecomment-186936198
|
|
Source of patch: http://forum.openscenegraph.org/viewtopic.php?t=10485
|
|
|
|
diff --git a/src/osgPlugins/CMakeLists.txt b/src/osgPlugins/CMakeLists.txt
|
|
index 1111111..2222222 100644
|
|
--- a/src/osgPlugins/CMakeLists.txt
|
|
+++ b/src/osgPlugins/CMakeLists.txt
|
|
@@ -199,10 +199,6 @@ IF(XINE_FOUND)
|
|
ADD_SUBDIRECTORY(xine)
|
|
ENDIF()
|
|
|
|
-IF(FFMPEG_FOUND AND OSG_CPP_EXCEPTIONS_AVAILABLE)
|
|
- ADD_SUBDIRECTORY(ffmpeg)
|
|
-ENDIF()
|
|
-
|
|
IF(GSTREAMER_FOUND AND GLIB_FOUND)
|
|
ADD_SUBDIRECTORY(gstreamer)
|
|
ENDIF()
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Saikrishna Arcot <saiarcot895@gmail.com>
|
|
Date: Mon, 6 Jun 2016 19:06:00 -0500
|
|
Subject: [PATCH 5/6] Require the presence of either qt5 or qt4.
|
|
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 1111111..2222222 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -708,9 +708,9 @@ IF(OSG_USE_QT AND NOT ANDROID)
|
|
|
|
IF (DESIRED_QT_VERSION)
|
|
IF (DESIRED_QT_VERSION MATCHES 5)
|
|
- FIND_PACKAGE(Qt5Widgets)
|
|
+ FIND_PACKAGE(Qt5Widgets REQUIRED)
|
|
ELSEIF (DESIRED_QT_VERSION MATCHES 4)
|
|
- FIND_PACKAGE(Qt4)
|
|
+ FIND_PACKAGE(Qt4 REQUIRED)
|
|
ELSE()
|
|
FIND_PACKAGE(Qt3)
|
|
ENDIF()
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Boris Pek <tehnick-8@yandex.ru>
|
|
Date: Thu, 14 Dec 2017 15:29:38 +0300
|
|
Subject: [PATCH 6/6] fix case in library ws2_32
|
|
|
|
|
|
diff --git a/src/osgPlugins/ZeroConfDevice/CMakeLists.txt b/src/osgPlugins/ZeroConfDevice/CMakeLists.txt
|
|
index 1111111..2222222 100644
|
|
--- a/src/osgPlugins/ZeroConfDevice/CMakeLists.txt
|
|
+++ b/src/osgPlugins/ZeroConfDevice/CMakeLists.txt
|
|
@@ -19,7 +19,7 @@ IF(WIN32)
|
|
mdns_win/dns_sd.h
|
|
mdns_win/dns-sd.c
|
|
)
|
|
- SET(TARGET_EXTERNAL_LIBRARIES "${TARGET_EXTERNAL_LIBRARIES};Ws2_32.lib;winmm")
|
|
+ SET(TARGET_EXTERNAL_LIBRARIES "${TARGET_EXTERNAL_LIBRARIES};ws2_32.lib;winmm")
|
|
SET(TARGET_LIBRARIES_VARS ZEROCONF_LIBRARY)
|
|
ADD_DEFINITIONS(-DNOT_HAVE_GETOPT)
|
|
ADD_DEFINITIONS(-DNOT_HAVE_SETLINEBUF)
|
|
diff --git a/src/osgPlugins/vrml/CMakeLists.txt b/src/osgPlugins/vrml/CMakeLists.txt
|
|
index 1111111..2222222 100644
|
|
--- a/src/osgPlugins/vrml/CMakeLists.txt
|
|
+++ b/src/osgPlugins/vrml/CMakeLists.txt
|
|
@@ -27,7 +27,7 @@ IF (WIN32)
|
|
PNG_LIBRARY
|
|
ZLIB_LIBRARY)
|
|
SET(TARGET_EXTERNAL_LIBRARIES
|
|
- Ws2_32.lib)
|
|
+ ws2_32.lib)
|
|
ELSE()
|
|
SET(TARGET_LIBRARIES_VARS
|
|
OPENVRML_LIBRARY)
|