From 2d8f45db2a2a6f0dca907536e75626a81a3cbb94 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Fri, 9 Oct 2015 12:55:49 +0300 Subject: fix openscenegraph build * fix case in headers windows.h and winsock2.h * fix case in library wc2_32 * fix pointer to integer conversion on 64 bits close #913 --- src/openscenegraph-1-fix-case-in-headers.patch | 58 ++++++++++++++++++++++ ...enscenegraph-2-fix-case-in-library-ws2-32.patch | 56 +++++++++++++++++++++ ...-3-fix-pointer-to-int-conversion-on-64bit.patch | 28 +++++++++++ 3 files changed, 142 insertions(+) create mode 100644 src/openscenegraph-1-fix-case-in-headers.patch create mode 100644 src/openscenegraph-2-fix-case-in-library-ws2-32.patch create mode 100644 src/openscenegraph-3-fix-pointer-to-int-conversion-on-64bit.patch diff --git a/src/openscenegraph-1-fix-case-in-headers.patch b/src/openscenegraph-1-fix-case-in-headers.patch new file mode 100644 index 0000000..04ef6ba --- /dev/null +++ b/src/openscenegraph-1-fix-case-in-headers.patch @@ -0,0 +1,58 @@ +This file is part of MXE. +See index.html for further information. + +From 31fe54c6c787bc3b66dd22a17528aeaeb0544752 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Fri, 9 Oct 2015 11:13:12 +0200 +Subject: [PATCH] fix case in headers windows.h, winsock2.h + +--- + examples/osghangglide/hat.cpp | 2 +- + src/osg/DisplaySettings.cpp | 2 +- + src/osgPlugins/ply/typedefs.h | 4 ++-- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/examples/osghangglide/hat.cpp b/examples/osghangglide/hat.cpp +index 4ef9e79..2884770 100644 +--- a/examples/osghangglide/hat.cpp ++++ b/examples/osghangglide/hat.cpp +@@ -17,7 +17,7 @@ + */ + + #ifdef _MSC_VER +-#include ++#include + #pragma warning( disable : 4244 ) + #endif + +diff --git a/src/osg/DisplaySettings.cpp b/src/osg/DisplaySettings.cpp +index 8ebae0d..8731c10 100644 +--- a/src/osg/DisplaySettings.cpp ++++ b/src/osg/DisplaySettings.cpp +@@ -24,7 +24,7 @@ using namespace osg; + using namespace std; + + #if defined(WIN32) && !defined(__CYGWIN__) +-#include ++#include + extern "C" { OSG_EXPORT DWORD NvOptimusEnablement=0x00000001; } + #else + extern "C" { int NvOptimusEnablement=0x00000001; } +diff --git a/src/osgPlugins/ply/typedefs.h b/src/osgPlugins/ply/typedefs.h +index 4d6c833..7a1e334 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 +-# include ++# include ++# include + # endif + + # include +-- +1.7.10.4 + diff --git a/src/openscenegraph-2-fix-case-in-library-ws2-32.patch b/src/openscenegraph-2-fix-case-in-library-ws2-32.patch new file mode 100644 index 0000000..7221e20 --- /dev/null +++ b/src/openscenegraph-2-fix-case-in-library-ws2-32.patch @@ -0,0 +1,56 @@ +This file is part of MXE. +See index.html for further information. + +From c78dde633089cdff3142eb30cc01c5bd77a3c617 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Fri, 9 Oct 2015 12:54:07 +0200 +Subject: [PATCH] fix case in library ws2_32 + +--- + src/osgPlugins/ZeroConfDevice/CMakeLists.txt | 2 +- + src/osgPlugins/osc/CMakeLists.txt | 2 +- + src/osgPlugins/vrml/CMakeLists.txt | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/osgPlugins/ZeroConfDevice/CMakeLists.txt b/src/osgPlugins/ZeroConfDevice/CMakeLists.txt +index 5287cfc..fab449e 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/osc/CMakeLists.txt b/src/osgPlugins/osc/CMakeLists.txt +index 6bf6127..0529e17 100644 +--- a/src/osgPlugins/osc/CMakeLists.txt ++++ b/src/osgPlugins/osc/CMakeLists.txt +@@ -35,7 +35,7 @@ if(WIN32 AND NOT ANDROID) + ip/win32/NetworkingUtils.cpp + ip/win32/UdpSocket.cpp + ) +- SET(TARGET_EXTERNAL_LIBRARIES "${TARGET_EXTERNAL_LIBRARIES};Ws2_32.lib;winmm") ++ SET(TARGET_EXTERNAL_LIBRARIES "${TARGET_EXTERNAL_LIBRARIES};ws2_32.lib;winmm") + ELSE() + SET(TARGET_SRC + ${TARGET_SRC} +diff --git a/src/osgPlugins/vrml/CMakeLists.txt b/src/osgPlugins/vrml/CMakeLists.txt +index 867e0df..5e5eb26 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) +-- +1.7.10.4 + diff --git a/src/openscenegraph-3-fix-pointer-to-int-conversion-on-64bit.patch b/src/openscenegraph-3-fix-pointer-to-int-conversion-on-64bit.patch new file mode 100644 index 0000000..aae13de --- /dev/null +++ b/src/openscenegraph-3-fix-pointer-to-int-conversion-on-64bit.patch @@ -0,0 +1,28 @@ +This file is part of MXE. +See index.html for further information. + +From 9858a76d8daebe3e26f67eb530c89a8f00d5cd28 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Fri, 9 Oct 2015 14:00:54 +0200 +Subject: [PATCH] fix pointer to int conversion on 64bit + +--- + src/osgPlugins/osgjs/WriteVisitor.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/osgPlugins/osgjs/WriteVisitor.cpp b/src/osgPlugins/osgjs/WriteVisitor.cpp +index 9f2b3c7..98e0c19 100644 +--- a/src/osgPlugins/osgjs/WriteVisitor.cpp ++++ b/src/osgPlugins/osgjs/WriteVisitor.cpp +@@ -225,7 +225,7 @@ JSONObject* createImage(osg::Image* image, bool inlineImages, int maxTextureDime + // no image file so use this inline name image and create a file + std::stringstream ss; + ss << osgDB::getFilePath(baseName) << osgDB::getNativePathSeparator(); +- ss << (long int)image << ".inline_conv_generated.png"; // write the pointer location ++ ss << (long long int)image << ".inline_conv_generated.png"; // write the pointer location + std::string filename = ss.str(); + if (osgDB::writeImageFile(*image, filename)) { + image->setFileName(filename); +-- +1.7.10.4 + -- cgit v0.12