From 09b4156ed8c87cb0b51f37f1c017ae7d358489ca Mon Sep 17 00:00:00 2001 From: lduchosal Date: Sat, 13 Jan 2024 00:44:23 +0100 Subject: [PATCH 1/4] Fix glib version and fuse lib --- src/Adaptor/buildandcopy | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Adaptor/buildandcopy b/src/Adaptor/buildandcopy index d3d8fdf..fb7fd1b 100644 --- a/src/Adaptor/buildandcopy +++ b/src/Adaptor/buildandcopy @@ -1,6 +1,5 @@ #!/bin/bash -gcc -x c -c -fPIC -o definitions.o -D_FILE_OFFSET_BITS=64 -I /usr/local/include/osxfuse/ -I /usr/local/Cellar/glib/2.56.1/include/glib-2.0/ -I /usr/local/Cellar/glib/2.56.1/lib/glib-2.0/include/ definitions.c -gcc -x c -c -fPIC -o adaptor.o -D_FILE_OFFSET_BITS=64 -I /usr/local/include/osxfuse/ -I /usr/local/Cellar/glib/2.56.1/include/glib-2.0/ -I /usr/local/Cellar/glib/2.56.1/lib/glib-2.0/include/ adaptor.c -gcc -shared -fPIC -o libAdaptor.dylib -L /usr/local/lib/ -losxfuse definitions.o adaptor.o -lc +gcc -x c -c -fPIC -o definitions.o -D_FILE_OFFSET_BITS=64 -I /usr/local/include/osxfuse/ -I /usr/local/Cellar/glib/2.78.3/include/glib-2.0/ -I /usr/local/Cellar/glib/2.78.3/lib/glib-2.0/include/ definitions.c +gcc -x c -c -fPIC -o adaptor.o -D_FILE_OFFSET_BITS=64 -I /usr/local/include/osxfuse/ -I /usr/local/Cellar/glib/2.78.3/include/glib-2.0/ -I /usr/local/Cellar/glib/2.78.3/lib/glib-2.0/include/ adaptor.c +gcc -shared -fPIC -o libAdaptor.dylib -L /usr/local/lib/ -lfuse definitions.o adaptor.o -lc cp libAdaptor.dylib /usr/local/lib/libAdaptor.dylib - From 1ee4de3fd725ae1d66c8f14df12edb55775ae994 Mon Sep 17 00:00:00 2001 From: lduchosal Date: Sat, 13 Jan 2024 01:40:34 +0100 Subject: [PATCH 2/4] Feat: Makefile to build --- src/Adaptor/buildandcopy | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 src/Adaptor/buildandcopy diff --git a/src/Adaptor/buildandcopy b/src/Adaptor/buildandcopy deleted file mode 100644 index fb7fd1b..0000000 --- a/src/Adaptor/buildandcopy +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -gcc -x c -c -fPIC -o definitions.o -D_FILE_OFFSET_BITS=64 -I /usr/local/include/osxfuse/ -I /usr/local/Cellar/glib/2.78.3/include/glib-2.0/ -I /usr/local/Cellar/glib/2.78.3/lib/glib-2.0/include/ definitions.c -gcc -x c -c -fPIC -o adaptor.o -D_FILE_OFFSET_BITS=64 -I /usr/local/include/osxfuse/ -I /usr/local/Cellar/glib/2.78.3/include/glib-2.0/ -I /usr/local/Cellar/glib/2.78.3/lib/glib-2.0/include/ adaptor.c -gcc -shared -fPIC -o libAdaptor.dylib -L /usr/local/lib/ -lfuse definitions.o adaptor.o -lc -cp libAdaptor.dylib /usr/local/lib/libAdaptor.dylib From 74943451592f694005b7a541af86afa51e158776 Mon Sep 17 00:00:00 2001 From: lduchosal Date: Sat, 13 Jan 2024 01:43:43 +0100 Subject: [PATCH 3/4] Feat: Makefile --- src/Adaptor/Makefile | 45 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 src/Adaptor/Makefile diff --git a/src/Adaptor/Makefile b/src/Adaptor/Makefile new file mode 100644 index 0000000..6746ec8 --- /dev/null +++ b/src/Adaptor/Makefile @@ -0,0 +1,45 @@ +# FuseSharp +# https://github.com/PlasticSCM/FuseSharp +# +# make +# make install +# make clean + +CC = gcc +OUT_FILE_NAME = libAdaptor.dylib + +CFLAGS = -x c -c -fPIC -O0 -g -Wall -fpermissive -D_FILE_OFFSET_BITS=64 +LIBFLAGS = -shared -fPIC + +INC = -I /usr/local/include/osxfuse/ -I /usr/local/Cellar/glib/2.78.3/include/glib-2.0/ -I /usr/local/Cellar/glib/2.78.3/lib/glib-2.0/include/ +LIB = -L /usr/local/lib/ + +OBJ_DIR=./obj +OUT_DIR=./lib +INSTALL_DIR=/usr/local/lib/ + + +$(OUT_FILE_NAME): $(patsubst %.c,$(OBJ_DIR)/%.o,$(wildcard *.c)) + $(CC) $(LIBFLAGS) -o $(OUT_DIR)/$(OUT_FILE_NAME) $(LIB) -l fuse $(OBJ_DIR)/*.o -lc + + +$(OBJ_DIR)/%.o: %.c dirmake + $(CC) -c $(INC) $(CFLAGS) -o $@ $< + + +dirmake: + @mkdir -p $(OUT_DIR) + @mkdir -p $(OBJ_DIR) + +clean: + rm -rf $(OBJ_DIR) $(OUT_DIR) Makefile.bak + +install: + cp $(OUT_DIR)/$(OUT_FILE_NAME) $(INSTALL_DIR) + +deinstall: + rm -f $(INSTALL_DIR)/$(OUT_FILE_NAME) + +rebuild: clean build + + From c9de7264334a96a3d77a631b55d08d64b6ede0fc Mon Sep 17 00:00:00 2001 From: lduchosal Date: Sat, 13 Jan 2024 01:50:03 +0100 Subject: [PATCH 4/4] Fix: make it glib version independant --- src/Adaptor/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Adaptor/Makefile b/src/Adaptor/Makefile index 6746ec8..9d6920c 100644 --- a/src/Adaptor/Makefile +++ b/src/Adaptor/Makefile @@ -11,8 +11,8 @@ OUT_FILE_NAME = libAdaptor.dylib CFLAGS = -x c -c -fPIC -O0 -g -Wall -fpermissive -D_FILE_OFFSET_BITS=64 LIBFLAGS = -shared -fPIC -INC = -I /usr/local/include/osxfuse/ -I /usr/local/Cellar/glib/2.78.3/include/glib-2.0/ -I /usr/local/Cellar/glib/2.78.3/lib/glib-2.0/include/ -LIB = -L /usr/local/lib/ +INC = -I /usr/local/include/osxfuse/ $(shell pkg-config --cflags glib-2.0) +LIBS = -L /usr/local/lib/ $(shell pkg-config --libs glib-2.0) OBJ_DIR=./obj OUT_DIR=./lib @@ -20,7 +20,7 @@ INSTALL_DIR=/usr/local/lib/ $(OUT_FILE_NAME): $(patsubst %.c,$(OBJ_DIR)/%.o,$(wildcard *.c)) - $(CC) $(LIBFLAGS) -o $(OUT_DIR)/$(OUT_FILE_NAME) $(LIB) -l fuse $(OBJ_DIR)/*.o -lc + $(CC) $(LIBFLAGS) -o $(OUT_DIR)/$(OUT_FILE_NAME) $(LIBS) -l fuse $(OBJ_DIR)/*.o -lc $(OBJ_DIR)/%.o: %.c dirmake