diff --git a/.gitmodules b/.gitmodules index 3626d0711..ae417d0bd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,3 +8,6 @@ [submodule "RavelCAPI"] path = RavelCAPI url = https://github.com/highperformancecoder/RavelCAPI.git +[submodule "libclipboard"] + path = libclipboard + url = https://github.com/OfficialKris/libclipboard.git diff --git a/Makefile b/Makefile index da22b6729..6ed1fccdf 100644 --- a/Makefile +++ b/Makefile @@ -86,16 +86,28 @@ FLAGS+=-std=c++20 # add in MacPorts prefix, in case Node is installed through MacPorts DIRS+=/opt/local endif + export GCOV export CLASSDESC=$(shell pwd)/ecolab/classdesc/classdesc MAKEOVERRIDES+=FPIC=1 CLASSDESC=$(CLASSDESC) ifneq ($(MAKECMDGOALS),clean) + +# RavelCAPI build_ravelcapi:=$(shell cd RavelCAPI; if $(MAKE) $(JOBS) $(MAKEOVERRIDES) >build.log 2>&1; then echo "ravelcapi built"; fi) $(warning $(build_ravelcapi)) ifneq ($(strip $(build_ravelcapi)),ravelcapi built) $(error Making RavelCAPI failed: check RavelCAPI/build.log) endif +ifndef MXE +# libclipboard +build_libclipboard:=$(shell cd libclipboard; if cmake -DBUILD_SHARED_LIBS=0 -DCMAKE_C_FLAGS=-fPIC . &>build.log && $(MAKE) $(JOBS) >>build.log 2>&1; then echo "libclipboard built"; fi) +$(warning $(build_libclipboard)) +ifneq ($(strip $(build_libclipboard)),libclipboard built) +$(error Making libclipboard failed: check libclipboard/build.log) +endif +endif + endif ifdef FLTO @@ -217,7 +229,7 @@ ifdef CLASSDESC_ARITIES FLAGS+=-DUSE_UNROLLED -DCLASSDESC_ARITIES=$(CLASSDESC_ARITIES) endif -FLAGS+=-UTR1 -Ischema -Iengine -Imodel -Icertify/include -IRESTService -IRavelCAPI/civita -IRavelCAPI -DCLASSDESC $(OPT) -UECOLAB_LIB -DECOLAB_LIB=\"library\" -DJSON_PACK_NO_FALL_THROUGH_TO_STREAMING -Wno-unused-local-typedefs -Wno-pragmas -Wno-unused-command-line-argument -Wno-unknown-warning-option -Wno-attributes -DCIVITA_ALLOCATOR=civita::LibCAllocator +FLAGS+=-UTR1 -Ischema -Iengine -Imodel -Icertify/include -IRESTService -IRavelCAPI/civita -IRavelCAPI -Ilibclipboard/include -DCLASSDESC $(OPT) -UECOLAB_LIB -DECOLAB_LIB=\"library\" -DJSON_PACK_NO_FALL_THROUGH_TO_STREAMING -Wno-unused-local-typedefs -Wno-pragmas -Wno-unused-command-line-argument -Wno-unknown-warning-option -Wno-attributes -DCIVITA_ALLOCATOR=civita::LibCAllocator ifeq ($(CPLUSPLUS),clang++) # note some of these flags are disabling warnings that are invalid in some circumstances @@ -331,7 +343,7 @@ LIBS+=$(if $(call search,lib*/libboost_system.so),-lboost_system$(BOOST_EXT)) -W ifdef MXE LIBS+=-lgdi32 -lcrypt32 -lbcrypt -lshcore else -LIBS+=-lclipboard -lxcb -lX11 -ldl +LIBS+=-Llibclipboard -lclipboard -lxcb -lX11 -ldl endif # RSVG dependencies calculated here @@ -506,6 +518,7 @@ clean: -cd schema && $(BASIC_CLEAN) -cd ecolab && $(MAKE) clean -cd RavelCAPI && $(MAKE) clean + -cd libclipboard && $(MAKE) clean mac-dist: # force rebuild of the node file to force rewriting of dependent dylibs diff --git a/gui-js/package.json b/gui-js/package.json index 77683ca3a..6570106f0 100644 --- a/gui-js/package.json +++ b/gui-js/package.json @@ -1,6 +1,6 @@ { "name": "ravel", - "version":"3.26", + "version":"3.26.0-beta.5", "author": "High Performance Coders", "description": "Graphical dynamical systems simulator oriented towards economics", "repository": { diff --git a/libclipboard b/libclipboard new file mode 160000 index 000000000..766495ce3 --- /dev/null +++ b/libclipboard @@ -0,0 +1 @@ +Subproject commit 766495ce358c39b5ff0732dcef485e5da28abf7c