mirror of
https://github.com/ksherlock/profuse.git
synced 2025-01-02 16:29:57 +00:00
updated fuse header includes
This commit is contained in:
parent
184b69747a
commit
3885c06698
9
Makefile
9
Makefile
@ -1,13 +1,14 @@
|
|||||||
CC = c++
|
CC = c++
|
||||||
CPPFLAGS += -Wall -W -Wno-multichar -Wno-c++11-narrowing -I. -O2 -g -std=c++11
|
CPPFLAGS += -Wall -W -Wno-multichar -Wno-c++11-narrowing -I. -O2 -g -std=c++11
|
||||||
LIBS += -lpthread
|
|
||||||
UNAME = $(shell uname -s)
|
UNAME = $(shell uname -s)
|
||||||
|
|
||||||
ifeq ($(UNAME),Darwin)
|
ifeq ($(UNAME),Darwin)
|
||||||
FUSE_LIBS += -losxfuse
|
# should use pkg-config but it may not be installed.
|
||||||
CPPFLAGS += -I/usr/local/include/osxfuse/fuse
|
FUSE_LIBS += -losxfuse -pthread -liconv
|
||||||
|
CPPFLAGS += -I/usr/local/include/osxfuse/fuse -D_FILE_OFFSET_BITS=64 -D_DARWIN_USE_64_BIT_INODE
|
||||||
else
|
else
|
||||||
FUSE_LIBS += -lfuse
|
CPPFLAGS += $(shell pkg-config --cflags fuse)
|
||||||
|
FUSE_LIBS += $(shell pkg-config --libs fuse)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef HAVE_NUFX
|
ifdef HAVE_NUFX
|
||||||
|
@ -10,15 +10,10 @@
|
|||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
|
|
||||||
#ifdef __APPLE__
|
|
||||||
#define __DARWIN_64_BIT_INO_T 1
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define _FILE_OFFSET_BITS 64
|
|
||||||
#define FUSE_USE_VERSION 27
|
#define FUSE_USE_VERSION 27
|
||||||
|
|
||||||
#include <fuse/fuse_opt.h>
|
#include <fuse_opt.h>
|
||||||
#include <fuse/fuse_lowlevel.h>
|
#include <fuse_lowlevel.h>
|
||||||
|
|
||||||
#include <Pascal/Pascal.h>
|
#include <Pascal/Pascal.h>
|
||||||
#include <Common/Exception.h>
|
#include <Common/Exception.h>
|
||||||
|
@ -1,9 +1,4 @@
|
|||||||
|
|
||||||
#ifdef __APPLE__
|
|
||||||
#define __DARWIN_64_BIT_INO_T 1
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define _FILE_OFFSET_BITS 64
|
|
||||||
#define FUSE_USE_VERSION 27
|
#define FUSE_USE_VERSION 27
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
@ -19,8 +14,8 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
#include <fuse/fuse_opt.h>
|
#include <fuse_opt.h>
|
||||||
#include <fuse/fuse_lowlevel.h>
|
#include <fuse_lowlevel.h>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -14,15 +14,10 @@
|
|||||||
#include <ProDOS/common.h>
|
#include <ProDOS/common.h>
|
||||||
|
|
||||||
|
|
||||||
#ifdef __APPLE__
|
|
||||||
#define __DARWIN_64_BIT_INO_T 1
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define _FILE_OFFSET_BITS 64
|
|
||||||
#define FUSE_USE_VERSION 27
|
#define FUSE_USE_VERSION 27
|
||||||
|
|
||||||
#include <fuse/fuse_opt.h>
|
#include <fuse_opt.h>
|
||||||
#include <fuse/fuse_lowlevel.h>
|
#include <fuse_lowlevel.h>
|
||||||
|
|
||||||
|
|
||||||
#undef ERROR
|
#undef ERROR
|
||||||
|
Loading…
Reference in New Issue
Block a user