From 9a62aead6daa5a4adb3b34161c70810e4d641e2c Mon Sep 17 00:00:00 2001 From: Thomas Paviot Date: Wed, 14 Feb 2018 04:35:58 +0100 Subject: [PATCH 1/2] Bumped development version number to 0.19 --- CMakeLists.txt | 6 +++--- README.md | 2 +- appveyor.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 092fd2fcb4..d000f1c16f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,12 +20,12 @@ project(OCE) set(OCE_VERSION_MAJOR 0) -set(OCE_VERSION_MINOR 18) +set(OCE_VERSION_MINOR 19) # OCE_VERSION_PATCH is used for bugfixes releases only # (uncomment following line) -set(OCE_VERSION_PATCH 3) +set(OCE_VERSION_PATCH) # Empty for official releases, set to -dev, -rc1, etc for development releases -set(OCE_VERSION_DEVEL) +set(OCE_VERSION_DEVEL -dev) # bugfix release: add ${OCE_VERSION_PATCH} to OCE_VERSION set(OCE_VERSION ${OCE_VERSION_MAJOR}.${OCE_VERSION_MINOR}${OCE_VERSION_DEVEL}) diff --git a/README.md b/README.md index 5ab684b322..8371de6ec0 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Below are listed all the oce releases since the beginning of the project, the ma | OCE release number | ABI Change | OCE release date | OCCT version | | ------------- | ------------- | ------------- |------------- | -| [0.18.3](https://github.com/tpaviot/oce/releases/tag/OCE-0.18.3) | No | February | 6.9.1 +| [0.18.3](https://github.com/tpaviot/oce/releases/tag/OCE-0.18.3) | No | February 2018 | 6.9.1 | [0.18.2](https://github.com/tpaviot/oce/releases/tag/OCE-0.18.2) | No | August 2017 | 6.9.1 | [0.18.1](https://github.com/tpaviot/oce/releases/tag/OCE-0.18.1) | No | May 2017 | 6.9.1 | [0.18](https://github.com/tpaviot/oce/releases/tag/OCE-0.18) | Yes | January 2017 | 6.9.1 diff --git a/appveyor.yml b/appveyor.yml index f901bae922..21bd2891b8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,7 @@ -version: oce-0.18.3.{build} +version: oce-0.19.{build} environment: - oce_version: 0.18.3 + oce_version: 0.19 matrix: - generator: "MinGW Makefiles" ARCH: "i686" From e9cfb9ad4d6702b703508b27ed0a1704a50d0219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= Date: Sun, 4 Mar 2018 09:06:22 +0100 Subject: [PATCH 2/2] Basic Haiku support --- CMakeLists.txt | 24 ++++++++++++++++++----- src/Aspect/Aspect_DisplayConnection.cxx | 6 +++--- src/Aspect/Aspect_DisplayConnection.hxx | 4 ++-- src/InterfaceGraphic/InterfaceGraphic.hxx | 2 +- src/OSD/OSD_signal.cxx | 2 +- src/Standard/Standard_MMgrOpt.cxx | 4 ++++ src/Standard/Standard_Mutex.cxx | 4 ++++ src/Standard/Standard_Mutex.hxx | 4 +++- src/Xw/Xw_Window.cxx | 2 +- src/Xw/Xw_Window.hxx | 2 +- 10 files changed, 39 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d000f1c16f..c20ed5d399 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -472,9 +472,9 @@ if(OCE_VISUALISATION) endif(WIN32) endif(OCE_WITH_FREEIMAGE) - if (NOT WIN32 AND NOT OCE_OSX_USE_COCOA) + if (NOT WIN32 AND NOT OCE_OSX_USE_COCOA AND NOT HAIKU) find_package(X11 REQUIRED) - endif(NOT WIN32 AND NOT OCE_OSX_USE_COCOA) + endif(NOT WIN32 AND NOT OCE_OSX_USE_COCOA AND NOT HAIKU) if (NOT APPLE OR OCE_OSX_USE_COCOA) find_package(OpenGL REQUIRED) @@ -716,6 +716,11 @@ if(UNIX) # remark #981 "operands are evaluated in unspecified order", e.g. a = b() + c() add_definitions("-diag-disable 383,522,858,981") endif(INTEL) + if(HAIKU) + # Haiku networking resides in libnetwork + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lnetwork") + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -lnetwork") + endif(HAIKU) endif(APPLE) add_definitions(-DHAVE_CONFIG_H -DCSFDB -DOCC_CONVERT_SIGNALS) else(UNIX) @@ -898,7 +903,11 @@ endif(NOT DEFINED OCE_INSTALL_SCRIPT_DIR) # Data if(NOT DEFINED OCE_INSTALL_DATA_DIR) if(NOT MSVC) - set(OCE_INSTALL_DATA_DIR share/oce-${OCE_VERSION}) + if(NOT HAIKU) + set(OCE_INSTALL_DATA_DIR share/oce-${OCE_VERSION}) + else () + set(OCE_INSTALL_DATA_DIR data/oce-${OCE_VERSION}) + endif(NOT HAIKU) else () set(OCE_INSTALL_DATA_DIR "share/oce") endif(NOT MSVC) @@ -922,8 +931,13 @@ if(NOT DEFINED OCE_INSTALL_CMAKE_DATA_DIR) set(OCE_INSTALL_CMAKE_DATA_DIR OCE.framework/Versions/${OCE_VERSION}/Resources) else(APPLE) - set(OCE_INSTALL_CMAKE_DATA_DIR - lib${LIB_SUFFIX}/oce-${OCE_VERSION}) + if(NOT HAIKU) + set(OCE_INSTALL_CMAKE_DATA_DIR + lib${LIB_SUFFIX}/oce-${OCE_VERSION}) + else(NOT HAIKU) + set(OCE_INSTALL_CMAKE_DATA_DIR + lib${LIB_SUFFIX}/cmake) + endif(NOT HAIKU) endif(APPLE) endif(WIN32) endif(NOT DEFINED OCE_INSTALL_CMAKE_DATA_DIR) diff --git a/src/Aspect/Aspect_DisplayConnection.cxx b/src/Aspect/Aspect_DisplayConnection.cxx index 72109bf8be..5eac74a905 100644 --- a/src/Aspect/Aspect_DisplayConnection.cxx +++ b/src/Aspect/Aspect_DisplayConnection.cxx @@ -25,7 +25,7 @@ IMPLEMENT_STANDARD_RTTIEXT(Aspect_DisplayConnection, Standard_Transient) // ======================================================================= Aspect_DisplayConnection::Aspect_DisplayConnection() { -#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) +#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) && !defined(__HAIKU__) OSD_Environment anEnv ("DISPLAY"); myDisplayName = anEnv.Value(); Init(); @@ -38,7 +38,7 @@ Aspect_DisplayConnection::Aspect_DisplayConnection() // ======================================================================= Aspect_DisplayConnection::~Aspect_DisplayConnection() { -#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) +#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) && !defined(__HAIKU__) if (myDisplay != NULL) { XCloseDisplay (myDisplay); @@ -46,7 +46,7 @@ Aspect_DisplayConnection::~Aspect_DisplayConnection() #endif } -#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) +#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) && !defined(__HAIKU__) // ======================================================================= // function : Aspect_DisplayConnection // purpose : diff --git a/src/Aspect/Aspect_DisplayConnection.hxx b/src/Aspect/Aspect_DisplayConnection.hxx index 624cbaf0db..16d9f286b4 100644 --- a/src/Aspect/Aspect_DisplayConnection.hxx +++ b/src/Aspect/Aspect_DisplayConnection.hxx @@ -20,7 +20,7 @@ #include #include -#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) +#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) && !defined(__HAIKU__) #include #endif @@ -39,7 +39,7 @@ public: //! Destructor. Close opened connection. Standard_EXPORT ~Aspect_DisplayConnection(); -#if !defined(_WIN32) && !defined(__WIN32__) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) +#if !defined(_WIN32) && !defined(__WIN32__) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) && !defined(__HAIKU__) //! Constructor. Creates connection with display specified in theDisplayName. //! Display name should be in format "hostname:number" or "hostname:number.screen_number", where: //! hostname - Specifies the name of the host machine on which the display is physically attached. diff --git a/src/InterfaceGraphic/InterfaceGraphic.hxx b/src/InterfaceGraphic/InterfaceGraphic.hxx index 80ac333f7a..8539a2cde6 100644 --- a/src/InterfaceGraphic/InterfaceGraphic.hxx +++ b/src/InterfaceGraphic/InterfaceGraphic.hxx @@ -23,7 +23,7 @@ #undef DrawText #endif -#elif !defined(__ANDROID__) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) +#elif !defined(__ANDROID__) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__HAIKU__) #include diff --git a/src/OSD/OSD_signal.cxx b/src/OSD/OSD_signal.cxx index e9a80d6149..4e61ac32c9 100644 --- a/src/OSD/OSD_signal.cxx +++ b/src/OSD/OSD_signal.cxx @@ -69,7 +69,7 @@ typedef void (* SIG_PFV) (int); #include -#if !defined(__ANDROID__) +#if !defined(__ANDROID__) && !defined(__HAIKU__) #include #endif diff --git a/src/Standard/Standard_MMgrOpt.cxx b/src/Standard/Standard_MMgrOpt.cxx index 51464ad282..3ed0fa1c2c 100644 --- a/src/Standard/Standard_MMgrOpt.cxx +++ b/src/Standard/Standard_MMgrOpt.cxx @@ -25,6 +25,10 @@ # include /* mmap() */ #endif +#ifdef __HAIKU__ +# include +#endif + #include // #if defined (__sun) || defined(SOLARIS) diff --git a/src/Standard/Standard_Mutex.cxx b/src/Standard/Standard_Mutex.cxx index cdf6498b79..9fd1182a3a 100644 --- a/src/Standard/Standard_Mutex.cxx +++ b/src/Standard/Standard_Mutex.cxx @@ -24,6 +24,10 @@ #include #include +#ifdef __HAIKU__ +#include +#endif + //============================================= // Standard_Mutex::Standard_Mutex //============================================= diff --git a/src/Standard/Standard_Mutex.hxx b/src/Standard/Standard_Mutex.hxx index 22b8a03739..5e81912aa9 100644 --- a/src/Standard/Standard_Mutex.hxx +++ b/src/Standard/Standard_Mutex.hxx @@ -24,7 +24,9 @@ #include #else #include - #include + #ifndef __HAIKU__ + #include + #endif #include #include #endif diff --git a/src/Xw/Xw_Window.cxx b/src/Xw/Xw_Window.cxx index a24a3a0d3f..10694c3e22 100644 --- a/src/Xw/Xw_Window.cxx +++ b/src/Xw/Xw_Window.cxx @@ -15,7 +15,7 @@ #include -#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) +#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) && !defined(__HAIKU__) #include #include diff --git a/src/Xw/Xw_Window.hxx b/src/Xw/Xw_Window.hxx index 53f0c14cbf..da049524b4 100644 --- a/src/Xw/Xw_Window.hxx +++ b/src/Xw/Xw_Window.hxx @@ -16,7 +16,7 @@ #ifndef _Xw_Window_H__ #define _Xw_Window_H__ -#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) +#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) && !defined(__HAIKU__) #include