From d9d750c8c6d12a1147d8dceddefe0e39c5b7a567 Mon Sep 17 00:00:00 2001 From: Prem Chaitanya Prathi Date: Fri, 16 Feb 2024 15:23:50 +0530 Subject: [PATCH] chore: move lmdbxx submodule under cpp folder --- .gitmodules | 2 +- cpp/Makefile | 6 +++--- {test/cpp => cpp/vendor}/lmdbxx | 0 test/cpp/Makefile | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) rename {test/cpp => cpp/vendor}/lmdbxx (100%) diff --git a/.gitmodules b/.gitmodules index 2834d9b..8b45d4c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,5 +2,5 @@ path = test/cpp/hoytech-cpp url = https://github.com/hoytech/hoytech-cpp.git [submodule "test/cpp/lmdbxx"] - path = test/cpp/lmdbxx + path = cpp/vendor/lmdbxx url = https://github.com/hoytech/lmdbxx.git diff --git a/cpp/Makefile b/cpp/Makefile index c37e418..ae6c627 100644 --- a/cpp/Makefile +++ b/cpp/Makefile @@ -19,7 +19,7 @@ negentropy-cpp: g++ negentropy.h --std=c++20 -o negentropy.o $(INCS) c-wrapper: - g++ negentropy_wrapper.h --std=c++20 -o negentropy_wrapper.o $(INCS) -I../test/cpp/lmdbxx/include/ + g++ negentropy_wrapper.h --std=c++20 -o negentropy_wrapper.o $(INCS) -I./vendor/lmdbxx/include/ -clean: - rm -f negentropy.o \ No newline at end of file +clean: + rm -f negentropy.o diff --git a/test/cpp/lmdbxx b/cpp/vendor/lmdbxx similarity index 100% rename from test/cpp/lmdbxx rename to cpp/vendor/lmdbxx diff --git a/test/cpp/Makefile b/test/cpp/Makefile index db2070e..6b0d5c4 100644 --- a/test/cpp/Makefile +++ b/test/cpp/Makefile @@ -2,7 +2,7 @@ W = -Wall OPT = -g -O2 STD = -std=c++20 CXXFLAGS = $(STD) $(OPT) $(W) -fPIC $(XCXXFLAGS) -INCS = -I../../cpp/ -I./hoytech-cpp/ -Ilmdbxx/include/ +INCS = -I../../cpp/ -I./hoytech-cpp/ -I../cpp/vendor/lmdbxx/include/ #-I/opt/homebrew/include/ -L/opt/homebrew/lib/ DEPS = ../../cpp/negentropy.h ../../cpp/negentropy/* ../../cpp/negentropy/storage/* ../../cpp/negentropy/storage/btree/*