mirror of https://git.wownero.com/dsc/mxe.git
commit
b7950f6fee
|
@ -0,0 +1,24 @@
|
||||||
|
This file is part of MXE. See LICENSE.md for licensing information.
|
||||||
|
|
||||||
|
Taken from https://github.com/tpaviot/oce/pull/673
|
||||||
|
|
||||||
|
--- a/src/BRepBuilderAPI/BRepBuilderAPI_Copy.cxx
|
||||||
|
+++ b/src/BRepBuilderAPI/BRepBuilderAPI_Copy.cxx
|
||||||
|
@@ -25,8 +25,6 @@
|
||||||
|
#include <gp_Pnt.hxx>
|
||||||
|
#include <Poly_Triangulation.hxx>
|
||||||
|
|
||||||
|
-namespace {
|
||||||
|
-
|
||||||
|
//! Tool class implementing necessary functionality for copying geometry
|
||||||
|
class BRepBuilderAPI_Copy_Modification : public BRepTools_Modification
|
||||||
|
{
|
||||||
|
@@ -147,8 +145,6 @@ DEFINE_STANDARD_HANDLE(BRepBuilderAPI_Copy_Modification, BRepTools_Modification)
|
||||||
|
IMPLEMENT_STANDARD_HANDLE(BRepBuilderAPI_Copy_Modification, BRepTools_Modification)
|
||||||
|
IMPLEMENT_STANDARD_RTTIEXT(BRepBuilderAPI_Copy_Modification, BRepTools_Modification)
|
||||||
|
|
||||||
|
-} // anonymous namespace
|
||||||
|
-
|
||||||
|
//=======================================================================
|
||||||
|
//function : BRepBuilderAPI_Copy
|
||||||
|
//purpose :
|
28
src/oce.mk
28
src/oce.mk
|
@ -4,34 +4,24 @@ PKG := oce
|
||||||
$(PKG)_WEBSITE := https://github.com/tpaviot/oce
|
$(PKG)_WEBSITE := https://github.com/tpaviot/oce
|
||||||
$(PKG)_DESCR := Open CASCADE Community Edition
|
$(PKG)_DESCR := Open CASCADE Community Edition
|
||||||
$(PKG)_IGNORE :=
|
$(PKG)_IGNORE :=
|
||||||
$(PKG)_VERSION := 0.17.2
|
$(PKG)_VERSION := 0.18.1
|
||||||
$(PKG)_CHECKSUM := 8d9995360cd531cbd4a7aa4ca5ed969f08ec7c7a37755e2f3d4ef832c1b2f56e
|
$(PKG)_CHECKSUM := 1acf5da4bffa3592ca9f3535af9b927b79fcfeadcb81e9963e89aec192929a6c
|
||||||
$(PKG)_SUBDIR := $(PKG)-OCE-$($(PKG)_VERSION)
|
$(PKG)_GH_CONF := tpaviot/oce,OCE-
|
||||||
$(PKG)_FILE := OCE-$($(PKG)_VERSION).tar.gz
|
|
||||||
$(PKG)_URL := https://github.com/tpaviot/oce/archive/$($(PKG)_FILE)
|
|
||||||
$(PKG)_DEPS := gcc freetype
|
$(PKG)_DEPS := gcc freetype
|
||||||
|
|
||||||
define $(PKG)_UPDATE
|
|
||||||
$(WGET) -q -O- 'https://github.com/tpaviot/oce/releases' | \
|
|
||||||
$(SED) -n 's,.*oce/archive/OCE-\([0-9][^"]*\)\.tar\.gz.*,\1,p' | \
|
|
||||||
$(SORT) -V | \
|
|
||||||
tail -1
|
|
||||||
endef
|
|
||||||
|
|
||||||
define $(PKG)_BUILD
|
define $(PKG)_BUILD
|
||||||
mkdir '$(1).build'
|
cd '$(BUILD_DIR)' && '$(TARGET)-cmake' '$(SOURCE_DIR)' \
|
||||||
cd '$(1).build' && '$(TARGET)-cmake' '$(1)' \
|
-DOCE_BUILD_SHARED_LIB=$(CMAKE_SHARED_BOOL) \
|
||||||
-DOCE_BUILD_SHARED_LIB=$(if $(BUILD_STATIC),FALSE,TRUE) \
|
|
||||||
-DOCE_INSTALL_PREFIX=$(PREFIX)/$(TARGET) \
|
-DOCE_INSTALL_PREFIX=$(PREFIX)/$(TARGET) \
|
||||||
-DOCE_INSTALL_BIN_DIR=$(PREFIX)/$(TARGET)/bin \
|
-DOCE_INSTALL_BIN_DIR=$(PREFIX)/$(TARGET)/bin \
|
||||||
-DOCE_INSTALL_LIB_DIR=$(PREFIX)/$(TARGET)/lib \
|
-DOCE_INSTALL_LIB_DIR=$(PREFIX)/$(TARGET)/lib \
|
||||||
-DOCE_INSTALL_CMAKE_DATA_DIR=$(PREFIX)/$(TARGET)/lib/cmake/OCE \
|
-DOCE_INSTALL_CMAKE_DATA_DIR=$(PREFIX)/$(TARGET)/lib/cmake/OCE \
|
||||||
-DOCE_AUTOINSTALL_DEPENDENT_LIBS=OFF
|
-DOCE_AUTOINSTALL_DEPENDENT_LIBS=OFF
|
||||||
|
|
||||||
$(MAKE) -C '$(1).build' -j '$(JOBS)' VERBOSE=1
|
$(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' VERBOSE=1
|
||||||
$(MAKE) -C '$(1).build' -j 1 install
|
$(MAKE) -C '$(BUILD_DIR)' -j 1 install
|
||||||
|
|
||||||
cd '$(1)/examples/find_package_oce' && '$(TARGET)-cmake' .
|
cd '$(SOURCE_DIR)/examples/find_package_oce' && '$(TARGET)-cmake' .
|
||||||
$(MAKE) -C '$(1)/examples/find_package_oce'
|
$(MAKE) -C '$(SOURCE_DIR)/examples/find_package_oce'
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue