diff --git a/Makefile b/Makefile index 5c9bdab..eda2ede 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ RCOMPILE_FLAGS = -DNDEBUG -O3 # Additional debug-specific flags DCOMPILE_FLAGS = -DDEBUG -g # Add additional include paths -INCLUDES = -I$(SRC_PATH) -I./include -I./deps/out/include -I./deps/GSL/include +INCLUDES = -I$(SRC_PATH) -I./include -I./deps/out/include -I./deps/json/single_include -I./deps/GSL/include # General linker settings ABSL_LIBRARIES = $(shell find deps/out/lib/libabsl_*.a -printf '%f\n' \ | sed -e 's/libabsl_\([a-z0-9_]\+\)\.a/-labsl_\1/g') diff --git a/build_deps.sh b/build_deps.sh index b3ae680..e937f43 100755 --- a/build_deps.sh +++ b/build_deps.sh @@ -21,13 +21,6 @@ export CXXFLAGS="-fdata-sections -ffunction-sections" rm -rf ${DEPS_INSTALL_PATH} mkdir -p ${DEPS_INSTALL_PATH} -# Build json -cd $BASE_DIR/deps/json && rm -rf build && mkdir -p build && cd build && \ - cmake -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DJSON_BuildTests=OFF -DCMAKE_CXX_STANDARD=17 \ - -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_PATH} .. && \ - make -j$(nproc) install && \ - rm -rf $BASE_DIR/deps/json/build - # Build abseil-cpp cd $BASE_DIR/deps/abseil-cpp && rm -rf build && mkdir -p build && cd build && \ cmake -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_CXX_STANDARD=17 \