Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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
17 changes: 15 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion gui-js/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ravel",
"version":"3.26",
"version":"3.26.0-beta.5",
Comment thread
highperformancecoder marked this conversation as resolved.
Comment thread
highperformancecoder marked this conversation as resolved.
"author": "High Performance Coders",
"description": "Graphical dynamical systems simulator oriented towards economics",
"repository": {
Expand Down
1 change: 1 addition & 0 deletions libclipboard
Submodule libclipboard added at 766495
Loading