Skip to content

Commit b34220c

Browse files
Merge pull request #310 from mmore500/json
Implement JSON features for ProgramBuilder
2 parents c323dcd + 498ed14 commit b34220c

9 files changed

Lines changed: 6486 additions & 7 deletions

File tree

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
Data/
2+
_test/
3+
14
.DS_Store
25
StatsConfig.cfg
36
SymSettings.cfg

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22
TEST_DIR := source/catch
33
EMP_DIR := Empirical/include
44
SGP_DIR := signalgp-lite/include
5+
CEREAL_DIR := signalgp-lite/third-party/cereal/include
56
TAG_NUM_BITS = 32
67

78
# Flags to use regardless of compiler
89
VENDORIZE_EMP_FLAGS := -DUIT_VENDORIZE_EMP -DUIT_SUPPRESS_MACRO_INSEEP_WARNINGS
910
COMPILE_TIME_ARGS := -DTAG_NUM_BITS=$(TAG_NUM_BITS)
10-
CFLAGS_all := -Wall -Wno-unused-function -std=c++20 $(COMPILE_TIME_ARGS) -I$(EMP_DIR)/ -I$(SGP_DIR)/ ${VENDORIZE_EMP_FLAGS}
11+
CFLAGS_all := -Wall -Wno-unused-function -std=c++20 $(COMPILE_TIME_ARGS) -I$(EMP_DIR)/ -I$(SGP_DIR)/ -I$(CEREAL_DIR)/ ${VENDORIZE_EMP_FLAGS}
1112

1213
# Native compiler information
1314
CXX_nat := g++

0 commit comments

Comments
 (0)