Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Optionally force compilation with MacFUSE. #16

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Optionally force compilation with MacFUSE. #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/Driver/Fuse/Driver.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ NAME := Driver
OBJS :=
OBJS += FuseService.o

CXXFLAGS += $(shell pkg-config fuse --cflags)
ifdef NOPKGCONFIG
CXXFLAGS += -I/usr/local/include/fuse -D__FreeBSD__=10 -D_FILE_OFFSET_BITS=64
else
CXXFLAGS += $(shell pkg-config fuse --cflags)
endif

include $(BUILD_INC)/Makefile.inc
6 changes: 5 additions & 1 deletion src/Main/Main.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,11 @@ endif

#------ FUSE configuration ------

FUSE_LIBS = $(shell pkg-config fuse --libs)
ifdef NOPKGCONFIG
FUSE_LIBS = -L/usr/local/lib -lfuse -pthread -liconv
else
FUSE_LIBS = $(shell pkg-config fuse --libs)
endif


#------ Executable ------
Expand Down
5 changes: 5 additions & 0 deletions src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
# DEBUGGER: Enable debugging information for use by debuggers
# NOASM: Exclude modules requiring assembler
# NOGUI: Disable graphical user interface (build console-only application)
# NOPKGCONFIG Do not use pkg-config for FUSE: force MacFUSE usage (OS X-only)
# NOSTRIP: Do not strip release binary
# NOTEST: Do not test release binary
# RESOURCEDIR: Run-time resource directory
Expand Down Expand Up @@ -236,6 +237,10 @@ endif

#------ Common configuration ------

ifneq "$(PLATFORM)" "MacOSX"
undef NOPKGCONFIG
endif

CFLAGS := $(C_CXX_FLAGS) $(CFLAGS) $(TC_EXTRA_CFLAGS)
CXXFLAGS := $(C_CXX_FLAGS) $(CXXFLAGS) $(TC_EXTRA_CXXFLAGS)
ASFLAGS += -f $(ASM_OBJ_FORMAT)
Expand Down