1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
|
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: Boris Nagaev <bnagaev@gmail.com>
Date: Mon, 22 Feb 2016 03:35:28 +0300
Subject: [PATCH 3/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 77d66f8..1c8398e 100644
--- a/src/osgPlugins/CMakeLists.txt
+++ b/src/osgPlugins/CMakeLists.txt
@@ -213,10 +213,6 @@ IF(OSG_CPP_EXCEPTIONS_AVAILABLE)
ADD_PLUGIN_DIRECTORY(txp)
ENDIF()
-IF(FFMPEG_FOUND AND OSG_CPP_EXCEPTIONS_AVAILABLE)
- ADD_PLUGIN_DIRECTORY(ffmpeg)
-ENDIF()
-
IF(GSTREAMER_FOUND AND GLIB_FOUND)
ADD_PLUGIN_DIRECTORY(gstreamer)
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 4/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)
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Pek <tehnick-8@yandex.ru>
Date: Wed, 10 Oct 2018 00:56:37 +0300
Subject: [PATCH 5/6] fix build with GCC < 6.x
diff --git a/src/osgViewer/GraphicsWindowWin32.cpp b/src/osgViewer/GraphicsWindowWin32.cpp
index 91e6c8f..d11347e 100644
--- a/src/osgViewer/GraphicsWindowWin32.cpp
+++ b/src/osgViewer/GraphicsWindowWin32.cpp
@@ -799,7 +799,7 @@ Win32WindowingSystem::Win32WindowingSystem()
if (hModuleShore) {
setProcessDpiAwareness = (SetProcessDpiAwarenessFunc *) GetProcAddress(hModuleShore, "SetProcessDpiAwareness");
if (setProcessDpiAwareness) {
- (*setProcessDpiAwareness)(PROCESS_DPI_AWARENESS::PROCESS_PER_MONITOR_DPI_AWARE);
+ (*setProcessDpiAwareness)(PROCESS_PER_MONITOR_DPI_AWARE);
}
}
// #endif
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Pek <tehnick-8@yandex.ru>
Date: Wed, 10 Oct 2018 01:48:22 +0300
Subject: [PATCH 6/6] fix build of gta plugin when pkg-config is used
+ update related variable for build without pkg-config.
diff --git a/CMakeModules/FindGTA.cmake b/CMakeModules/FindGTA.cmake
index 086069c..e483ad3 100644
--- a/CMakeModules/FindGTA.cmake
+++ b/CMakeModules/FindGTA.cmake
@@ -33,7 +33,7 @@ IF(NOT GTA_FOUND)
/usr/freeware/include
)
- FIND_LIBRARY(GTA_LIBRARY
+ FIND_LIBRARY(GTA_LIBRARIES
NAMES gta libgta
PATHS
$ENV{GTA_DIR}/lib
@@ -50,8 +50,8 @@ IF(NOT GTA_FOUND)
)
SET(GTA_FOUND "NO")
- IF(GTA_LIBRARY AND GTA_INCLUDE_DIRS)
+ IF(GTA_LIBRARIES AND GTA_INCLUDE_DIRS)
SET(GTA_FOUND "YES")
- ENDIF(GTA_LIBRARY AND GTA_INCLUDE_DIRS)
+ ENDIF(GTA_LIBRARIES AND GTA_INCLUDE_DIRS)
ENDIF(NOT GTA_FOUND)
\ No newline at end of file
diff --git a/src/osgPlugins/gta/CMakeLists.txt b/src/osgPlugins/gta/CMakeLists.txt
index 2b910a6..16466fe 100644
--- a/src/osgPlugins/gta/CMakeLists.txt
+++ b/src/osgPlugins/gta/CMakeLists.txt
@@ -2,7 +2,7 @@ INCLUDE_DIRECTORIES( ${GTA_INCLUDE_DIRS} )
SET(TARGET_SRC ReaderWriterGTA.cpp )
-SET(TARGET_LIBRARIES_VARS GTA_LIBRARY)
+SET(TARGET_LIBRARIES_VARS GTA_LIBRARIES)
#### end var setup ###
SETUP_PLUGIN(gta)
|
